aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [prep-release-3.1.0-a2] Update version to 3.1.0-a2Joas Schilling2013-11-191-1/+1
* Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-191-1/+2
|\
| * [ticket/11896] Use $form_time and fix out of bounds $form_timeMarc Alexander2013-11-141-2/+3
| * [ŧicket/11896] Set form_time with time() when marking all notifications readMarc Alexander2013-11-091-1/+1
* | [ticket/12023] Correctly compare the size of the array in ignore_new_filesJoas Schilling2013-11-191-1/+1
* | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-135-6/+6
|\ \
| * | [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-245-6/+6
* | | Merge pull request #1853 from nickvergessen/ticket/11927Nathan Guse2013-11-111-0/+48
|\ \ \
| * | | [ticket/11927] Prefix function with phpbb_Joas Schilling2013-11-071-1/+1
| * | | [ticket/11927] Add doc block to new functionJoas Schilling2013-11-071-0/+9
| * | | [ticket/11927] Correctly add new files on updateJoas Schilling2013-11-071-0/+39
* | | | [ticket/12002] Add link hash to extension manager linksJoas Schilling2013-11-081-6/+11
| |_|/ |/| |
* | | [ticket/11994] Change error level for missing .json fileJoas Schilling2013-11-081-1/+1
* | | [ticket/11994] Rename "uninstall" to "delete data"Joas Schilling2013-11-081-9/+12
* | | [ticket/11994] Make install/enable just one UI thingJoas Schilling2013-11-081-8/+4
* | | [ticket/11994] Use display name on confirmation screenJoas Schilling2013-11-081-3/+3
* | | [ticket/11994] Make extension manager UI less misleadingJoas Schilling2013-11-081-13/+21
|/ /
* | Merge remote-tracking branch 'nickvergessen/ticket/11973' into developDhruv2013-11-041-2/+3
|\ \
| * | [ticket/11973] Remove logic from tokens language arrayJoas Schilling2013-10-261-2/+3
| |/
* | [ticket/11990] Remove result_mssqlnative usage in acp_database.phpPatrick Webster2013-11-031-8/+9
* | Merge pull request #1790 from prototech/ticket/11280Nathan Guse2013-11-021-1/+0
|\ \
| * | [ticket/11280] Prevent duplicate entry in forums_track table.Cesar G2013-10-161-1/+0
* | | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-023-35/+16
|\ \ \
| * | | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-262-2/+2
| * | | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-243-35/+16
| | |/ | |/|
* | | Merge remote-tracking branch 'brunoais/ticket/11663' into developJoas Schilling2013-11-021-1/+11
|\ \ \
| * | | [ticket/11663] Add the doc block about the parameters.brunoais2013-08-171-0/+8
| * | | [ticket/11663] Add the doc block about the return value.brunoais2013-08-141-0/+2
| * | | [ticket/11663] Make generate_text_for_storage return the errors.brunoais2013-08-091-1/+1
* | | | Merge pull request #1810 from nickvergessen/ticket/11031Nils Adermann2013-11-021-2/+34
|\ \ \ \
| * | | | [ticket/11031] Correctly add groups to teampageJoas Schilling2013-11-021-1/+33
| * | | | [ticket/11031] Fix group legend positionJoas Schilling2013-10-281-1/+1
| | |/ / | |/| |
* | | | [ticket/11983] Add missing argument to docblock in ucp_notificationsMarc Alexander2013-11-021-0/+1
* | | | Merge pull request #1839 from bantu/task/code-snifferNils Adermann2013-11-017-17/+18
|\ \ \ \
| * | | | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-307-16/+17
| * | | | [task/code-sniffer] Fix argument list spacing.Andreas Fischer2013-10-291-1/+1
* | | | | [ticket/11987] Add {ADMIN_ROOT_PATH}.Cesar G2013-10-301-0/+1
* | | | | [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.Cesar G2013-10-302-2/+0
* | | | | [ticket/11987] Change {ROOT_PATH} to point to board root.Cesar G2013-10-301-1/+1
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11974' into developDhruv2013-10-301-10/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/11974] Translate all timezonesJoas Schilling2013-10-271-10/+4
| |/ / /
* | | | Merge remote-tracking branch 'marc1706/ticket/11981' into developAndreas Fischer2013-10-297-26/+30
|\ \ \ \
| * | | | [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-287-26/+30
| |/ / /
* | | | Merge pull request #1784 from nickvergessen/ticket/11924Nils Adermann2013-10-283-8/+8
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/11924] Fix some minor issues with the php event docsJoas Schilling2013-10-163-8/+8
* | | | Merge pull request #1801 from nickvergessen/ticket/11948Nils Adermann2013-10-221-4/+4
|\ \ \ \
| * | | | [ticket/11948] Allow resource importing for routingJoas Schilling2013-10-211-4/+4
| | |_|/ | |/| |
* | | | [ticket/11923] Attempt to translate errors only if user can change avatar.Cesar G2013-10-171-3/+3
|/ / /
* | | Merge pull request #1781 from VSEphpbb/ticket/11921Nathan Guse2013-10-162-16/+4
|\ \ \ | |/ / |/| |
| * | [ticket/11921] Directly inject unread messages count into the templateMatt Friedman2013-10-161-8/+2