1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

23775 Commits

Author SHA1 Message Date
Joas Schilling
b82a3cddd8 Merge pull request #2927 from Senky/ticket/13022
[ticket/13022] "Return to advanced search" wrong assumption

* Senky/ticket/13022:
  [ticket/13022] Language adjustments
  [ticket/13022] Remove ternary condition
  [ticket/13022] Condition Return to advanced search link
2014-09-18 12:44:12 +02:00
Joas Schilling
1da5c41ab3 [ticket/12963] Always use core_path and core_directory()
PHPBB3-12963
2014-09-18 11:21:53 +02:00
Joas Schilling
5ce61e8c3a [ticket/12963] Remove old migration/ folder from tests
PHPBB3-12963
2014-09-18 11:21:51 +02:00
Joas Schilling
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
Cesar G
df220e5c0a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
2014-09-17 18:18:11 -07:00
Cesar G
53e028ff14 Merge remote-tracking branch 'GiampaoloFalqui/develop-ascraeus' into develop-ascraeus
* GiampaoloFalqui/develop-ascraeus:
  [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
2014-09-17 18:17:56 -07:00
Cesar G
5a46ed398b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12963] Fix the migration's finder for the tests (path, new instance)
2014-09-17 17:49:12 -07:00
Cesar G
53f62f1129 Merge remote-tracking branch 'Nicofuma/ticket/12963' into develop-ascraeus
* Nicofuma/ticket/12963:
  [ticket/12963] Fix the migration's finder for the tests (path, new instance)
2014-09-17 17:49:01 -07:00
Giampaolo Falqui
a2b5ec7e1b [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
PHPBB3-13068
2014-09-18 02:25:39 +02:00
Tristan Darricau
0d1f0c07fe [ticket/12963] Fix the migration's finder for the tests (path, new instance)
PHPBB3-12963
2014-09-18 02:04:47 +02:00
Tristan Darricau
92d69255e4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
2014-09-18 01:32:55 +02:00
Tristan Darricau
6c043c4a86 Merge pull request #2964 from nickvergessen/ticket/12963
[ticket/12963] Correctly load migration files from migration/ in tests as well

* nickvergessen/ticket/12963:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
2014-09-18 01:32:08 +02:00
Joas Schilling
180f9bf4fa [ticket/12963] Correctly load migration files from migration/ in tests as well
PHPBB3-12963
2014-09-17 23:33:26 +02:00
Joas Schilling
45a4cf7ac5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
2014-09-17 21:25:20 +02:00
Joas Schilling
7729ae4ad0 [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
This reverts commit 46a9fe93d797bf7d56fd9b1e204f3c0459270122.

PHPBB3-13064
2014-09-17 21:24:33 +02:00
Joas Schilling
dd89af7151 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
2014-09-17 20:11:23 +02:00
Jakub Senko
e59222496a [ticket/13045] Remove Pragma headers
PHPBB3-13045
2014-09-17 20:10:01 +02:00
Joas Schilling
910cd5edbe Merge pull request #2948 from Nicofuma/ticket/13061
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

* Nicofuma/ticket/13061:
  [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
2014-09-17 20:09:49 +02:00
Joas Schilling
d2e1c5c866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13062] Add viewforum.php core event to modify topic ids sql query
2014-09-17 20:02:19 +02:00
Joas Schilling
676f453cbd Merge pull request #2949 from rxu/ticket/13062
[ticket/13062] Add viewforum.php core event to modify topic ids sql query

* rxu/ticket/13062:
  [ticket/13062] Add viewforum.php core event to modify topic ids sql query
2014-09-17 20:02:13 +02:00
Joas Schilling
bf6ecccd25 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:47 +02:00
Joas Schilling
86ea314598 Merge pull request #2951 from Nicofuma/ticket/13064
[ticket/13064] Validate the migrations provided to migrator::set_migrations()

* Nicofuma/ticket/13064:
  [ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:39 +02:00
Joas Schilling
428e492542 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13044] Move GMT out of gmdate in functions_acp
  [ticket/13044] Move GMT out of gmdate()
  [ticket/13044] \G\M\T to GMT in whole project
  [ticket/13044] move GMT string out of gmdate()
  [ticket/13044] Correct Expires headers
2014-09-17 19:51:57 +02:00
Joas Schilling
7201238104 Merge pull request #2962 from Senky/ticket/13044
[ticket/13044] Expires header violates RFC 2616

* Senky/ticket/13044:
  [ticket/13044] Move GMT out of gmdate in functions_acp
  [ticket/13044] Move GMT out of gmdate()
  [ticket/13044] \G\M\T to GMT in whole project
  [ticket/13044] move GMT string out of gmdate()
  [ticket/13044] Correct Expires headers
2014-09-17 19:44:42 +02:00
Jakub Senko
3885ac90f1 [ticket/13044] Move GMT out of gmdate in functions_acp
PHPBB3-13044
2014-09-17 18:38:21 +02:00
Jakub Senko
3d637fea98 [ticket/13044] Move GMT out of gmdate()
PHPBB3-13044
2014-09-17 18:35:38 +02:00
Jakub Senko
ea5e46f6dd [ticket/13044] \G\M\T to GMT in whole project
Note that there are more uses of "\G\M\T" in vendor files.

PHPBB3-13044
2014-09-17 11:56:37 +02:00
Jakub Senko
7cbd9e9524 [ticket/13044] move GMT string out of gmdate()
PHPBB3-13044
2014-09-17 11:15:24 +02:00
Jakub Senko
33b2063680 [ticket/13044] Correct Expires headers
PHPBB3-13044
2014-09-17 10:52:19 +02:00
Marc Alexander
f6ccb30781 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:57:34 +02:00
Marc Alexander
20903c0a9b Merge pull request #2922 from Nicofuma/ticket/13036
[ticket/13036] Make the reference type configurable when generating a route
2014-09-17 00:57:04 +02:00
Marc Alexander
5fa2d19756 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:37:07 +02:00
Marc Alexander
4a06511d85 Merge pull request #2932 from Nicofuma/ticket/12963
[ticket/12963] Load extensions migrations from /migration
2014-09-17 00:36:38 +02:00
Marc Alexander
b82a39fea9 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:25:25 +02:00
Marc Alexander
2e1aebbc12 Merge pull request #2959 from prototech/ticket/13069
[ticket/13069] Fix timezone location filtering.
2014-09-17 00:24:36 +02:00
Cesar G
4df031187f [ticket/13069] Fix timezone location filtering.
$timezone contains the original jQuery object, therefore the subsequent
removal of the optgroup children while filtering has no effect on the
$replacement object - the one that's now visible to the user. We'll simplify
and fix this by injecting the content of the copy instead of going through the
trouble of cloning it.

PHPBB3-13069
2014-09-16 14:47:42 -07:00
Tristan Darricau
a48b740b94 [ticket/13036] Complete tests
PHPBB3-13036
2014-09-16 21:56:45 +02:00
Tristan Darricau
8b16d31413 [ticket/12963] Edit deprecation message
PHPBB3-12963
2014-09-16 20:18:10 +02:00
Tristan Darricau
bb5d6a2551 [ticket/13036] Add unit tests
PHPBB3-13036
2014-09-16 19:44:58 +02:00
Tristan Darricau
dab6b99bcd [ticket/13036] Make the reference type configurable when generating a route
PHPBB3-13036
2014-09-16 19:28:06 +02:00
Marc Alexander
cf71bfbdf2 Merge branch 'develop-ascraeus' into develop 2014-09-16 19:24:45 +02:00
Marc Alexander
b3576d77da Merge pull request #2921 from Nicofuma/ticket/13034
[ticket/13034] Fix the route generated for the frontend not in the phpbb root path
2014-09-16 19:24:07 +02:00
Tristan Darricau
f4260e261f [ticket/13034] Fix tests
PHPBB3-13034
2014-09-16 01:25:36 +02:00
Tristan Darricau
68ad7685bc [ticket/13034] Update the base url to move to the root dir
PHPBB3-13034
2014-09-15 23:47:05 +02:00
Andreas Fischer
d9b1b61a52 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13018] Clean up and fix some logic.
  [ticket/13018] Do not handle events in close function.
  [ticket/13018] Reduce the delta further.
  [ticket/13018] Remove duplicate logic in confirm box and alert box handling.
2014-09-15 22:50:58 +02:00
Andreas Fischer
0b4f714bc4 Merge pull request #2958 from prototech/ticket/13018
[ticket/13018] Remove duplicate logic in confirm box and alert box handling.

* prototech/ticket/13018:
  [ticket/13018] Clean up and fix some logic.
  [ticket/13018] Do not handle events in close function.
  [ticket/13018] Reduce the delta further.
  [ticket/13018] Remove duplicate logic in confirm box and alert box handling.
2014-09-15 22:50:58 +02:00
Andreas Fischer
76aa737265 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13056] Move the arguments of the request class to the DI
2014-09-15 22:42:38 +02:00
Andreas Fischer
720561de6e Merge pull request #2943 from Nicofuma/ticket/13056
[ticket/13056] Move the arguments of the request class to the DI

* Nicofuma/ticket/13056:
  [ticket/13056] Move the arguments of the request class to the DI
2014-09-15 22:42:38 +02:00
Tristan Darricau
06f42f433b [ticket/13034] Add comment
PHPBB3-13034
2014-09-15 20:25:20 +02:00
Cesar G
4ae447b205 [ticket/13018] Clean up and fix some logic.
PHPBB3-13018
2014-09-15 07:44:02 -07:00