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 |
|
rxu
|
a8c62e707a
|
[ticket/12926] Support for IDN (IRI)
Add international domain name support for URLs.
PHPBB3-12926
|
2014-11-27 01:18:49 +07: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
|
36a337ffab
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-26 13:37:21 +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
|
4c88c579b8
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-26 13:30:24 +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
|
630e7077e0
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-26 13:21:02 +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
|
94d90c084b
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-25 23:15:30 +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
|
74dfb56459
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-25 22:45:37 +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
|
1a0cba1099
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
|
2014-11-25 16:47:22 +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 |
|
Jakub Senko
|
595f9c132b
|
[ticket/12924] Remove newlines at the EOF
PHPBB3-12924
|
2014-11-22 19:19:08 +01:00 |
|
Joas Schilling
|
8f67892f5e
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 17:49:06 +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
|
0c4a0cac61
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 15:52:34 +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
|
11c9d11482
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 15:43:33 +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 |
|
Jakub Senko
|
b9289340d9
|
[ticket/12567] wrap to top
PHPBB3-12567
|
2014-11-22 12:37:31 +01:00 |
|
Tristan Darricau
|
6850169095
|
[ticket/13266] Enable the debug extension in the development environment
PHPBB3-13266
|
2014-11-22 12:33:45 +01:00 |
|
Joas Schilling
|
45aafe0b09
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 12:21:30 +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
|
8ce736ad8a
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 12:19:09 +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
|
d6c85757d7
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 12:13:46 +01:00 |
|