ea1eff4fa5
Merge branch 'develop-ascraeus' into develop
2014-10-02 15:36:02 +02:00
90241ae4e6
Merge pull request #2947 from rxu/ticket/13059
...
[ticket/13059] Add core event to generate_page_link()
2014-10-02 15:35:55 +02:00
ce4035fdd3
[ticket/13059] Add core event to generate_page_link()
...
Add core event to generate_page_link() to allow
overriding/modifying pagination URLs.
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905
PHPBB3-13059
2014-10-01 20:55:07 +08:00
b9226c6877
Merge branch 'develop-ascraeus' into develop
2014-10-01 11:39:35 +02:00
40cd7570e6
[ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"
...
This reverts commit d26436944175fcfb1c1d
2014-10-01 11:38:45 +02:00
dceb334a0c
Merge branch 'develop-ascraeus' into develop
2014-10-01 10:34:42 +02:00
b003019958
Merge pull request #3013 from VSEphpbb/ticket/13121
...
[ticket/13121] Remove cache mode from style management module
2014-10-01 10:34:08 +02:00
0a58cca031
Merge branch 'develop-ascraeus' into develop
2014-10-01 10:27:56 +02:00
d264369441
Merge pull request #2460 from Nicofuma/ticket/11224
...
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
2014-10-01 10:27:47 +02:00
b1d35363db
Merge branch 'develop-ascraeus' into develop
2014-10-01 10:24:27 +02:00
75fcfb1c1d
Merge pull request #2545 from ptitlazy/ticket/12657
...
[ticket/12657] Add a test file for base case of command cache:purge
2014-10-01 10:24:19 +02:00
d73194a415
Merge branch 'develop-ascraeus' into develop
2014-10-01 10:19:39 +02:00
170b75d0c9
Merge pull request #2888 from Nicofuma/ticket/12993
...
[ticket/12993] Improve get_user_ranks
2014-10-01 10:19:24 +02:00
1ee4894271
[ticket/13121] Fix migration file
...
PHPBB3-13121
2014-10-01 00:29:45 -07:00
65539df39a
[ticket/13121] Remove cache mode from style management module
...
https://tracker.phpbb.com/browse/PHPBB3-13121
PHPBB3-13121
2014-10-01 00:03:54 -07:00
7694623cd2
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13111] Dropdown options are already an array in the field data
2014-09-30 21:04:25 +02:00
8fb9f19aae
Merge pull request #3008 from nickvergessen/ticket/13111
...
[ticket/13111] Dropdown options are already an array in the field data
* nickvergessen/ticket/13111:
[ticket/13111] Dropdown options are already an array in the field data
2014-09-30 21:04:25 +02:00
be5638c110
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13118] Correctly use the provided datetime class
2014-09-30 21:00:06 +02:00
a0db23bd0e
Merge pull request #3007 from nickvergessen/ticket/13118
...
[ticket/13118] Correctly use the provided datetime class
* nickvergessen/ticket/13118:
[ticket/13118] Correctly use the provided datetime class
2014-09-30 21:00:05 +02:00
e64c1b463e
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
2014-09-30 14:00:25 +02:00
f1ab6f31a1
Merge pull request #3003 from nickvergessen/ticket/13117
...
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
2014-09-30 14:00:02 +02:00
f64a937a57
[ticket/13111] Dropdown options are already an array in the field data
...
PHPBB3-13111
2014-09-30 12:27:14 +02:00
526329e697
[ticket/13118] Correctly use the provided datetime class
...
PHPBB3-13118
2014-09-30 11:58:02 +02:00
bc24c78e06
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
...
Unintended change from 95ab4b3e93
2014-09-29 20:48:47 +02:00
8de97b8dbe
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13113] Updates the base url only when the front-end isn't app.php
2014-09-29 16:17:25 +02:00
a159899d02
[ticket/13113] Updates the base url only when the front-end isn't app.php
...
PHPBB3-13113
2014-09-28 23:32:56 +02:00
b703d1e8df
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
[ticket/13105] Add a test for relative dates
2014-09-25 21:52:53 +02:00
be769d4ca6
Merge pull request #2995 from nickvergessen/ticket/13105
...
[ticket/13105] Future relative dates are always displayed as "Tomorrow"
* nickvergessen/ticket/13105:
[ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
[ticket/13105] Add a test for relative dates
2014-09-25 21:52:53 +02:00
a3e910f23f
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
2014-09-25 21:47:28 +02:00
f64373a29f
[ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
...
PHPBB3-13106
2014-09-25 20:12:33 +02:00
e803efc6fc
[ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
...
PHPBB3-13105
2014-09-25 18:09:32 +02:00
cb92b4668e
Merge branch 'develop-ascraeus' into develop
2014-09-24 12:26:21 +02:00
f3fef8934e
Merge pull request #2954 from rxu/ticket/13055
...
[ticket/13055] Fix string profile fields validation to support unicode
2014-09-24 12:25:57 +02:00
138d320960
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13048] Only do not update the session page for ajax requests
2014-09-23 23:29:52 +02:00
9feb7096ee
Merge pull request #2985 from nickvergessen/ticket/13048
...
[ticket/13048] Only do not update the session page for ajax requests
* nickvergessen/ticket/13048:
[ticket/13048] Only do not update the session page for ajax requests
2014-09-23 23:29:52 +02:00
f20e3e9feb
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13070] Use old 'template' class for template class hook
2014-09-23 23:25:59 +02:00
820db008ff
[ticket/13048] Only do not update the session page for ajax requests
...
The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.
PHPBB3-13048
2014-09-23 15:25:40 +02:00
d03be5ea5f
[ticket/13070] Use old 'template' class for template class hook
...
PHPBB3-13070
2014-09-22 20:03:55 +02:00
314cda1834
Merge branch 'develop-ascraeus' into develop
...
# By n-aleha
# Via Dhruv Goel (1) and n-aleha (1)
* develop-ascraeus:
[ticket/13085] Fix typo in oauth.php
2014-09-21 10:30:01 +05:30
7313cc777e
[ticket/13085] Fix typo in oauth.php
...
PHPBB3-13085
2014-09-21 00:33:07 +03:00
e23d2e7b20
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
[prep-release-3.1.0-RC4] Prepare Changelog
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
[prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
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-09-20 09:55:56 +02:00
221f4a4a8c
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
2014-09-19 19:04:21 +02:00
9bf58697dc
Merge branch 'ticket/13073' into ticket/13073-develop
...
Conflicts:
tests/controller/common_helper_route.php
2014-09-19 18:48:24 +02:00
6fd54436ee
[ticket/13073] Add path regex to get_preg_expression() and add unit tests
...
We're now calling get_preg_expression() instead of hardcoding the regex into
the helper route method.
PHPBB3-13073
2014-09-19 13:54:15 +02:00
4186ced479
[ticket/13073] Use just one regex in helper route()
...
PHPBB3-13073
2014-09-19 12:14:57 +02:00
eaef881e7d
[ticket/13073] Properly place comments in helper
...
PHPBB3-13073
2014-09-19 12:03:04 +02:00
4a76763a8a
[ticket/12657] Add a test file for base case
...
PHPBB3-12657
2014-09-19 11:09:29 +02:00
d892dfe084
[ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
...
PHPBB3-13073
2014-09-18 23:44:51 +02:00
7548bc89ea
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12963] Always use core_path and core_directory()
[ticket/12963] Remove old migration/ folder from tests
[ticket/12963] Revert back to "migrations" folder name for extensions
2014-09-18 14:04:22 +02:00
c220fa89a1
[ticket/12963] Revert back to "migrations" folder name for extensions
...
The issues that can be created with the name change are just too much
PHPBB3-12963
2014-09-18 10:45:08 +02:00
