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

2194 commits

Author SHA1 Message Date
Andreas Fischer
a16f185413 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:43 +02:00
Andreas Fischer
afada9ed40 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:42 +02:00
Oliver Schramm
53f166274a [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility 
PHPBB3-13168
 2014-10-20 16:47:52 +02:00
Oliver Schramm
f049fcd604 [ticket/11863] Display warning to user because of activation method 
PHPBB3-11863
 2014-10-17 15:42:11 +02:00
Oliver Schramm
01df1d3301 [ticket/11863] Grey out unavailable activation methods when emails disabled 
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
 2014-10-17 15:40:03 +02:00
Joas Schilling
1fa0c861b7 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:45:18 +02:00
Joas Schilling
4b90357d79 Merge pull request #2307 from PayBas/ticket/12408 
[ticket/12408] Add quick setting for "default guest style" to ACP
 2014-10-06 23:43:27 +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
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
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
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
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
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
Jakub Senko
e59222496a [ticket/13045] Remove Pragma headers 
PHPBB3-13045
 2014-09-17 20:10:01 +02:00
Marc Alexander
f4761b5e08 [ticket/12858] Directly return and use timezone selects 
PHPBB3-12858
 2014-09-17 19:07:24 +02:00
Marc Alexander
6323180344 [ticket/12858] Fix timezone display on acp users page 
PHPBB3-12858
 2014-09-17 17:56:09 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop 
PHPBB3-12858
 2014-09-17 14:22:08 +02:00
PayBas
0061a305d8 [ticket/12408] Fix white-space sniffer 
PHPBB3-12408
 2014-09-15 15:25:43 +02:00
PayBas
aaddf41e5b [ticket/12408] Changed lang vars, added fieldset and removed "default" 
PHPBB3-12408
 2014-09-15 14:43:40 +02:00
PayBas
0b4944f125 [ticket/12408] Public functions and updated doc block 
PHPBB3-12408
 2014-09-15 14:43:40 +02:00
PayBas
60c9955f51 [ticket/12408] Code cleanup 
Rebased to see if travis will finally play along

PHPBB3-12408
 2014-09-15 14:43:39 +02:00
PayBas
ae63843647 [ticket/12408] Simplified queries 
PHPBB3-12408
 2014-09-15 14:43:38 +02:00
PayBas
265c621c9e [ticket/12408] Add quick setting for "default guest style" to ACP 
PHPBB3-12408
 2014-09-15 14:43:38 +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
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types 
PHPBB3-12990
 2014-08-16 21:46:03 +02:00
Nils Adermann
837ed8b6e1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
 2014-08-11 17:38:29 +02:00
Nils Adermann
bad90dafbf Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus 
* github-marc1706/ticket/12822:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes
 2014-08-11 17:37:56 +02:00
Marc Alexander
f09db1a7b4 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/config/services.yml
 2014-08-11 12:23:21 +02:00
Tristan Darricau
b91abf1a0b [ticket/11854] Rename captchas.factory service to captcha.factory 
PHPBB3-11854
 2014-08-11 01:16:22 +02:00
Tristan Darricau
160ff7b912 [ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins 
PHPBB3-11854
 2014-08-11 01:15:49 +02:00
Carlo
51f534c82e [ticket/12765] Execute query directly from db tools 
PHPBB3-12765
 2014-08-10 14:26:12 +02:00
Carlo
03040de75a [ticket/12765] Use db_tools instead of generating queries at moment 
PHPBB3-12765
 2014-08-10 14:26:10 +02:00
Andreas Fischer
eeb80d2ec5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
 2014-08-08 16:03:25 +02:00
Marc Alexander
27f769e461 [ticket/10404] Fix codesniffer complaint about anonymous function 
PHPBB3-10404
 2014-08-08 14:01:04 +02:00
Marc Alexander
c5d72c94f1 [ticket/10404] Use anonymous function instead of create_function in acp/auth 
PHPBB3-10404
 2014-08-08 12:19:36 +02:00
Marc Alexander
e0c2013bb9 [ticket/12822] Add method for deleting avatars and use confirm_box 
The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.

PHPBB3-12822
 2014-08-07 17:29:33 +02:00
Joas Schilling
9925733350 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
 2014-08-07 16:24:48 +02:00
Joas Schilling
a2b6f4e166 Merge pull request #2812 from bantu/ticket/12826 
[ticket/12826] Add root namespace indicator to exception catching.

* bantu/ticket/12826:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
 2014-08-07 16:24:41 +02:00
Joas Schilling
05b290c6b2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html
 2014-08-07 16:13:46 +02:00
Joas Schilling
0194c261c3 Merge pull request #2720 from PayBas/ticket/12838 
[ticket/12838] Add ACP events to acp_ranks

* PayBas/ticket/12838:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html
 2014-08-07 16:13:35 +02:00
Andreas Fischer
e523711ec2 [ticket/12826] Add optional root namespace indicator for consistency. 
PHPBB3-12826
 2014-08-07 14:25:53 +02:00
Joas Schilling
3722aac495 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12847] Allow the extensions to say if they can be enabled
 2014-08-07 13:00:21 +02:00
Joas Schilling
f474e33a43 Merge pull request #2729 from Nicofuma/ticket/12847 
[ticket/12847] Allow the extensions to say if they can be enabled

* Nicofuma/ticket/12847:
  [ticket/12847] Allow the extensions to say if they can be enabled
 2014-08-07 13:00:08 +02:00
Joas Schilling
28224bad70 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12557] Fix load active module description
  [ticket/12557] Fix php file description
  [ticket/12557] Fix post data description for notifications
  [ticket/12557] Fix pass by reference doc blocks
  [ticket/12557] Fix doc block in extension base class
  [ticket/12557] Fix doc block in mimetype guesser
  [ticket/12557] Fix var $preserve_cr description
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Template fixes
  [ticket/12557] Search, cron and profilefields fixes
  [ticket/12557] Notification fixes
  [ticket/12557] Fix doc block errors found by Sami pt1
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
 2014-08-07 12:44:10 +02:00
Joas Schilling
2f44a865a0 Merge pull request #2477 from n-aleha/ticket/12557ascraeus 
[ticket/12557] Fix doc block errors found by Sami for ascraeus

* n-aleha/ticket/12557ascraeus:
  [ticket/12557] Fix load active module description
  [ticket/12557] Fix php file description
  [ticket/12557] Fix post data description for notifications
  [ticket/12557] Fix pass by reference doc blocks
  [ticket/12557] Fix doc block in extension base class
  [ticket/12557] Fix doc block in mimetype guesser
  [ticket/12557] Fix var $preserve_cr description
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Template fixes
  [ticket/12557] Search, cron and profilefields fixes
  [ticket/12557] Notification fixes
  [ticket/12557] Fix doc block errors found by Sami pt1
  [ticket/12557] Fix doc block errors found by Sami
  [ticket/12557] Fix doc block errors found by Sami
 2014-08-07 12:43:45 +02:00