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
18,916 Commits 17 Branches 190 Tags
Commit Graph

18916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Guse
25995e311c Merge pull request #1790 from prototech/ticket/11280 
[ticket/11280] Prevent duplicate entry in forums_track table.
 2013-11-02 12:10:19 -07:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746 
[ticket/11746] Add "admin activation required" notification.
 2013-11-02 11:55:16 -07:00
Nathan Guse
4d6c7223b4 Merge pull request #1847 from nickvergessen/ticket/11995 
Ticket/11995 Fix Revert of config.remove migration
 2013-11-02 11:38:22 -07:00
Joas Schilling
e8a3028ea6 [ticket/11995] Remove exceptions and split reverse into different tests 
PHPBB3-11995
 2013-11-02 19:26:45 +01:00
Joas Schilling
414a4d587e [ticket/11995] Fix Revert of config.remove 
PHPBB3-11995
 2013-11-02 18:13:11 +01:00
Joas Schilling
a175b091b9 [ticket/11995] Add unit test for reverting config.remove 
PHPBB3-11995
 2013-11-02 18:12:50 +01:00
Joas Schilling
8a78699f6c Merge remote-tracking branch 'brunoais/ticket/11663' into develop 
* brunoais/ticket/11663:
  [ticket/11663] Add the doc block about the parameters.
  [ticket/11663] Add the doc block about the return value.
  [ticket/11663] Make generate_text_for_storage return the errors.
 2013-11-02 16:26:29 +01:00
Nils Adermann
158c998216 Merge pull request #1810 from nickvergessen/ticket/11031 
Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
 2013-11-02 07:20:15 -07:00
Joas Schilling
481d25d885 [ticket/11031] Convert user notification options with default settings 
PHPBB3-11031
 2013-11-02 13:30:29 +01:00
Joas Schilling
cb8cd50495 [ticket/11031] Correctly add groups to teampage 
PHPBB3-11031
 2013-11-02 13:25:46 +01:00
Joas Schilling
252a2d7991 Merge remote-tracking branch 'Marc/ticket/11983' into develop 
* Marc/ticket/11983:
  [ticket/11983] Add missing argument to docblock in ucp_notifications
 2013-11-02 11:00:42 +01:00
Marc Alexander
54b7b2320c [ticket/11983] Add missing argument to docblock in ucp_notifications 
The argument $subscriptions was not documented in the docblock of the method
output_notification_types() until now.

PHPBB3-11983
 2013-11-02 10:42:16 +01:00
Nils Adermann
e118b4f4c0 Merge pull request #1839 from bantu/task/code-sniffer 
More PHP Code Sniffer rules
 2013-11-01 07:58:18 -07:00
Nathan Guse
652365158a Merge pull request #1844 from mvinny/ticket/11992 
ticket/11992
 2013-10-31 11:39:26 -07:00
Marcus Vinny
e4008308fc [ticket/11992] Fix Users with most Warnings block 
PHPBB3-11992
 2013-10-31 15:30:02 -03:00
Andreas Fischer
ae7ef3e09d [task/code-sniffer] Remove class result_mssqlnative. 
PHPBB3-11980
 2013-10-31 00:48:03 +01:00
Andreas Fischer
d499db36a0 Merge remote-tracking branch 'prototech/ticket/11987' into develop 
* prototech/ticket/11987:
  [ticket/11987] Add {ADMIN_ROOT_PATH}.
  [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.
  [ticket/11987] Change {ROOT_PATH} to point to board root.
 2013-10-31 00:44:58 +01:00
Andreas Fischer
f11b7a7828 Merge remote-tracking branch 'prototech/ticket/11991' into develop 
* prototech/ticket/11991:
  [ticket/11991] Fix incorrect class name for report_post_closed notification.
 2013-10-31 00:44:48 +01:00
Cesar G
831075e5fe [ticket/11987] Add {ADMIN_ROOT_PATH}. 
PHPBB3-11987
 2013-10-30 16:13:20 -07:00
Cesar G
05dd4d55d2 [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}. 
PHPBB3-11987
 2013-10-30 15:43:07 -07:00
Cesar G
7251feab67 [ticket/11987] Change {ROOT_PATH} to point to board root. 
PHPBB3-11987
 2013-10-30 15:42:35 -07:00
Cesar G
a95306643e [ticket/11991] Fix incorrect class name for report_post_closed notification. 
PHPBB3-11991
 2013-10-30 15:17:08 -07:00
Dhruv
a9524d6e08 Merge remote-tracking branch 'nickvergessen/ticket/11974' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
  [ticket/11974] Fix timezone names with underscores
  [ticket/11974] Translate all timezones
 2013-10-30 22:43:25 +05:30
Andreas Fischer
10bfb2fe05 [task/code-sniffer] Completely ignore database_update.php. 
PHPBB3-11980
 2013-10-30 13:56:11 +01:00
Andreas Fischer
ef1f991837 [task/code-sniffer] Replace spaces with tabs. 
PHPBB3-11980
 2013-10-30 13:37:29 +01:00
Andreas Fischer
7aa8f6461f [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files. 
PHPBB3-11980
 2013-10-30 13:05:28 +01:00
Andreas Fischer
6ac46ad469 [task/code-sniffer] Add PSR1.Files.SideEffects.FoundWithSymbols 
PHPBB3-11980
 2013-10-30 11:40:34 +01:00
Andreas Fischer
49269fbdf4 [task/code-sniffer] Add PSR1.Classes.ClassDeclaration.MissingNamespace 
PHPBB3-11980
 2013-10-30 01:33:00 +01:00
Andreas Fischer
3944efe528 [task/code-sniffer] Add Generic.WhiteSpace.DisallowSpaceIndent 
PHPBB3-11980
 2013-10-30 01:15:57 +01:00
Andreas Fischer
63ce04d565 [task/code-sniffer] Add Generic.Functions.CallTimePassByReference 
PHPBB3-11980
 2013-10-30 00:49:01 +01:00
Andreas Fischer
94334992ec [task/code-sniffer] Add Generic.Formatting.DisallowMultipleStatements 
PHPBB3-11980
 2013-10-30 00:44:24 +01:00
Andreas Fischer
69a766fe79 [task/code-sniffer] Add OneClassPerFile and OneInterfacePerFile. 
PHPBB3-11980
 2013-10-30 00:31:39 +01:00
Andreas Fischer
27a180f5d2 [task/code-sniffer] Add Generic.CodeAnalysis.UselessOverridingMethod 
PHPBB3-11980
 2013-10-30 00:12:47 +01:00
Andreas Fischer
721e652425 [task/code-sniffer] Add Generic.CodeAnalysis.ForLoopShouldBeWhileLoop 
PHPBB3-11980
 2013-10-29 23:56:11 +01:00
Andreas Fischer
387ed37b31 [task/code-sniffer] Do not abort immediately on PHP Code Sniffer failure. 
PHPBB3-11980
 2013-10-29 23:53:07 +01:00
Andreas Fischer
02e9f6e284 [task/code-sniffer] Fix argument list spacing. 
PHPBB3-11980
 2013-10-29 23:38:05 +01:00
Andreas Fischer
d326a49fd0 [task/code-sniffer] Check function/method argument list spacing. 
PHPBB3-11980
 2013-10-29 21:27:07 +01:00
Andreas Fischer
2f1cf0d287 Merge remote-tracking branch 'prototech/ticket/11986' into develop 
* prototech/ticket/11986:
  [ticket/11986] Fix undefined index: poster_id in file.php.
 2013-10-29 14:09:43 +01:00
Cesar G
68d80f9952 [ticket/11986] Fix undefined index: poster_id in file.php. 
PHPBB3-11986
 2013-10-29 06:02:04 -07:00
Nils Adermann
d437f1f133 Merge pull request #1835 from bantu/task/code-sniffer 
[task/code-sniffer] Require PHP Code Sniffer to pass
 2013-10-28 22:59:33 -07:00
Andreas Fischer
99fccb6f19 [task/code-sniffer] Cleanup code sniffer ruleset files. 
PHPBB3-11980
 2013-10-29 01:36:37 +01:00
Andreas Fischer
5b66083120 [task/code-sniffer] Reorganise .travis.yml 
PHPBB3-11980
 2013-10-29 01:03:53 +01:00
Andreas Fischer
92144b370c [task/code-sniffer] Check phpBB/phpbb first. This is where new files go. 
PHPBB3-11980
 2013-10-29 01:00:24 +01:00
Andreas Fischer
6a7db8d51a [task/code-sniffer] Require code sniffer to pass on Travis CI. 
PHPBB3-11980
 2013-10-29 00:59:51 +01:00
Andreas Fischer
59e3c2d16e Merge remote-tracking branch 'marc1706/ticket/11981' into develop 
* marc1706/ticket/11981:
  [ticket/11981] Fix code sniffer complaints
 2013-10-29 00:00:00 +01:00
Joas Schilling
85a12ce4f4 [ticket/11031] Fix group legend position 
PHPBB3-11031
 2013-10-28 23:28:24 +01:00
Marc Alexander
7f58a4572e [ticket/11981] Fix code sniffer complaints 
PHPBB3-11981
 2013-10-28 23:05:46 +01:00
Nils Adermann
ed94e3c576 Merge pull request #1784 from nickvergessen/ticket/11924 
[Ticket/11924] Add a script to export the events in wiki format
 2013-10-28 14:53:59 -07:00
Joas Schilling
88f72bd411 [ticket/11031] Convert timezones to new 3.1 timezone 
PHPBB3-11031
 2013-10-28 21:54:43 +01:00
Nils Adermann
0ffc3395c5 Merge pull request #1832 from cyberalien/ticket/11982 
Fix z-index for AJAX popup background
 2013-10-28 11:51:28 -07:00