aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/11973' into developDhruv2013-11-041-2/+3
|\ | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11973: [ticket/11973] Remove logic from tokens language array
| * [ticket/11973] Remove logic from tokens language arrayJoas Schilling2013-10-261-2/+3
| | | | | | | | | | | | | | | | | | | | Previously if a translator did no translate a token, it would not be displayed. On the other hand, the translator could add additional tokens which have no functionality. Functionality is already hardcoded into bbcode.php so we can that in the ACP aswell, in order to prevent namend issues. PHPBB3-11973
* | Merge remote-tracking branch 'Noxwizard/ticket/11990' into developAndreas Fischer2013-11-031-8/+9
|\ \ | | | | | | | | | | | | * Noxwizard/ticket/11990: [ticket/11990] Remove result_mssqlnative usage in acp_database.php
| * | [ticket/11990] Remove result_mssqlnative usage in acp_database.phpPatrick Webster2013-11-031-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class result_mssqlnative was removed in ticket 11980. This removes the dependency on that class from the database backup utility. It is possible to use the sqlsrv functions to retrieve the field information, but they must be then mapped back to type names. That mapping was removed in 11980 and it is easier to just look it up in the information schema table. PHPBB3-11990
* | | Merge remote-tracking branch 'cyberalien/ticket/11977' into developJoas Schilling2013-11-035-151/+28
|\ \ \ | |/ / |/| | | | | | | | | | | * cyberalien/ticket/11977: [ticket/11977] Remove data and change code in acp_modules [ticket/11977] Use CSS instead of JS to disable up/down icons
| * | [ticket/11977] Remove data and change code in acp_modulesVjacheslav Trushkin2013-11-033-17/+8
| | | | | | | | | | | | PHPBB3-11977
| * | [ticket/11977] Use CSS instead of JS to disable up/down iconsVjacheslav Trushkin2013-11-024-134/+20
| | | | | | | | | | | | PHPBB3-11977
* | | Merge pull request #1821 from imkingdavid/ticket/11972Nils Adermann2013-11-023-2/+45
|\ \ \ | | | | | | | | [ticket/11972] Add template events to posting page
| * | | [ticket/11972] Fix the sincesDavid King2013-11-021-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11972
| * | | [ticket/11972] Add the sincesDavid King2013-11-021-0/+5
| | | | | | | | | | | | | | | | PHPBB3-11972
| * | | [ticket/11972] Add posting_editor_message_after template eventDavid King2013-11-023-0/+10
| | | | | | | | | | | | | | | | PHPBB3-11972
| * | | [ticket/11972] Add posting_editor_message_before template eventDavid King2013-11-023-0/+10
| | | | | | | | | | | | | | | | PHPBB3-11972
| * | | [ticket/11972] Add posting_editor_subject_before template eventDavid King2013-11-023-2/+11
| | | | | | | | | | | | | | | | PHPBB3-11972
| * | | [ticket/11972] Add posting_editor_subject_after template eventDavid King2013-11-023-2/+11
|/ / / | | | | | | | | | PHPBB3-11972
* | | Merge pull request #1848 from prototech/ticket/11746Nathan Guse2013-11-021-8/+0
|\ \ \ | | | | | | | | [ticket/11746] Add "admin activation required" notification
| * | | [ticket/11746] The IN_PHPBB check is not necessary.Cesar G2013-11-021-8/+0
|/ / / | | | | | | | | | PHPBB3-11746
* | | Merge pull request #1840 from cyberalien/ticket/11030Nathan Guse2013-11-021-2/+4
|\ \ \ | |/ / |/| | Fix cursor in prosilver and ACP
| * | [ticket/11030] Fix cursor for checkboxesVjacheslav Trushkin2013-10-301-1/+1
| | | | | | | | | | | | PHPBB3-11030
| * | [ticket/11030] Fixing cursor appearing in file upload browse button.erangamapa2013-10-301-2/+4
| | | | | | | | | | | | | | | | | | | | | Removed unnecessary cursor CSS properties added for form inputs in both acp and prosilver styles. Added cursor:pointer property only for buttons. PHPBB3-11030
* | | Merge pull request #1790 from prototech/ticket/11280Nathan Guse2013-11-021-1/+0
|\ \ \ | | | | | | | | [ticket/11280] Prevent duplicate entry in forums_track table.
| * | | [ticket/11280] Prevent duplicate entry in forums_track table.Cesar G2013-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforcing a time limit prevents all rows from being selected, thus a new row is inserted resulting in a duplicate entry. PHPBB3-11280
* | | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-027-35/+211
|\ \ \ \ | | | | | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-263-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11746
| * | | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-247-35/+211
| | | | | | | | | | | | | | | | | | | | PHPBB3-11746
* | | | | Merge pull request #1847 from nickvergessen/ticket/11995Nathan Guse2013-11-022-63/+32
|\ \ \ \ \ | | | | | | | | | | | | Ticket/11995 Fix Revert of config.remove migration
| * | | | | [ticket/11995] Remove exceptions and split reverse into different testsJoas Schilling2013-11-021-75/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11995
| * | | | | [ticket/11995] Fix Revert of config.removeJoas Schilling2013-11-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11995
| * | | | | [ticket/11995] Add unit test for reverting config.removeJoas Schilling2013-11-021-0/+16
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11995
* | | | | Merge remote-tracking branch 'brunoais/ticket/11663' into developJoas Schilling2013-11-021-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | | [ticket/11663] Add the doc block about the parameters.brunoais2013-08-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11663
| * | | | | [ticket/11663] Add the doc block about the return value.brunoais2013-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
| * | | | | [ticket/11663] Make generate_text_for_storage return the errors.brunoais2013-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong. PHPBB3-11663
* | | | | | Merge pull request #1810 from nickvergessen/ticket/11031Nils Adermann2013-11-024-11/+172
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
| * | | | | | [ticket/11031] Convert user notification options with default settingsJoas Schilling2013-11-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Correctly add groups to teampageJoas Schilling2013-11-023-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Fix group legend positionJoas Schilling2013-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Convert timezones to new 3.1 timezoneJoas Schilling2013-10-282-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Fix missing variable lang_file from code conversionJoas Schilling2013-10-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Correctly set topic and post visibilityJoas Schilling2013-10-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Update extension group names after converting themJoas Schilling2013-10-252-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Fix conversion of topic_replies to topic_postsJoas Schilling2013-10-232-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
| * | | | | | [ticket/11031] Fix container construction and missing objectsJoas Schilling2013-10-231-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11031
* | | | | | | Merge remote-tracking branch 'Marc/ticket/11983' into developJoas Schilling2013-11-021-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11983: [ticket/11983] Add missing argument to docblock in ucp_notifications
| * | | | | | | [ticket/11983] Add missing argument to docblock in ucp_notificationsMarc Alexander2013-11-021-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The argument $subscriptions was not documented in the docblock of the method output_notification_types() until now. PHPBB3-11983
* | | | | | | Merge pull request #1839 from bantu/task/code-snifferNils Adermann2013-11-01206-1862/+203
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | More PHP Code Sniffer rules
| * | | | | | | [task/code-sniffer] Remove class result_mssqlnative.Andreas Fischer2013-10-311-169/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11980
| * | | | | | | [task/code-sniffer] Completely ignore database_update.php.Andreas Fischer2013-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11980
| * | | | | | | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-3017-150/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11980
| * | | | | | | [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.Andreas Fischer2013-10-30192-1537/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11980
| * | | | | | | [task/code-sniffer] Add PSR1.Files.SideEffects.FoundWithSymbolsAndreas Fischer2013-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11980