Andreas Fischer
3fb6d5b838
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13538] Add tests for double nested pagination loop
[ticket/13538] Fix tests for pagination in nested loop
[ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:47 +01:00
Andreas Fischer
5347eac69c
Merge pull request #3328 from marc1706/ticket/13538
...
[ticket/13538] Add tests for pagination in nested loops
* marc1706/ticket/13538:
[ticket/13538] Add tests for double nested pagination loop
[ticket/13538] Fix tests for pagination in nested loop
[ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:46 +01:00
Andreas Fischer
63d863a883
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:02 +01:00
Andreas Fischer
2864e77d6c
Merge pull request #3361 from marc1706/ticket/13569
...
[ticket/13569] Add missing sql_freeresults and remove unneeded results
* marc1706/ticket/13569:
[ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:00 +01:00
Andreas Fischer
ceaba8aaf9
Merge pull request #3028 from Nicofuma/ticket/13139
...
[ticket/13139] Update Twig to 1.18.0
* Nicofuma/ticket/13139:
[ticket/13139] Fix tests
[ticket/13139] Update Twig to 1.8.0
[ticket/13139] Update Twig to 1.16.2
2015-02-03 15:08:36 +01:00
Nicofuma
f4b42c961f
[ticket/13139] Fix tests
...
PHPBB3-13139
2015-02-03 13:37:52 +01:00
Nicofuma
199e7cf5a1
[ticket/13139] Update Twig to 1.8.0
...
PHPBB3-13139
2015-02-03 13:34:59 +01:00
Tristan Darricau
e1f983d3cf
[ticket/13139] Update Twig to 1.16.2
...
PHPBB3-13139
2015-02-03 13:34:53 +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
7e91320995
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[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
529820b620
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:30:15 +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
677ff632c4
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
phpBB/includes/mcp/mcp_queue.php
2015-02-02 23:27:19 +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
917a5ce0df
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
phpBB/includes/ucp/ucp_profile.php
2015-02-02 23:23:26 +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
7e7b337d27
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:19:49 +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
2f060b8299
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:18:24 +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
eadacaa3ad
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:12:47 +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
517549eae6
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:09:41 +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
7f8a726702
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
phpBB/styles/subsilver2/template/viewtopic_body.html
2015-02-02 23:07:33 +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
f31d12ddf2
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:00:48 +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
8569e1c77a
Merge branch 'develop-ascraeus' into develop
2015-02-02 21:06:02 +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
Andreas Fischer
df77174a2b
Merge pull request #3280 from MGaetan89/ticket/13494
...
[ticket/13494] Change set_config() calls with $config->set()
* MGaetan89/ticket/13494:
[ticket/13494] Update calls to `set_config()`
2015-02-02 20:07:46 +01:00
Gaëtan Muller
79d4ff5538
[ticket/13494] Update calls to set_config()
...
PHPBB3-13494
2015-02-02 19:28:23 +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
Joas Schilling
6e2838a4ca
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
build/build.xml
2015-02-01 20:24:32 +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
Marc Alexander
a893dfa46b
Merge pull request #3352 from VSEphpbb/ticket/10388
...
Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
2015-01-31 12:59:40 +01:00
Joas Schilling
bacb38b161
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-01-31 12:12:56 +01:00
Joas Schilling
3c23242bfe
Merge branch 'prep-release-3.1.3' into develop-ascraeus
2015-01-31 12:11:43 +01:00
Matt Friedman
9f4c2effe9
[ticket/10388] Update deprecation comment
...
PHPBB3-10388
2015-01-31 01:11:28 -08: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
c14cf0457d
Merge branch 'develop-ascraeus' into develop
2015-01-31 00:57:32 +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
