0595ab959c
[ticket/13647] Move FAQ page to a controller
...
PHPBB3-13647
2015-02-22 20:20:28 +01:00
71eb981a81
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:36 +01:00
d152bbc727
Merge pull request #3427 from prototech/ticket/13551
...
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
* prototech/ticket/13551:
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00
677337348f
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
9b5493372d
[ticket/13644] Always type hint dispatch_interface
...
PHPBB3-13644
2015-02-22 17:01:37 +01:00
3657d7a85a
Merge branch '3.1.x'
2015-02-20 22:26:47 +01:00
379eae1a92
Merge pull request #3418 from brunoais/ticket/13631
...
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
71d3ddc623
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
...
PHPBB3-13551
2015-02-19 18:38:35 -08:00
f0850f1915
[ticket/13631] Better, more explicit comment explanation
...
PHPBB3-13631
2015-02-18 10:36:29 +00:00
997b229723
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
...
I don't get this... I was positive I, at some point, had it right... I don't get
what happened...
PHPBB3-13631
2015-02-18 10:33:49 +00:00
978b96cbf5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
f23d2ec42f
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
...
PHPBB3-13570
2015-02-16 20:25:11 +01:00
ec1fb0423d
[ticket/10748] Split postgres DB tools into it's own class
...
PHPBB3-10748
2015-02-13 22:49:29 +01:00
74d1b1812f
[ticket/10748] Overwrite the type map correctly
...
PHPBB3-10748
2015-02-07 14:41:40 +01:00
37ae99c75d
[ticket/10748] Replace direct creations of tools();
...
PHPBB3-10748
2015-02-07 14:41:39 +01:00
4ea90ca44d
[ticket/10748] Split MS SQL from the db tools file into it's own
...
PHPBB3-10748
2015-02-07 14:36:26 +01:00
b0c910e49c
Merge branch 'develop-ascraeus' into develop
2015-02-07 14:33:37 +01:00
fbc603861d
[ticket/13588] Fixes wrong message in info fsockopen() disabled
...
PHPBB3-13588
2015-02-07 13:50:08 +01:00
e4064ca839
Merge pull request #3207 from Nicofuma/ticket/13407
...
[ticket/13407] Update Symfony to 2.7.*@dev
* Nicofuma/ticket/13407:
[ticket/13407] Update composer.lock file
[ticket/13407] Bump minimal version to php 5.3.9
[ticket/13407] Introduce a request_stack service
[ticket/13407] Remove the last occurence of pattern in routing files
[ticket/13407] Update Symfony to 2.7.*@dev
2015-02-04 21:14:01 +01:00
3267c6a61a
Merge pull request #3257 from MGaetan89/ticket/13455
...
[ticket/13455] Change request_var() calls with $request->variable()
* MGaetan89/ticket/13455:
[ticket/13455] Remove `request_var()` references from comments
[ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`
[ticket/13455] Update calls to `request_var()`
2015-02-04 21:09:54 +01:00
b8939da242
[ticket/13407] Bump minimal version to php 5.3.9
...
PHPBB3-13407
2015-02-04 17:40:18 +01:00
52446c8327
[ticket/13455] Remove request_var() references from comments
...
PHPBB3-13455
2015-02-03 20:56:48 +01:00
abcb2680ee
[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()
...
PHPBB3-13455
2015-02-03 20:50:40 +01:00
f6e06da4c6
[ticket/13455] Update calls to request_var()
...
PHPBB3-13455
2015-02-03 20:50:40 +01:00
f9ab676530
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle
2015-02-03 20:36:53 +01:00
a09d022d5e
Merge branch 'ticket/13348-olympus' into ticket/13348
...
Conflicts:
phpBB/feed.php
2015-02-03 18:30:45 +01:00
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
f4b42c961f
[ticket/13139] Fix tests
...
PHPBB3-13139
2015-02-03 13:37:52 +01:00
79d4ff5538
[ticket/13494] Update calls to set_config()
...
PHPBB3-13494
2015-02-02 19:28:23 +01:00
a166f6f42c
[ticket/13569] Add missing sql_freeresults and remove unneeded results
...
PHPBB3-13569
2015-02-02 17:36:39 +01:00
6e2838a4ca
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
build/build.xml
2015-02-01 20:24:32 +01:00
7f99e1c857
[prep-release-3.1.3] Add migration for 3.1.3
2015-02-01 19:18:30 +01:00
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
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
9f4c2effe9
[ticket/10388] Update deprecation comment
...
PHPBB3-10388
2015-01-31 01:11:28 -08:00
9232367b35
[prep-release-3.1.3] Add migration for 3.1.3-RC2
2015-01-31 01:06:23 +01:00
c14cf0457d
Merge branch 'develop-ascraeus' into develop
2015-01-31 00:57:32 +01:00
e6bbde2bff
[ticket/13553] Use defined title value in page headers too
...
PHPBB3-13553
2015-01-31 00:56:59 +01:00
ab4b1afd98
[ticket/13553] Make title var accept a lang key var
...
PHPBB3-13553
2015-01-31 00:56:54 +01:00
7127d08c8f
[ticket/13553] Message helper should accept a lang key var
...
PHPBB3-13553
2015-01-31 00:56:47 +01:00
14ab007128
Merge branch 'develop-ascraeus' into develop
2015-01-31 00:43:30 +01:00
9628e8df3b
[ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1
...
PHPBB3-13557
2015-01-30 22:57:15 +01:00
7531bfb291
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13556] Fix exception translation with filedownloader
2015-01-30 19:00:15 +01:00
69450c7152
[ticket/13556] Fix exception translation with filedownloader
...
PHPBB3-13556
2015-01-30 18:05:13 +01:00
1b185413bf
Merge branch 'develop-ascraeus' into develop
2015-01-30 17:48:54 +01:00
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
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
b78ae290e8
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13553] Add a method to the controller helper to display a message
[prep-release-3.1.3] Add changelog for 3.1.3-RC1
[prep-release-3.1.3] Prepare Changelog
[prep-release-3.1.3] Add migration for 3.1.3-RC1
[prep-release-3.1.3] Update version to 3.1.2-RC1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
2015-01-30 13:14:33 +01:00
ab07be8157
Merge branch 'prep-release-3.1.3' into develop-ascraeus
2015-01-30 13:10:38 +05:30
afe99f9050
[ticket/13553] Add a method to the controller helper to display a message
...
PHPBB3-13553
2015-01-29 19:08:32 +01:00
