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
Marc Alexander
3e52126446
Merge branch 'develop-ascraeus' into develop
2014-08-06 23:42:35 +02:00
Joas Schilling
7755f5354f
[ticket/12901] Fix another wrong type hint for $level
...
PHPBB3-12901
2014-08-03 22:42:17 +02:00
jeroendedauw
1d923260a6
[ticket/12901] Fix type hinting of style $level
...
PHPBB3-12901
2014-08-03 22:42:16 +02:00
n-aleha
6ac8d17af6
[ticket/12557] Fix doc block errors found by Sami
...
More corrections.
PHPBB3-12557
2014-08-03 07:13:20 +03:00
n-aleha
19b9df7e63
[ticket/12557] Fix doc block errors found by Sami
...
PHPBB3-12557
2014-08-03 06:57:05 +03:00
Marc Alexander
1095086cde
Merge branch 'develop-ascraeus' into develop
2014-07-28 16:45:21 +02:00
Marc Alexander
d8867bb40d
Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeus
2014-07-28 16:44:37 +02:00
Joas Schilling
fdb756e633
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12896] Add php event for admin notices
2014-07-27 19:42:10 +02:00
Forumhulp.com
5dcf56c98d
[ticket/12896] Add php event for admin notices
...
PHPBB3-12896
2014-07-27 19:35:07 +02:00
Joas Schilling
75aef80104
[ticket/12891] Replace template loops with 1 loop to reduce generation time
...
PHPBB3-12891
2014-07-25 13:27:49 +02:00
PayBas
8d8e0aae68
[ticket/12838] Update RC2 to RC3
...
PHPBB3-12838
2014-07-16 22:05:28 +02:00
Tristan Darricau
519e64205a
[ticket/12847] Allow the extensions to say if they can be enabled
...
PHPBB3-12847
2014-07-13 18:09:34 +02:00
PayBas
c9803b7ba3
[ticket/12838] Add raw row-data to acp_ranks core event
...
PHPBB3-12838
2014-07-10 16:24:49 +02:00
PayBas
9468d173bc
[ticket/12838] Add core events to acp_ranks.php
...
PHPBB3-12838
2014-07-10 13:29:07 +02:00
Nils Adermann
e97fab49e2
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:36 +02:00
Nils Adermann
53ff23671c
Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
...
* github-nicofuma/ticket/12446:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:20 +02:00
Joas Schilling
7ad88ba32b
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12777] Add tests for unavailable extension
[ticket/12777] Add tests
[ticket/12777] Add is_purged()
[ticket/12777] Update doc block of is_configured()
[ticket/12777] Rename extension status functions and add is_configured()
2014-06-29 23:41:28 +02:00
Joas Schilling
5652f33ccc
Merge pull request #2669 from Nicofuma/ticket/12777
...
[ticket/12777] Rename extension status functions and add is_configured()
* Nicofuma/ticket/12777:
[ticket/12777] Add tests for unavailable extension
[ticket/12777] Add tests
[ticket/12777] Add is_purged()
[ticket/12777] Update doc block of is_configured()
[ticket/12777] Rename extension status functions and add is_configured()
2014-06-29 23:33:47 +02:00
Tristan Darricau
d13e02c7b1
[ticket/12777] Rename extension status functions and add is_configured()
...
PHPBB3-12777
2014-06-27 10:49:13 +02:00
Andreas Fischer
eef50ae41b
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Joas Schilling
7e769083bf
[ticket/12196] Fix typo in "referrer"
...
Referer is a typo in the HTTP RFC and should not be used in the UI
PHPBB3-12196
2014-06-26 23:44:21 +02:00
Andreas Fischer
dd835790c6
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
Andreas Fischer
ffa1f9baf5
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
Tristan Darricau
ff6e026a40
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
...
PHPBB3-12446
2014-06-26 21:09:19 +02:00
Dhruv
a730c0291f
[ticket/12196] Revert Fix typo "referer" in acp/attachments
...
This reverts commit 9bc1f7924dhttps://tracker.phpbb.com/browse/PHPBB3-12196
PHPBB3-12196
2014-06-27 00:07:15 +05:30
Dhruv
cb6c0db51b
Merge branch 'develop-ascraeus' into develop
...
# By Joas Schilling
# Via Dhruv (2) and Joas Schilling (1)
* develop-ascraeus:
[ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:33 +05:30
Dhruv
eb3e1b35d6
Merge branch 'develop-olympus' into develop-ascraeus
...
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
[ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:06 +05:30
Joas Schilling
9bc1f7924d
[ticket/12196] Fix typo "referer" in acp/attachments
...
PHPBB3-12196
2014-06-25 23:17:02 +02:00
Dhruv
6be8c98296
Merge branch 'develop-ascraeus' into develop
...
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
[ticket/12563] Adds « and » to the links in acp_styles.php
[ticket/12563] Removes ending . from <a>
[ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
[ticket/12563] Changes 2 language variables to better understandable names
2014-06-23 22:07:15 +05:30
Dhruv Goel
dfbe072d51
Merge pull request #2571 from Crizz0/ticket/12563
...
[ticket/12563] Changes 2 style specific language variables for better understanding
2014-06-23 22:04:20 +05:30
Andreas Fischer
80e0851189
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12747] Remove some methods which are not used anymore
[ticket/12747] Drop support for Firebird
2014-06-22 23:41:26 +02:00
Andreas Fischer
4f2acbaed2
Merge pull request #2629 from nickvergessen/ticket/12747
...
[ticket/12747] Drop support for Firebird
* nickvergessen/ticket/12747:
[ticket/12747] Remove some methods which are not used anymore
[ticket/12747] Drop support for Firebird
Conflicts:
phpBB/phpbb/db/driver/firebird.php
2014-06-22 23:41:14 +02:00
Crizzo
c4e48ed0b9
[ticket/12563] Adds « and » to the links in acp_styles.php
...
PHPBB3-12563
2014-06-22 22:02:46 +02:00
Andreas Fischer
0b52d60e28
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12723] Do not mention too many details on documentation.
[ticket/12723] Do not reference the coding guidelines section.
[ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions
[ticket/12723] Properly describe new Code Sniffer rulsets.
[ticket/12723] Use core suffix in filename instead of phpbb in the middle.
[ticket/12723] Add Sniff ensuring PHP files use the correct file header
2014-06-22 11:35:13 +02:00
Tristan Darricau
32a2c95f90
[ticket/12723] Add Sniff ensuring PHP files use the correct file header
...
PHPBB3-12723
2014-06-22 00:45:34 +02:00
Joas Schilling
04164affe6
[ticket/12747] Drop support for Firebird
...
PHPBB3-12747
2014-06-20 12:35:42 +02:00
Andreas Fischer
c9da435d3c
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12721] Update rules descriptions
[ticket/12721] Add Generic.NamingConventions.ConstructorName in strict
[ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy
[ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
[ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration
[ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
[ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman
[ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
[ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
2014-06-17 00:42:40 +02:00
Tristan Darricau
34a4ba36cd
[ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
...
PHPBB3-12721
2014-06-16 22:35:12 +02:00
Andreas Fischer
7f5aeeef01
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
2014-06-16 22:24:59 +02:00
Tristan Darricau
ca3cdadd08
[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
...
PHPBB3-12722
2014-06-16 19:05:09 +02:00
Dhruv
aaa9a4b0e6
Merge branch 'develop-ascraeus' into develop
...
# By Tristan Darricau
# Via Dhruv Goel (1) and Tristan Darricau (1)
* develop-ascraeus:
[ticket/12109] Fix coding style
[ticket/12109] Bug when setting permissions with "Select all users"
2014-06-15 13:05:53 +05:30
Dhruv Goel
587759bd6a
Merge pull request #2431 from Nicofuma/ticket/12109
...
[ticket/12109] Bug when setting permissions with "Select all users"
2014-06-15 13:04:35 +05:30
Crizzo
453cb70963
[ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
...
PHPBB3-12563
2014-06-12 19:19:46 +02:00
Dhruv
464a1190ea
Merge branch 'develop-ascraeus' into develop
...
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
[ticket/12694] Remove whitespace at end of line from acp_groups
2014-06-11 22:44:35 +05:30
