makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 00:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
23794 commits 18 branches 192 tags 207 MiB
Commit graph

9199 commits

Author SHA1 Message Date
Marc Alexander
397be4d93f Merge branch 'develop-ascraeus' into develop 2014-09-23 11:12:39 +02:00
Marc Alexander
92b096b05b Merge pull request #2984 from nickvergessen/ticket/10729-asc 
[3.1][ticket/10729] Update editor information when user being deleted
 2014-09-23 11:09:29 +02:00
Joas Schilling
9ff6358dc9 Merge branch 'ticket/10729' into ticket/10729-asc 
Conflicts:
	phpBB/includes/functions_user.php
 2014-09-23 09:31:13 +02:00
Joas Schilling
d48e4b680e [ticket/10729] Fix doc block for user_delete 
PHPBB3-10729
 2014-09-22 00:55:08 +02:00
Dhruv
93dc33b002 Merge branch 'develop-ascraeus' into develop 
# By Jakub Senko
# Via Dhruv Goel (1) and Jakub Senko (1)
* develop-ascraeus:
  [ticket/13045] Remove Pragma headers
 2014-09-21 11:31:13 +05:30
Dhruv Goel
84e68b3a73 Merge pull request #2963 from Senky/ticket/13045 
[ticket/13045] Remove Pragma headers
 2014-09-21 11:29:56 +05:30
Joas Schilling
26c6ffa458 [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development 2014-09-20 09:52:53 +02:00
Joas Schilling
301694e922 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 2014-09-19 19:02:31 +02:00
Marc Alexander
9bf58697dc Merge branch 'ticket/13073' into ticket/13073-develop 
Conflicts:
	tests/controller/common_helper_route.php
 2014-09-19 18:48:24 +02:00
Marc Alexander
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
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
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
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
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
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
Cesar G
bf7041eeb9 [ticket/13019] Always accept a reason for deleting a post/topic. 
PHPBB3-13019
 2014-09-14 10:38:56 -07:00
Tristan Darricau
c988b98ac6 [ticket/13061] Replace the service event.subscriber_loader by a compiler pass 
PHPBB3-13061
 2014-09-13 14:34:18 +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
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
Andreas Fischer
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
Tristan Darricau
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
Tristan Darricau
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
Jakub Senko
51f5c2d094 [ticket/13042] Remove unused variables 
PHPBB3-13042
 2014-09-10 17:38:05 +02:00
Tristan Darricau
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
Joas Schilling
d87547da66 [ticket/13052] Restore timespan parameter for check_form_key() 
PHPBB3-13052
 2014-09-10 08:07:21 +02:00
Joas Schilling
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation 
PHPBB3-12976
 2014-09-09 21:31:34 +02:00
Andreas Fischer
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
Joas Schilling
ef61deb132 [ticket/13052] Use request class instead of $_POST and request_var() 
PHPBB3-13052
 2014-09-09 19:49:17 +02:00
Joas Schilling
ad8d53af27 [ticket/13052] Fix appearances with multiple parameters 
PHPBB3-13052
 2014-09-09 19:47:00 +02:00
Joas Schilling
047728e3d4 [ticket/13052] Remove additional parameter from check_form_key() 
PHPBB3-13052
 2014-09-09 19:46:27 +02:00
Marc Alexander
c00e0c55c5 Merge branch 'develop-ascraeus' into develop 2014-09-07 11:58:57 +02:00
Marc Alexander
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
Tristan Darricau
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
Tristan Darricau
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
Marc Alexander
bc38730ab5 Merge branch 'develop-ascraeus' into develop 2014-09-05 21:36:02 +02:00
Marc Alexander
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
Joas Schilling
b9cb3b9e3e [ticket/12983] Correctly validate sorting options in the UCP 
PHPBB3-12983
 2014-09-05 13:24:31 +02:00
Marc Alexander
d31ff51785 [ticket/13031] Guess with all mimetype guessers and pick best guess 
PHPBB3-13031
 2014-09-05 10:56:06 +02:00