aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1947 from bantu/ticket/12107Nathan Guse2014-01-171-2/+2
|\
| * [ticket/12107] Use log table property instead of log table constant.Andreas Fischer2014-01-121-2/+2
* | Merge pull request #1950 from prototech/ticket/12096Nathan Guse2014-01-172-2/+2
|\ \
| * | [ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.Cesar G2014-01-162-2/+2
* | | [ticket/12032] Do not inherit read status in certain notifications.Cesar G2014-01-168-4/+60
|/ /
* | Merge pull request #1893 from nickvergessen/ticket/12039Andreas Fischer2014-01-126-0/+291
|\ \ | |/ |/|
| * [ticket/12039] Allow getting the value without a new line at the endJoas Schilling2014-01-101-1/+11
| * [ticket/12039] Do not print success message when config did not existJoas Schilling2014-01-081-2/+9
| * [ticket/12039] Do not colour returned value in get commandJoas Schilling2014-01-081-1/+1
| * [ticket/12039] Update command descriptionsJoas Schilling2013-12-263-3/+3
| * [ticket/12039] Remove debug codeJoas Schilling2013-12-021-1/+0
| * [ticket/12039] Fix option descriptionsJoas Schilling2013-11-273-3/+3
| * [ticket/12039] Use an abstract class and some more minor adjustmentsJoas Schilling2013-11-276-99/+119
| * [ticket/12039] Add config:* to the command line interface toolJoas Schilling2013-11-264-0/+255
* | Merge remote-tracking branch 'Marc/ticket/11997' into developJoas Schilling2014-01-081-0/+44
|\ \
| * | [ticket/11997] Remove obsolete function get_controller_redirect_url()Marc Alexander2013-12-271-24/+0
| * | [ticket/11997] Add clean_url() method to path_helperMarc Alexander2013-12-211-0/+23
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997Marc Alexander2013-12-0730-58/+1403
| |\ \
| * | | [ticket/11997] Add method for controller redirect URLs to path helperMarc Alexander2013-12-071-0/+24
| * | | [ticket/11997] Fix redirects from inside controllersJoas Schilling2013-11-131-0/+21
* | | | [ticket/12034] AJAXify notifications popup.Cesar G2013-12-301-2/+4
* | | | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into de...Dhruv2013-12-251-0/+306
|\ \ \ \
| * | | | [ticket/11849] Replace pagination in viewforum.php with classJoas Schilling2013-12-181-2/+39
| * | | | [ticket/11849] Move pagination code to classJoas Schilling2013-12-181-0/+269
| | |_|/ | |/| |
* | | | [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().Cesar G2013-12-191-1/+1
* | | | Merge remote-tracking branch 'prototech/ticket/12009' into developJoas Schilling2013-12-162-2/+27
|\ \ \ \
| * | | | [ticket/12009] Prevent user from enabling invalid extension through direct URLCesar G2013-12-121-2/+12
| * | | | [ticket/12009] Do not allow incorrectly structured extensions to be installed.Cesar G2013-12-111-0/+15
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'Marc/ticket/11859' into developJoas Schilling2013-12-125-11/+32
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/11859] Make avatar drivers return template filenameMarc Alexander2013-11-275-11/+32
| |/ /
* | | [ticket/12058] Add missing apostrophe to avatar_types migration queriesMarc Alexander2013-12-041-2/+2
* | | Merge pull request #1813 from marc1706/ticket/11912Nathan Guse2013-12-046-4/+768
|\ \ \
| * \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912Marc Alexander2013-11-23211-1942/+965
| |\ \ \ | | |/ /
| * | | [ticket/11912] Check if content_guesser is supported with function_existsMarc Alexander2013-11-231-5/+2
| * | | [ticket/11912] Remove obsolete "return null" in content_guesserMarc Alexander2013-11-141-2/+0
| * | | [ticket/11912] Remove obsolete variable $mimetype from content_guesserMarc Alexander2013-11-121-3/+2
| * | | [ticket/11912] Remove IN_PHPBB checks from mimetype guesser filesMarc Alexander2013-11-115-40/+0
| * | | [ticket/11912] Remove obsolete $file_info from pluploadMarc Alexander2013-11-111-2/+0
| * | | [ticket/11912] Introduce guesser priority to mimetype guessersMarc Alexander2013-11-115-3/+98
| * | | [ticket/11912] Add extension_guesser for guessing mimetype by extensionMarc Alexander2013-11-112-480/+518
| * | | [ticket/11912] Introduce guesser_interfaceMarc Alexander2013-10-242-6/+43
| * | | [ticket/11912] Supply filename to content_guesser for guessing on windowsMarc Alexander2013-10-243-7/+15
| * | | [ticket/11912] Remove typo in content_guesserMarc Alexander2013-10-241-1/+1
| * | | [ŧicket/11912] Get rid of obsolete variables in content_guesserMarc Alexander2013-10-241-28/+1
| * | | [ticket/11912] Improve extension map in content_guesserMarc Alexander2013-10-241-90/+91
| * | | [ticket/11912] Add content_guesserMarc Alexander2013-10-231-0/+548
| * | | [ticket/11912] Add phpbb mimetype guesserMarc Alexander2013-10-231-0/+105
| * | | [ticket/11912] Integrate mimetype guesser with pluploadMarc Alexander2013-10-231-2/+9
* | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842Marc Alexander2013-11-27211-1942/+965
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-212-1/+43
| |\ \ \