Marc Alexander
a3be531020
[ticket/13568] Use correct data provider on windows
...
PHPBB3-13568
2015-02-03 16:34:41 +01:00
Andreas Fischer
427d2de3ea
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:03 +01:00
Andreas Fischer
e86b7ce562
Merge pull request #3363 from Nicofuma/ticket/13572
...
[ticket/13572] Update composer to version 1.0.0-alpha9
* Nicofuma/ticket/13572:
[ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:02 +01:00
Nicofuma
f4f983c0f6
[ticket/13572] Update composer to version 1.0.0-alpha9
...
PHPBB3-13572
2015-02-03 10:25:39 +01:00
Joas Schilling
bbb6d6a452
Merge pull request #3330 from kasimi/ticket/13540
...
[ticket/13540] Add core event for modifying topic review block data
2015-02-02 23:30:06 +01:00
Joas Schilling
efee422707
Merge pull request #3326 from Wolfsblvt-Test/ticket/13537
...
Add core events on mcp_queue for approval and disapproval
2015-02-02 23:25:53 +01:00
Joas Schilling
7330c0afd3
Merge pull request #3325 from rxu/ticket/13536
...
[ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
2015-02-02 23:22:23 +01:00
Joas Schilling
6678570f49
Merge pull request #3324 from rxu/ticket/13336
...
[ticket/13336] Add core events to the function user_active_flip()
2015-02-02 23:19:44 +01:00
Joas Schilling
e9eafece3f
Merge pull request #3323 from rxu/ticket/13535
...
[ticket/13535] Add core event to allow modifying account settings on editing
2015-02-02 23:18:15 +01:00
Joas Schilling
0e6cd94fb4
Merge pull request #3317 from Wolfsblvt/ticket/13532
...
Add core event to get_unread_topics() in functions.php
2015-02-02 23:12:42 +01:00
Joas Schilling
0aea283ab0
Merge pull request #3305 from Wolfsblvt/ticket/13518
...
Add core event to markread() in functions.php
2015-02-02 23:09:34 +01:00
Joas Schilling
b1336ae016
Merge pull request #3302 from rxu/ticket/13512
...
[ticket/13512] Add template events before/after the post details
2015-02-02 23:05:50 +01:00
Joas Schilling
7254a52812
Merge pull request #3282 from Elsensee/ticket/13313
...
[ticket/13313] Add event core.acp_email_display
2015-02-02 23:00:29 +01:00
Marc Alexander
5182d02da5
Merge pull request #3334 from paul999/ticket/13542
...
[ticket/13542] Update core.ucp_prefs_personal_data to include $error
2015-02-02 21:05:44 +01:00
Marc Alexander
ffe0e46e82
[ticket/13568] Add imagick tests for windows
...
PHPBB3-13568
2015-02-02 20:39:58 +01:00
Marc Alexander
d50cec998c
[ticket/13568] Correctly check rpath and rwpath validation options
...
PHPBB3-13568
2015-02-02 18:44:48 +01:00
Marc Alexander
b53fd867be
[ticket/13568] Add more test cases for imagick path
...
PHPBB3-13568
2015-02-02 18:33:53 +01:00
Marc Alexander
a93df0e511
[ticket/13568] Use more descriptive validation names and merge with path block
...
PHPBB3-13568
2015-02-02 18:30:05 +01:00
Marc Alexander
a166f6f42c
[ticket/13569] Add missing sql_freeresults and remove unneeded results
...
PHPBB3-13569
2015-02-02 17:36:39 +01:00
Marc Alexander
99574cf5e5
[ticket/13568] Add functional test for imagick path setting
...
PHPBB3-13568
2015-02-02 16:11:00 +01:00
Marc Alexander
19421fcdef
[ticket/13568] Validate imagick path as readable absolute path
...
PHPBB3-13568
2015-02-02 15:59:52 +01:00
Joas Schilling
9f59aa59d9
Merge branch 'prep-release-3.1.3' into develop-ascraeus
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-02-01 20:23:16 +01:00
Joas Schilling
7f99e1c857
[prep-release-3.1.3] Add migration for 3.1.3
2015-02-01 19:18:30 +01:00
Joas Schilling
036b5c4244
[prep-release-3.1.3] Update version to 3.1.3
2015-02-01 19:15:42 +01:00
Joas Schilling
3c23242bfe
Merge branch 'prep-release-3.1.3' into develop-ascraeus
2015-01-31 12:11:43 +01:00
Joas Schilling
be30d8251a
[prep-release-3.1.3] Add changelog for 3.1.3-RC2
2015-01-31 01:08:29 +01:00
Joas Schilling
9232367b35
[prep-release-3.1.3] Add migration for 3.1.3-RC2
2015-01-31 01:06:23 +01:00
Joas Schilling
dd182c5433
[prep-release-3.1.3] Update version to 3.1.3-RC2
2015-01-31 01:03:55 +01:00
Joas Schilling
67478a0f94
Merge branch 'prep-release-3.1.3' into develop-ascraeus
2015-01-31 00:57:25 +01:00
Joas Schilling
e72c1540cb
Merge branch 'ticket/13553' into prep-release-3.1.3
2015-01-31 00:57:15 +01:00
Matt Friedman
e6bbde2bff
[ticket/13553] Use defined title value in page headers too
...
PHPBB3-13553
2015-01-31 00:56:59 +01:00
Matt Friedman
ab4b1afd98
[ticket/13553] Make title var accept a lang key var
...
PHPBB3-13553
2015-01-31 00:56:54 +01:00
Matt Friedman
7127d08c8f
[ticket/13553] Message helper should accept a lang key var
...
PHPBB3-13553
2015-01-31 00:56:47 +01:00
Joas Schilling
b16854ab8c
Merge branch 'prep-release-3.1.3' into develop-ascraeus
2015-01-31 00:43:20 +01:00
Joas Schilling
bb4287ab2d
Merge pull request #3355 from nickvergessen/ticket/13557
...
[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
2015-01-31 00:43:04 +01:00
Joas Schilling
9628e8df3b
[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
...
PHPBB3-13557
2015-01-30 22:57:15 +01:00
Andreas Fischer
2690038d40
Merge branch 'prep-release-3.1.3' into develop-ascraeus
...
* prep-release-3.1.3:
[ticket/13556] Fix exception translation with filedownloader
2015-01-30 19:00:15 +01:00
Andreas Fischer
3fef570950
Merge pull request #3354 from nickvergessen/ticket/13556
...
[ticket/13556] Fix exception translation with filedownloader
* nickvergessen/ticket/13556:
[ticket/13556] Fix exception translation with filedownloader
2015-01-30 19:00:15 +01:00
Joas Schilling
69450c7152
[ticket/13556] Fix exception translation with filedownloader
...
PHPBB3-13556
2015-01-30 18:05:13 +01:00
Joas Schilling
3e710fe393
Merge branch 'prep-release-3.1.3' into develop-ascraeus
2015-01-30 17:48:45 +01:00
Joas Schilling
e5f2eee167
Merge pull request #3341 from brunoais/ticket/13544
...
[ticket/13544] Fixing wrong SQL query for permission_unset() for roles
2015-01-30 17:45:21 +01:00
Andreas Fischer
899173eebd
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-01-30 13:43:05 +01:00
Andreas Fischer
7273591560
Merge branch 'prep-release-3.0.13' into develop-olympus
...
* prep-release-3.0.13:
[prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
[prep-release-3.0.13] Also update version in references to files.
[prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
[prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
[prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-01-30 13:40:44 +01:00
Andreas Fischer
c46a6443be
Merge branch 'prep-release-3.1.3' into develop-ascraeus
...
* prep-release-3.1.3:
[prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
[prep-release-3.0.13] Also update version in references to files.
[prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
[prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
[prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
2015-01-30 13:36:20 +01:00
Andreas Fischer
b6786f8ba1
Merge branch 'prep-release-3.0.13' into prep-release-3.1.3
...
* prep-release-3.0.13:
[prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
[prep-release-3.0.13] Also update version in references to files.
[prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
[prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
[prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
[ticket/12933] Handle case when * is last character of word
[ticket/13554] Show feature release upgrades in blue rather than red.
Conflicts:
build/build.xml
phpBB/adm/style/acp_update.html
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/includes/startup.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
tests/security/trailing_path_test.php
2015-01-30 13:34:40 +01:00
Dhruv
ab07be8157
Merge branch 'prep-release-3.1.3' into develop-ascraeus
2015-01-30 13:10:38 +05:30
Dhruv Goel
c130165bfa
Merge pull request #3353 from nickvergessen/ticket/13553
...
[ticket/13553] Add a method to the controller helper to display a message
2015-01-30 13:09:14 +05:30
Andreas Fischer
5f237a0426
[prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
2015-01-30 01:32:34 +01:00
Andreas Fischer
1e94b0ae71
[prep-release-3.0.13] Also update version in references to files.
2015-01-29 23:32:05 +01:00
Andreas Fischer
5fea945b5b
[prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
2015-01-29 23:27:12 +01:00
