Joas Schilling
f6b21a2789
Merge pull request #3191 from Elsensee/ticket/13312
...
[ticket/13312] Add event core.acp_email_send_before
2014-12-27 13:46:32 +01:00
Joas Schilling
867a45138c
Merge pull request #3175 from Senky/ticket/13368
...
[ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event
2014-12-27 13:38:19 +01:00
Joas Schilling
aea67c8e37
Merge pull request #3168 from Senky/ticket/11033
...
[ticket/11033] FULLTEXT_SPHINX_NO_CONFIG_DATA references unrequired field
2014-12-27 13:37:04 +01:00
Joas Schilling
d2334ab3e0
Merge pull request #3167 from Senky/ticket/12924
...
[ticket/12924] Make meta tags self-closing
2014-12-27 13:34:48 +01:00
Joas Schilling
5b1c9831c2
Merge pull request #3099 from Senky/ticket/13266
...
[ticket/13266] Enabling twig dump function if DEBUG is defined
2014-12-27 13:31:01 +01:00
Joas Schilling
a66e4770c1
Merge pull request #3159 from Crizz0/ticket/13357
...
[ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries
2014-12-27 13:29:04 +01:00
Jakub Senko
91dc002c31
[ticket/13368] Update version
...
PHPBB3-13368
2014-12-11 14:11:43 +01:00
Cesar G
61df1ac2b3
Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeus
...
* Senky/ticket/12567:
[ticket/12567] wrap to top
2014-12-09 17:58:43 -08:00
Cesar G
46384adf00
Merge remote-tracking branch 'Senky/ticket/13319' into develop-ascraeus
...
* Senky/ticket/13319:
[ticket/13319] Add missing table tags
2014-12-09 17:50:14 -08:00
Joas Schilling
641a9e5441
Merge pull request #3208 from prototech/ticket/13396
...
[ticket/13396] Normalize multibyte characters in attachment file names.
2014-12-06 14:22:49 +01:00
Joas Schilling
7fbf5649eb
Merge branch 'ticket/13400' into develop-ascraeus
2014-12-06 13:42:24 +01:00
kochi
dfbc109b59
[ticket/13400] Information text if the server load id high at search
...
PHPBB3-13400
2014-12-06 13:42:16 +01:00
Cesar G
589394e80b
[ticket/13396] Normalize multibyte characters in attachment file names.
...
PHPBB3-13396
2014-12-02 16:23:40 -08:00
Tristan Darricau
70483d6088
Merge pull request #3204 from rxu/ticket/13405
...
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
* rxu/ticket/13405:
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
2014-11-30 19:07:14 +01:00
rxu
499c1467df
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
...
PHPBB3-13405
2014-11-30 11:27:47 +07:00
Joas Schilling
ac8b07ddd9
Merge pull request #3192 from Elsensee/ticket/13393
...
[ticket/13393] Call user->lang function directly
2014-11-29 09:08:51 +01:00
Joas Schilling
8f1a1874a9
Merge pull request #3194 from Nicofuma/ticket/13381
...
[ticket/13381] Allow ' *' in the doc blocks (especially the header files)
2014-11-28 19:58:56 +01:00
Tristan Darricau
79ce924bc1
[ticket/13381] Allow ' *' in the doc blocks (especially the header files)
...
PHPBB3-13381
2014-11-27 11:20:26 +01:00
Tristan Darricau
d43e8c94f5
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:39:11 +01:00
Tristan Darricau
b54dbe0df6
Merge pull request #3188 from marc1706/ticket/11613
...
[ticket/11613] Allow cookies for domains without dots
* marc1706/ticket/11613:
[ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:38:45 +01:00
Cesar G
79a1495f66
Merge remote-tracking branch 'Prosk8er/ticket/13391' into develop-ascraeus
...
* Prosk8er/ticket/13391:
[ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
2014-11-26 18:43:24 -08:00
Oliver Schramm
893e4b3067
[ticket/13393] Call user->lang function directly
...
PHPBB3-13393
2014-11-27 00:55:01 +01:00
Oliver Schramm
a349db54d6
[ticket/13312] Use empty for usernames array
...
PHPBB3-13312
2014-11-26 23:10:02 +01:00
Oliver Schramm
41d0b5d3a2
[ticket/13312] Add event core.acp_email_send_before
...
PHPBB3-13312
2014-11-26 23:01:58 +01:00
Prosk8er
a5a18fb6dd
[ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
...
PHPBB3-13391
2014-11-26 14:09:07 -05:00
Jakub Senko
b67b67f2df
[ticket/11613] Allow cookies to work on netbios domains
...
PHPBB3-11613
2014-11-26 14:58:33 +01:00
Marc Alexander
ee90d227c2
Merge pull request #3187 from Nicofuma/ticket/13362
...
[ticket/13362] Fix cache paths in .gitignore
2014-11-26 13:37:02 +01:00
Marc Alexander
51f46a8f91
Merge pull request #3185 from Nicofuma/ticket/13389
...
[ticket/13389] Replace pattern with path
2014-11-26 13:30:03 +01:00
Marc Alexander
6ac088ea2f
Merge pull request #3075 from Senky/ticket/11613
...
[ticket/11613] Cookies do not work for netbios domain
2014-11-26 13:20:36 +01:00
Tristan Darricau
6a4179cef5
[ticket/13362] Fix cache paths in .gitignore
...
PHPBB3-13362
2014-11-26 12:38:02 +01:00
Tristan Darricau
90012c86e8
[ticket/13389] Replace pattern with path
...
PHPBB3-13389
2014-11-26 12:24:50 +01:00
Marc Alexander
aa3a46a35f
Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeus
2014-11-25 23:15:03 +01:00
Joas Schilling
2e7ae40d49
Merge pull request #3183 from Nicofuma/ticket/13362
...
[ticket/13362] Ignore the whole cache directory in git
2014-11-25 22:45:23 +01:00
Joas Schilling
eb83bd5797
[ticket/13381] Fix header intendation of v312.php
...
PHPBB3-13381
2014-11-25 22:42:52 +01:00
Tristan Darricau
f46057ca02
[ticket/13362] Ignore the whole cache directory in git
...
PHPBB3-13362
2014-11-25 18:00:07 +01:00
Joas Schilling
f4898b9258
Merge branch 'prep-release-3.1.2' into develop-ascraeus
2014-11-25 16:44:57 +01:00
Joas Schilling
9c9623e47f
[prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev
2014-11-25 16:43:43 +01:00
Joas Schilling
1ad0dd28f1
Merge branch 'develop-olympus' into prep-release-3.1.2
2014-11-25 16:36:32 +01:00
Joas Schilling
ff9b541070
Merge pull request #3180 from naderman/ticket/13376
...
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
2014-11-25 16:36:18 +01:00
Nils Adermann
965042d015
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
...
Also introduce a clear cookie message hardcoded just in case.
PHPBB3-13376
2014-11-25 15:57:12 +01:00
Joas Schilling
9264d7c758
[prep-release-3.1.2] Update Changelog with 13376
2014-11-25 15:44:39 +01:00
Joas Schilling
0fbe8e8e69
[prep-release-3.1.2] Add migration to update version to 3.1.2
2014-11-24 21:32:17 +01:00
Joas Schilling
3862b60094
[prep-release-3.1.2] Increase version number to 3.1.2
2014-11-24 21:31:49 +01:00
Jakub Senko
b8ecd1a656
[ticket/13368] Add @changed entry
...
PHPBB3-13368
2014-11-24 21:30:42 +01:00
Jakub Senko
bb4b04f89a
[ticket/13319] Add missing table tags
...
PHPBB3-13319
2014-11-24 20:48:15 +01:00
Jakub Senko
9348b0c4f2
[ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event
...
PHPBB3-13368
2014-11-24 20:28:47 +01:00
Joas Schilling
5f3dffa820
[prep-release-3.1.2] Add changelog for 3.1.2-RC1
2014-11-22 19:35:24 +01:00
Joas Schilling
18d5ca9ce5
[prep-release-3.1.2] Prepare Changelog
2014-11-22 19:32:36 +01:00
Joas Schilling
dcd0f200d6
[prep-release-3.1.2] Add migration for 3.1.2-RC1
2014-11-22 19:27:34 +01:00
Joas Schilling
a5b3393bb0
[prep-release-3.1.2] Update version to 3.1.2-RC1
2014-11-22 19:22:40 +01:00
