mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
23,952 Commits 17 Branches 190 Tags
Commit Graph

23952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Darricau
03a1c7ed2e [ticket/13130] Updates dependencies to Symfony 2.5 
PHPBB3-13130
 2014-10-04 21:16:12 +02:00
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
Joas Schilling
ea1eff4fa5 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:36:02 +02:00
Joas Schilling
90241ae4e6 Merge pull request #2947 from rxu/ticket/13059 
[ticket/13059] Add core event to generate_page_link()
 2014-10-02 15:35:55 +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
Tristan Darricau
fbbb5c47da Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13123] Add events to allow modifying post data
 2014-10-01 16:09:59 +02:00
Tristan Darricau
c123c93ca0 Merge pull request #3012 from nickvergessen/ticket/13123 
[ticket/13123] Add events to allow modifying post data

* nickvergessen/ticket/13123:
  [ticket/13123] Add events to allow modifying post data
 2014-10-01 16:09:04 +02:00
Marc Alexander
ec34fb85ca Merge branch 'develop-ascraeus' into develop 2014-10-01 15:59:15 +02:00
Marc Alexander
0e27b10b8f Merge pull request #3015 from nickvergessen/ticket/13119 
[ticket/13119] Add another event which is triggered independent from actions
 2014-10-01 15:59:00 +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
rxu
ce4035fdd3 [ticket/13059] Add core event to generate_page_link() 
Add core event to generate_page_link() to allow
overriding/modifying pagination URLs.
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905

PHPBB3-13059
 2014-10-01 20:55:07 +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
b9226c6877 Merge branch 'develop-ascraeus' into develop 2014-10-01 11:39:35 +02:00
Joas Schilling
40cd7570e6 [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224" 
This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing
changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292.

PHPBB3-11224
 2014-10-01 11:38:45 +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
0a58cca031 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:27:56 +02:00
Joas Schilling
d264369441 Merge pull request #2460 from Nicofuma/ticket/11224 
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
 2014-10-01 10:27:47 +02:00
Joas Schilling
b1d35363db Merge branch 'develop-ascraeus' into develop 2014-10-01 10:24:27 +02:00
Joas Schilling
75fcfb1c1d Merge pull request #2545 from ptitlazy/ticket/12657 
[ticket/12657] Add a test file for base case of command cache:purge
 2014-10-01 10:24:19 +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
Joas Schilling
b99ba4d416 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:03:16 +02:00
Joas Schilling
b6acc1b9db Merge pull request #2978 from blitze/ticket/13071 
[ticket/13071] Only use total_match_count after event dispatcher
 2014-10-01 10:01:09 +02:00
Joas Schilling
48dd87bd34 Merge branch 'develop-ascraeus' into develop 2014-10-01 09:56:51 +02:00
Joas Schilling
1b393b1d0b Merge pull request #2979 from blitze/ticket/13072 
[ticket/13072] Add total_match_count to core.search_get_topic_data event
 2014-10-01 09:56:39 +02:00
Joas Schilling
d3ee8d24bc Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
 2014-10-01 09:53:08 +02:00
Joas Schilling
effb5d95d0 Merge pull request #2998 from rxu/ticket/13107 
[ticket/13107] Add template events to forum row in forumlist_body.html
 2014-10-01 09:50:38 +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
1ee4894271 [ticket/13121] Fix migration file 
PHPBB3-13121
 2014-10-01 00:29:45 -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
7c8b8877df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
 2014-10-01 02:15:26 +02:00
Andreas Fischer
8fef959418 Merge pull request #3011 from fredemmott/ticket/13122 
[ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable

* fredemmott/ticket/13122:
  [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable
 2014-10-01 02:15:25 +02:00
Fred Emmott
f30c5f730e [ticket/13122] Make phpbb_wrapper_gmgetdate_test more reliable 
If you're unlucky, calling time() or similar twice in a row will
give you different results. Facebook runs these tests thousands of
times a day, so we occasionally get bogus failures.

PHPBB3-13122
 2014-09-30 15:53:02 -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
Andreas Fischer
a8e74fff9b Merge pull request #3010 from Nicofuma/ticket/13120 
[ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders

* Nicofuma/ticket/13120:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
 2014-10-01 00:26:39 +02:00
Joas Schilling
cb49a0c4cc [ticket/13123] Add events to allow modifying post data 
PHPBB3-13123
 2014-10-01 00:13:37 +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
Andreas Fischer
ec89d11609 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13105] Fix the code logic as described in the comment
 2014-09-30 21:15:27 +02:00