1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 14:16:28 +02:00
Commit Graph

9184 Commits

Author SHA1 Message Date
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
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
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
3885ac90f1 [ticket/13044] Move GMT out of gmdate in functions_acp
PHPBB3-13044
2014-09-17 18:38:21 +02:00
3d637fea98 [ticket/13044] Move GMT out of gmdate()
PHPBB3-13044
2014-09-17 18:35:38 +02:00
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
7cbd9e9524 [ticket/13044] move GMT string out of gmdate()
PHPBB3-13044
2014-09-17 11:15:24 +02:00
33b2063680 [ticket/13044] Correct Expires headers
PHPBB3-13044
2014-09-17 10:52:19 +02:00
cf71bfbdf2 Merge branch 'develop-ascraeus' into develop 2014-09-16 19:24:45 +02:00
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
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
bf7041eeb9 [ticket/13019] Always accept a reason for deleting a post/topic.
PHPBB3-13019
2014-09-14 10:38:56 -07:00
c988b98ac6 [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
PHPBB3-13061
2014-09-13 14:34:18 +02:00
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
7b4c5bdd34 [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
PHPBB3-13057
2014-09-11 22:01:09 +02:00
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
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
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
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
2c7fbb9e61 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13042] Remove unused variables
2014-09-10 22:17:18 +02:00
d42401056c Merge pull request #2940 from Senky/ticket/13042
[ticket/13042] Unused var in login_box()

* Senky/ticket/13042:
  [ticket/13042] Remove unused variables
2014-09-10 22:17:17 +02:00
d465e7e438 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html
2014-09-10 20:02:20 +02:00
c842583bbf Merge pull request #2936 from nickvergessen/ticket/12976
[ticket/12976] Correctly use plurals for attachment count in UCP navigation

* nickvergessen/ticket/12976:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation
2014-09-10 20:00:52 +02:00
51f5c2d094 [ticket/13042] Remove unused variables
PHPBB3-13042
2014-09-10 17:38:05 +02:00
d320897180 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13052] Restore timespan parameter for check_form_key()
2014-09-10 11:50:28 +02:00
d87547da66 [ticket/13052] Restore timespan parameter for check_form_key()
PHPBB3-13052
2014-09-10 08:07:21 +02:00
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation
PHPBB3-12976
2014-09-09 21:31:34 +02:00
aa6d7a09b8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
2014-09-09 21:25:21 +02:00
ef61deb132 [ticket/13052] Use request class instead of $_POST and request_var()
PHPBB3-13052
2014-09-09 19:49:17 +02:00
ad8d53af27 [ticket/13052] Fix appearances with multiple parameters
PHPBB3-13052
2014-09-09 19:47:00 +02:00
047728e3d4 [ticket/13052] Remove additional parameter from check_form_key()
PHPBB3-13052
2014-09-09 19:46:27 +02:00
c00e0c55c5 Merge branch 'develop-ascraeus' into develop 2014-09-07 11:58:57 +02:00
a0ee6ccdf3 Merge pull request #2925 from nickvergessen/ticket/12983
Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
2014-09-07 11:41:44 +02:00
e0711b417f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
2014-09-06 13:54:16 +02:00
6387bf8d13 Merge pull request #2918 from marc1706/ticket/13031
[ticket/13031] Only use mimetype guesser guess if it helps us

* marc1706/ticket/13031:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
2014-09-06 13:53:43 +02:00
bc38730ab5 Merge branch 'develop-ascraeus' into develop 2014-09-05 21:36:02 +02:00
6eaeae60f6 Merge pull request #2748 from carlo94it/ticket/12765
[ticket/12765] Use db_tools instead of generating queries at moment
2014-09-05 21:23:04 +02:00
b9cb3b9e3e [ticket/12983] Correctly validate sorting options in the UCP
PHPBB3-12983
2014-09-05 13:24:31 +02:00
d31ff51785 [ticket/13031] Guess with all mimetype guessers and pick best guess
PHPBB3-13031
2014-09-05 10:56:06 +02:00
cb3eb84665 [ticket/13034] Fix the route generated for the frontend not in the phpbb root
PHPBB3-13034
2014-09-04 23:21:55 +02:00
7de15bc54c [ticket/13031] Only use mimetype guesser guess if it helps us
If we already have a mimetype and the guesser's guess is the default fallback,
we should keep the already existing mimetype the browser supplied. Otherwise,
platforms that might not support mimetype guessers will cause us to always
have the mimetype set to application/octet-stream on images. This will prevent
users from uploading images.

PHPBB3-13031
2014-09-03 23:09:17 +02:00
05a7a57815 Merge branch 'develop-ascraeus' into develop 2014-08-30 22:56:26 +02:00
01f821bbc3 Merge pull request #2826 from brunoais/ticket/12928
[ticket/12928] core.mcp_reports_gather_query_before
2014-08-30 22:55:56 +02:00
df3bc78af8 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12966] Sort by post_time and post_id where applicable
  [ticket/12966] Sort posts by post_id in addition to sorting by post_time
2014-08-29 20:44:41 +05:30
6d9c0a76df Merge pull request #2865 from marc1706/ticket/12966
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
2014-08-29 20:44:01 +05:30
8144de3792 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
2014-08-24 00:26:57 +02:00
6e274740df [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
PHPBB3-13010
2014-08-24 00:11:43 +02:00
e5e45f860b [ticket/12966] Sort by post_time and post_id where applicable
This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966
2014-08-23 16:36:39 +02:00
rxu
30b6080529 [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
Add $quickmod and $action variables
for the 'core.modify_quickmod_actions' event trigerring
to avoid of using global operator in corresponding extensions.

PHPBB3-13006
2014-08-22 21:55:26 +08:00
rxu
0aa7d3ef75 [ticket/13005] Add event to display_forums() to modify category template data
While there're events to modify/add FORUM_POST/FORUM_LINK template data,
such an event is missing for FORUM_CAT forum type.

PHPBB3-13005
2014-08-22 18:53:20 +08:00