makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-15 15:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
23952 commits 18 branches 192 tags 206 MiB
Commit graph

9245 commits

Author SHA1 Message Date
Andreas Fischer
c8a1826823 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13125] $user->browser to $browser
 2014-10-04 00:41:25 +02:00
Andreas Fischer
682527f509 Merge pull request #3018 from Senky/ticket/13125 
[ticket/13125] Uploaded avatars are not displayed

* Senky/ticket/13125:
  [ticket/13125] $user->browser to $browser
 2014-10-04 00:41:25 +02:00
Joas Schilling
6cb5e6c3b4 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:38:27 +02:00
Joas Schilling
240ff27707 Merge pull request #3000 from rxu/ticket/13110 
[ticket/13110] Add core event to the page_footer() function
 2014-10-02 15:38:22 +02:00
Jakub Senko
6400902a01 [ticket/13125] $user->browser to $browser 
PHPBB3-13125
 2014-10-02 15:34:56 +02:00
Joas Schilling
a3456c90c9 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:33:40 +02:00
Joas Schilling
ee758e22a6 Merge pull request #2999 from rxu/ticket/13108 
[ticket/13108] Add core event to the parse_attachments() function
 2014-10-02 15:33:32 +02:00
Joas Schilling
b7610b444a Merge branch 'develop-ascraeus' into develop 2014-10-02 15:18:44 +02:00
Joas Schilling
2ee13bbc24 Merge pull request #3004 from Senky/ticket/13116 
[ticket/13116] Topic and post approval notifications got interchanged
 2014-10-02 15:18:23 +02:00
Marc Alexander
ec34fb85ca Merge branch 'develop-ascraeus' into develop 2014-10-01 15:59:15 +02:00
rxu
a876cc8c26 [ticket/13108] Add core event to the parse_attachments() function 
Add core event to the parse_attachments() function in functions_content.php
to allow modifying/adding attachment template data.

PHPBB3-13108
 2014-10-01 21:00:37 +08:00
Joas Schilling
95c0d81ba1 [ticket/13119] Add another event which is triggered independent from actions 
PHPBB3-13119
 2014-10-01 14:54:26 +02:00
Joas Schilling
dceb334a0c Merge branch 'develop-ascraeus' into develop 2014-10-01 10:34:42 +02:00
Joas Schilling
b003019958 Merge pull request #3013 from VSEphpbb/ticket/13121 
[ticket/13121] Remove cache mode from style management module
 2014-10-01 10:34:08 +02:00
Joas Schilling
d73194a415 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:19:39 +02:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993 
[ticket/12993] Improve get_user_ranks
 2014-10-01 10:19:24 +02:00
Joas Schilling
9ad7eddc25 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:09:39 +02:00
Joas Schilling
994a0dcd4c Merge branch 'ticket/12985' into develop-ascraeus 2014-10-01 10:09:29 +02:00
david63
5314c2bddf [ticket/12985] Add core.login_box_redirect 
Add core.login_box_redirect core event to allow extensions to redirect a
user to a specific page when logging in.

PHPBB3-12985
 2014-10-01 10:09:10 +02:00
Cesar G
d644de5217 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
 2014-10-01 00:44:16 -07:00
Cesar G
8ab7f6b595 Merge remote-tracking branch 'nickvergessen/ticket/13119' into develop-ascraeus 
* nickvergessen/ticket/13119:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
 2014-10-01 00:43:41 -07:00
Matt Friedman
65539df39a [ticket/13121] Remove cache mode from style management module 
https://tracker.phpbb.com/browse/PHPBB3-13121

PHPBB3-13121
 2014-10-01 00:03:54 -07:00
Andreas Fischer
236f75c6cb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
 2014-10-01 00:26:39 +02:00
Tristan Darricau
3a413cbf30 [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders 
PHPBB3-13120
 2014-09-30 21:20:42 +02:00
Joas Schilling
6f66423de9 [ticket/13119] Remove unused globals and use the request class 
PHPBB3-13119
 2014-09-30 18:22:06 +02:00
Joas Schilling
7efc624b0a [ticket/13119] Add events to ACP's ban module 
PHPBB3-13119
 2014-09-30 18:22:05 +02:00
Joas Schilling
9c3126add0 [ticket/13119] Add events to MCP's ban module 
PHPBB3-13119
 2014-09-30 18:22:04 +02:00
Jakub Senko
e132cdd325 [ticket/13116] Interchange post and topic approval notification 
PHPBB3-13116
 2014-09-29 21:13:53 +02:00
rxu
eb2aa1f83a [ticket/13110] Add core event to the page_footer() function 
Add core event to the page_footer() in includes/functions.php to allow
extensions handling overall page output before its displaying.

PHPBB3-13110
 2014-09-28 15:39:06 +08:00
Tristan Darricau
cd7b21a703 [ticket/12993] Update doc block 
PHPBB3-12993
 2014-09-24 16:07:23 +02:00
Joas Schilling
77ed437b79 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html
 2014-09-24 14:49:50 +02:00
Joas Schilling
85bc9b69ae Merge pull request #2844 from marc1706/ticket/12858 
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
 2014-09-24 13:47:59 +02:00
Joas Schilling
c4428a507a Merge branch 'develop-ascraeus' into develop 2014-09-23 15:32:22 +02:00
Joas Schilling
ef9e0e743a Merge pull request #2937 from Senky/ticket/13027 
[ticket/13027] PM folder full percentage could be a bit more accurate
 2014-09-23 15:32:14 +02:00
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
Marc Alexander
457e13634e [ticket/12858] Properly format UTC offset in footer 
PHPBB3-12858
 2014-09-19 23:45:03 +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
Marc Alexander
f4761b5e08 [ticket/12858] Directly return and use timezone selects 
PHPBB3-12858
 2014-09-17 19:07:24 +02:00