aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | [ticket/11921] Only get the count of unread PMsMatt Friedman2013-10-161-4/+1
| * | [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-162-2/+2
| * | [ticket/11921] Remove "l_" from non-lang variablesMatt Friedman2013-10-151-5/+5
| * | [ticket/11921] Improve appearance of PM notifications in linklistMatt Friedman2013-10-151-8/+5
* | | [develop] Update version to 3.1.0-a2-devJoas Schilling2013-10-151-1/+1
* | | [prep-release-3.1.0-a1] Update version to 3.1.0-a1Joas Schilling2013-10-141-1/+1
|/ /
* | [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-114-9/+100
* | Merge pull request #1764 from EXreaction/ticket/11874Nils Adermann2013-10-101-1/+1
|\ \
| * | [ticket/11874] Correct when $phpbb_root_path is appended to build_url()Nathan Guse2013-10-101-1/+1
* | | [ticket/11703] Also use empty() for T_JQUERY_LINK.Andreas Fischer2013-10-102-2/+2
* | | [ticket/11703] Make jQuery CDN switch more generic.Andreas Fischer2013-10-103-5/+5
|/ /
* | [ticket/11901] Pass empty string as relative_url for non-local magic URL.Andreas Fischer2013-10-101-1/+2
* | [ticket/11898] Correct adm_relative_path created by installerNathan Guse2013-10-101-1/+1
* | [ticket/11898] Correct admin S_LOGIN_ACTIONNathaniel Guse2013-10-091-2/+2
* | Merge remote-tracking branch 'prototech/ticket/11890' into developAndreas Fischer2013-10-081-1/+1
|\ \
| * | [ticket/11890] Fix untranslated string when deleting posts through MCP.Cesar G2013-10-081-1/+1
* | | [ticket/11892] Fix undefined variables: to_forum_id & to_topic_idCesar G2013-10-082-39/+15
|/ /
* | Merge pull request #1739 from nickvergessen/ticket/11871Nathan Guse2013-10-032-5/+28
|\ \
| * | [ticket/11871] Fallback to int ID of the module, when creating linksJoas Schilling2013-10-021-4/+27
| * | [ticket/11871] Allow backslash in classnames for ModulesJoas Schilling2013-09-271-1/+1