rxu
2f92bc38e6
[ticket/13406] Add a space between the index name and columns list
...
Currently there's no space between the index name and columns list
when generating ADD INDEX sql query for MySQL DBMSes. This may cause errors
on earlier MySQL versions like 3.23.
PHPBB3-13406
2014-11-30 16:52:36 +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
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
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
Joas Schilling
5c3b6a8559
Merge pull request #10 from phpbb/ticket/security-171
...
[ticket/security-171] Use type cast helper for json data
2014-11-22 17:48:37 +01:00
Joas Schilling
a3b18d87dd
Merge pull request #8 from phpbb/ticket/security-169
...
[ticket/security-169] Stop loop through referer dir in top directory
2014-11-22 15:51:48 +01:00
Marc Alexander
0f06b88ee7
[ticket/security-171] Remove duplicate semicolon from tests
...
SECURITY-171
2014-11-22 15:48:09 +01:00
Joas Schilling
fd993cbaf2
Merge pull request #3157 from marc1706/ticket/13358
...
[ticket/13358] Add class for retrieving remote file data
2014-11-22 15:42:37 +01:00
Marc Alexander
ab69c79d07
Merge branch 'ticket/13358' into ticket/security-171
2014-11-22 15:24:27 +01:00
Marc Alexander
f3ae5e4cb2
[ticket/13358] Correctly create version_helper in acp_extensions
...
The full namespace for the file_downloader is now also being used in
version_helper.
PHPBB3-13358
2014-11-22 15:23:26 +01:00
Joas Schilling
8b71103836
Merge pull request #3123 from Elsensee/ticket/13310
...
[ticket/13310] Add event core.acp_email_modify_sql
2014-11-22 12:21:24 +01:00
Joas Schilling
ea101f7932
Merge pull request #3160 from PayBas/ticket/13228
...
[ticket/13228] Fix codebox "select all" font-size in UCP and MCP
2014-11-22 12:18:00 +01:00
Joas Schilling
7700f31213
Merge pull request #3116 from rxu/ticket/13297
...
[ticket/13297] Add unicode modifier to url/email regular expression patterns
2014-11-22 12:13:39 +01:00
Joas Schilling
a83b952f63
Merge pull request #3158 from prototech/ticket/13354
...
[ticket/13354] Fix incorrect column name when deleting all topic logs.
2014-11-22 12:08:33 +01:00
Joas Schilling
e283611dc2
Merge pull request #3161 from Crizz0/ticket/12885
...
[ticket/12885] New if for Index-page - board-index-text switch
2014-11-22 11:35:51 +01:00
Joas Schilling
8489e0bdc2
Merge branch 'develop-olympus' into develop-ascraeus
2014-11-22 11:31:41 +01:00
Joas Schilling
a415b8e37b
Merge pull request #3164 from Crizz0/ticket/10442
...
[ticket/10442] Adds <dd> </dd> to <dl> for xhtml correctness
2014-11-22 11:31:31 +01:00
Jakub Senko
30f292f5a2
[ticket/11613] Allow cookies to work on netbios domains
...
PHPBB3-11613
2014-11-22 11:29:57 +01:00
PayBas
2c15388520
[ticket/13228] Gotta use !important after all. Too bad
...
PHPBB3-13228
2014-11-22 02:42:25 +01:00
Crizzo
867bfa3f9e
[ticket/10442] Adds <dd> </dd> to <dl> for xhtml correctness
...
PHPBB3-10442
2014-11-22 01:08:14 +01:00
Crizzo
4cb930c2c1
[ticket/12885] New if for Index-page - board-index-text switch
...
PHPBB3-12885
2014-11-22 00:09:38 +01:00
Marc Alexander
70692dd522
Merge pull request #3094 from nickvergessen/ticket/10744
...
Ticket/10744 Prevent installing styles with reserved names
2014-11-22 00:00:22 +01:00
Joas Schilling
c174862b7e
[ticket/10744] Fix some doc blocks
...
PHPBB3-10744
2014-11-21 23:59:29 +01:00
