Commit graph

23928 commits

Author SHA1 Message Date
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
Marc Alexander
f4761b5e08 [ticket/12858] Directly return and use timezone selects
PHPBB3-12858
2014-09-17 19:07:24 +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
Marc Alexander
9c310f789f [ticket/12858] Rename tz_ prefixed block variables to timezone_ prefix
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
ad596f4390 [ticket/12858] Fix timezone select display in subsilver2
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
6323180344 [ticket/12858] Fix timezone display on acp users page
PHPBB3-12858
2014-09-17 17:56:09 +02:00
Marc Alexander
9a3aeb8a99 [ticket/12858] Remove hardcoded language entries from timezone selects
PHPBB3-12858
2014-09-17 17:56:04 +02:00
Marc Alexander
3dbac0f88b [ticket/12858] Use UTC for time info in footer and hide offset if it's 0
PHPBB3-12858
2014-09-17 14:23:34 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop
PHPBB3-12858
2014-09-17 14:22:08 +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
Cesar G
2b4807b116 [ticket/13018] Do not handle events in close function.
PHPBB3-13018
2014-09-15 07:43:18 -07:00
Cesar G
674ea44bc6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10472] Remove dd selector and use -moz-padding-end
  [ticket/10472] Fix weird padding on input type=number
  [ticket/10472] More clearing and white-space fixes
  [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens
2014-09-15 06:58:52 -07:00
Cesar G
f807b82162 Merge remote-tracking branch 'PayBas/ticket/10472' into develop-ascraeus
* PayBas/ticket/10472:
  [ticket/10472] Remove dd selector and use -moz-padding-end
  [ticket/10472] Fix weird padding on input type=number
  [ticket/10472] More clearing and white-space fixes
  [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens
2014-09-15 06:58:21 -07:00
PayBas
6488d236ec [ticket/10472] Remove dd selector and use -moz-padding-end
PHPBB3-10472
2014-09-15 14:58:57 +02:00
PayBas
38830f9cbb [ticket/10472] Fix weird padding on input type=number
PHPBB3-10472
2014-09-15 14:53:04 +02:00
PayBas
726573f100 [ticket/10472] More clearing and white-space fixes
PHPBB3-10472
2014-09-15 14:53:04 +02:00
PayBas
da716058fa [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens
PHPBB3-10472
2014-09-15 14:53:03 +02:00
Cesar G
5034b3ad7d [ticket/13018] Reduce the delta further.
The callback does not actually do anything when cancelling the confirmation
box so we can avoid calling it altogether when cancel is clicked.

PHPBB3-13018
2014-09-14 15:49:18 -07:00
Cesar G
6d80770ba4 [ticket/13018] Remove duplicate logic in confirm box and alert box handling.
This ensures a more consistent handling of the various closing/opening actions
and fixes some bugs where certain event handlers are not turned off in certain
instances.

PHPBB3-13018
2014-09-14 14:54:08 -07:00
Tristan Darricau
b9e7ed004c [ticket/13034] Use utf8_basename
PHPBB3-13034
2014-09-14 23:41:15 +02:00
Tristan Darricau
1507c5af64 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
2014-09-14 22:07:52 +02:00
Tristan Darricau
9ef01e7f82 Merge pull request #2956 from prototech/ticket/13019
[ticket/13019] Always accept a reason for deleting a post/topic.

* prototech/ticket/13019:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
2014-09-14 22:00:16 +02:00
Marc Alexander
2634db6031 Merge branch 'develop-ascraeus' into develop 2014-09-14 20:45:11 +02:00
Marc Alexander
1487e6f857 Merge pull request #2955 from prototech/ticket/13065
[ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor.
2014-09-14 20:44:49 +02:00