1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 11:39:37 +02:00

20254 Commits

Author SHA1 Message Date
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
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
8b16d31413 [ticket/12963] Edit deprecation message
PHPBB3-12963
2014-09-16 20:18:10 +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
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
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
Cesar G
ffe24d5b8f [ticket/13019] Do not hide reason field when deleting permanently.
PHPBB3-13019
2014-09-14 10:41:57 -07:00
Cesar G
8c11927b55 [ticket/13019] Rename deletion reason label.
PHPBB3-13019
2014-09-14 10:39:25 -07:00
Cesar G
bf7041eeb9 [ticket/13019] Always accept a reason for deleting a post/topic.
PHPBB3-13019
2014-09-14 10:38:56 -07:00
Cesar G
b71571b793 [ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor.
PHPBB3-13065
2014-09-14 10:04:18 -07:00
Cesar G
4250c75de1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
2014-09-14 07:40:52 -07:00
Cesar G
a45df1d840 Merge remote-tracking branch 'prototech/ticket/13040' into develop-ascraeus
* prototech/ticket/13040:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
2014-09-14 07:40:30 -07:00
John
e4401b2534 [ticket/13040] Fix W3C validator warning in overall_footer.html
Added a non-breaking space to remove the following warning:
**Empty heading.**

```html
<h3 class="alert_title"></h3><p class="alert_text"></p>
```

PHPBB3-13040
2014-09-14 06:30:03 -07:00
Cesar G
2566cf1499 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13058] Add min value to jump to page input
  [ticket/13009] Remove legacy browser hacks
2014-09-14 06:26:32 -07:00
Cesar G
ca7168ee4a Merge remote-tracking branch 'hanakin/ticket/13009' into develop-ascraeus
* hanakin/ticket/13009:
  [ticket/13009] Remove legacy browser hacks
2014-09-14 06:23:00 -07:00
Cesar G
7f86b6e71e Merge remote-tracking branch 'Nicofuma/ticket/13058' into develop-ascraeus
* Nicofuma/ticket/13058:
  [ticket/13058] Add min value to jump to page input
2014-09-14 06:21:25 -07:00
Louis7777
2cf5b848db [ticket/13058] Add min value to jump to page input
PHPBB3-13058
2014-09-13 22:44:37 +02:00
Tristan Darricau
3dc73485ee [ticket/13056] Move the arguments of the request class to the DI
PHPBB3-13056
2014-09-13 14:22:55 +02:00
Marc Alexander
08d16cf7c9 Merge branch 'develop-ascraeus' into develop 2014-09-12 19:54:34 +02:00
Marc Alexander
48dbef391b Merge pull request #2879 from callumacrae/ticket/12982
[ticket/12982] JS refactoring
2014-09-12 19:54:03 +02:00
Andreas Fischer
93fbc468fb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12734] Remove unnecessary error supressing
2014-09-12 00:54:51 +02:00
Andreas Fischer
f26b6b6251 Merge pull request #2941 from Senky/ticket/12734
[ticket/12734] Custom profile manager should not suppress errors when inserting user rows

* Senky/ticket/12734:
  [ticket/12734] Remove unnecessary error supressing
2014-09-12 00:54:51 +02:00
Andreas Fischer
f73e60935d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
2014-09-12 00:52:24 +02:00
Tristan Darricau
7b4c5bdd34 [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
PHPBB3-13057
2014-09-11 22:01:09 +02:00
hanakin
7618e0387c [ticket/13009] Remove legacy browser hacks
PHPBB3-13009
2014-09-11 17:33:30 +02:00
Tristan Darricau
dd2a643e65 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13005] Add event to display_forums() to modify category template data
2014-09-11 16:59:38 +02:00
Tristan Darricau
7d6ceb81c1 Merge pull request #2901 from rxu/ticket/13005
[ticket/13005] Add event to display_forums() to modify category template data

* rxu/ticket/13005:
  [ticket/13005] Add event to display_forums() to modify category template data
2014-09-11 16:58:34 +02:00
Tristan Darricau
d1c4e0d63c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
2014-09-11 16:44:57 +02:00
Tristan Darricau
5804e43589 Merge pull request #2903 from rxu/ticket/13006
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event

* rxu/ticket/13006:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
2014-09-11 16:44:16 +02:00
Andreas Fischer
2c7fbb9e61 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13042] Remove unused variables
2014-09-10 22:17:18 +02:00