aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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-017-17/+18
|\ | | | | More PHP Code Sniffer rules
| * [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-307-16/+17
| | | | | | | | PHPBB3-11980
| * [task/code-sniffer] Fix argument list spacing.Andreas Fischer2013-10-291-1/+1
| | | | | | | | PHPBB3-11980
* | [ticket/11987] Add {ADMIN_ROOT_PATH}.Cesar G2013-10-301-0/+1
| | | | | | | | PHPBB3-11987
* | [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.Cesar G2013-10-302-2/+0
| | | | | | | | PHPBB3-11987
* | [ticket/11987] Change {ROOT_PATH} to point to board root.Cesar G2013-10-301-1/+1
| | | | | | | | PHPBB3-11987
* | Merge remote-tracking branch 'nickvergessen/ticket/11974' into developDhruv2013-10-301-10/+4
|\ \ | |/ |/| | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11974: [ticket/11974] Fix timezone names with underscores [ticket/11974] Translate all timezones
| * [ticket/11974] Translate all timezonesJoas Schilling2013-10-271-10/+4
| | | | | | | | PHPBB3-11974
* | Merge remote-tracking branch 'marc1706/ticket/11981' into developAndreas Fischer2013-10-297-26/+30
|\ \ | | | | | | | | | | | | * marc1706/ticket/11981: [ticket/11981] Fix code sniffer complaints
| * | [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-287-26/+30
| |/ | | | | | | PHPBB3-11981
* | Merge pull request #1784 from nickvergessen/ticket/11924Nils Adermann2013-10-283-8/+8
|\ \ | |/ |/| [Ticket/11924] Add a script to export the events in wiki format
| * [ticket/11924] Fix some minor issues with the php event docsJoas Schilling2013-10-163-8/+8
| | | | | | | | PHPBB3-11924
* | Merge pull request #1801 from nickvergessen/ticket/11948Nils Adermann2013-10-221-4/+4
|\ \ | | | | | | Ticket/11948 Extensions should be allowed to have more then 1 routing file
| * | [ticket/11948] Allow resource importing for routingJoas Schilling2013-10-211-4/+4
| | | | | | | | | | | | PHPBB3-11948
* | | [ticket/11923] Attempt to translate errors only if user can change avatar.Cesar G2013-10-171-3/+3
|/ / | | | | | | PHPBB3-11923
* | Merge pull request #1781 from VSEphpbb/ticket/11921Nathan Guse2013-10-162-16/+4
|\ \ | |/ |/| Ticket/11921 - Streamline PMs and Notifications in Header Link List
| * [ticket/11921] Directly inject unread messages count into the templateMatt Friedman2013-10-161-8/+2
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Only get the count of unread PMsMatt Friedman2013-10-161-4/+1
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-162-2/+2
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Remove "l_" from non-lang variablesMatt Friedman2013-10-151-5/+5
| | | | | | | | PHPBB3-11921
| * [ticket/11921] Improve appearance of PM notifications in linklistMatt Friedman2013-10-151-8/+5
| | | | | | | | PHPBB3-11921
* | [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
| | | | | | | | This commit is a highly-refactored and up-to-date version of Fyorl's work which was part of his Google Summer of Code 2012 project "Attachment Improvements". PHPBB3-10929
* Merge pull request #1764 from EXreaction/ticket/11874Nils Adermann2013-10-101-1/+1
|\ | | | | [ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
| * [ticket/11874] Correct when $phpbb_root_path is appended to build_url()Nathan Guse2013-10-101-1/+1
| | | | | | | | PHPBB3-11874
* | [ticket/11703] Also use empty() for T_JQUERY_LINK.Andreas Fischer2013-10-102-2/+2
| | | | | | | | PHPBB3-11703
* | [ticket/11703] Make jQuery CDN switch more generic.Andreas Fischer2013-10-103-5/+5
|/ | | | | | | Config variable: load_jquery_cdn -> allow_cdn Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN PHPBB3-11703
* [ticket/11901] Pass empty string as relative_url for non-local magic URL.Andreas Fischer2013-10-101-1/+2
| | | | | | | | | | | Only the regular expression for MAGIC_URL_LOCAL has three capturing groups. As a result $matches[3] is only set in this case. Prior to PHPBB3-11606 an empty string was passed to make_clickable_callback() as a replacement in case of less than three capturing groups. This patch reintroduces the empty string. Regression from 49c12ef4be229bf2223139298766ef441b075fbc. PHPBB3-11901
* [ticket/11898] Correct adm_relative_path created by installerNathan Guse2013-10-101-1/+1
| | | PHPBB3-11898
* [ticket/11898] Correct admin S_LOGIN_ACTIONNathaniel Guse2013-10-091-2/+2
| | | | PHPBB3-11898
* Merge remote-tracking branch 'prototech/ticket/11890' into developAndreas Fischer2013-10-081-1/+1
|\ | | | | | | | | * prototech/ticket/11890: [ticket/11890] Fix untranslated string when deleting posts through MCP.
| * [ticket/11890] Fix untranslated string when deleting posts through MCP.Cesar G2013-10-081-1/+1
| | | | | | | | PHPBB3-11890
* | [ticket/11892] Fix undefined variables: to_forum_id & to_topic_idCesar G2013-10-082-39/+15
|/ | | | PHPBB3-11892
* Merge pull request #1739 from nickvergessen/ticket/11871Nathan Guse2013-10-032-5/+28
|\ | | | | [ticket/11871] Allow backslash in classnames for Modules
| * [ticket/11871] Fallback to int ID of the module, when creating linksJoas Schilling2013-10-021-4/+27
| | | | | | | | | | | | | | | | Firefox is currently unable to correctly copy a urlencoded \ so users will be unable to post links to modules. However we can still fallback to the id instead of the name, so we do that in this case. PHPBB3-11871
| * [ticket/11871] Allow backslash in classnames for ModulesJoas Schilling2013-09-271-1/+1
| | | | | | | | PHPBB3-11871
* | Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-032-4/+4
|\ \ | | | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * | [ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_beforerechosen2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | The core.group_delete_user_before event had bad indentation in its PHPDoc. Fixed. PHPBB3-11786
| * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-2320-191/+2012
| |\ \
| * | | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some PHPDoc errors I noticed while working on the karma extension. Mostly spacing issues or omitted characters, though there was one description that made no sense at all. PHPBB3-11786
* | | | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-304-19/+20
|\ \ \ \ | | | | | | | | | | Ticket/11852 filesystem class must not depend on a web request
| * | | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-264-19/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-11852
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-281-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-281-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | * | | | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11873
| | * | | | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-271-1/+1
| | | | | |
| | * | | | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-021-1/+1
| | | | | |
* | | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments after incorrect merge of previous PR. PHPBB3-11862
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 19:11:07 +0000