aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12060] Add template events posting_editor_buttons_before/afterMatt Friedman2013-12-044-0/+24
* [ticket/12060] Add template event acp_bbcodes_actions_prepend/appendMatt Friedman2013-12-042-1/+13
* [ticket/12060] Add template event acp_bbcodes_edit_form_appendMatt Friedman2013-12-042-0/+8
* Merge pull request #1914 from VSEphpbb/ticket/12059Nathan Guse2013-12-041-0/+4
|\
| * [ticket/12059] Allow INCLUDECSS to work with ACP templatesMatt Friedman2013-12-041-0/+4
|/
* Merge pull request #1912 from marc1706/ticket/12058Nathan Guse2013-12-041-2/+2
|\
| * [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-0412-4/+1027
|\
| * [ticket/11912] Expect logic exceptions in test if no guesser availableMarc Alexander2013-11-231-0/+13
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912Marc Alexander2013-11-23423-4806/+5718
| |\
| * | [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] Use inverted $overload for setting function_exists in testsMarc Alexander2013-11-111-1/+1
| * | [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-117-3/+124
| * | [ticket/11912] Add extension_guesser for guessing mimetype by extensionMarc Alexander2013-11-114-483/+535
| * | [ticket/11912] Use lowercase names for guesser servicesMarc Alexander2013-10-241-2/+2
| * | [ticket/11912] Introduce guesser_interfaceMarc Alexander2013-10-242-6/+43
| * | [ticket/11912] Supply filename to content_guesser for guessing on windowsMarc Alexander2013-10-244-8/+17
| * | [ticket/11912] Remove typo in content_guesserMarc Alexander2013-10-241-1/+1
| * | [ŧicket/11912] Get rid of obsolete variables in content_guesserMarc Alexander2013-10-242-31/+1
| * | [ticket/11912] Improve extension map in content_guesserMarc Alexander2013-10-241-90/+91
| * | [ticket/11912] Add tests for content_guesserMarc Alexander2013-10-231-3/+48
| * | [ticket/11912] Add content_guesserMarc Alexander2013-10-232-0/+556
| * | [ticket/11912] Add tests for phpbb mimetype guesserMarc Alexander2013-10-234-0/+131
| * | [ticket/11912] Add phpbb mimetype guesserMarc Alexander2013-10-231-0/+105
| * | [ticket/11912] Integrate mimetype guesser with pluploadMarc Alexander2013-10-233-2/+33
* | | Merge pull request #1879 from Pico88/ticket/12026Nathan Guse2013-12-045-9/+95
|\ \ \
| * \ \ Merge pull request #1 from nickvergessen/ticket/pico88/12026-2Pico882013-12-035-7/+93
| |\ \ \
| | * | | [ticket/12026] Add functional test for ucp extension moduleJoas Schilling2013-12-034-5/+91
| | * | | [ticket/12026] Remove root path, its prepended laterJoas Schilling2013-12-031-2/+2
| |/ / /
| * | | [ticket/12026] Remove phpbb root pathLukasz2013-11-201-1/+1
| * | | [ticket/12026] Correct path for template filesLukasz2013-11-201-4/+4
* | | | Merge pull request #1887 from nickvergessen/ticket/skouat/10910Nathan Guse2013-12-042-1/+53
|\ \ \ \
| * | | | [ticket/10910] Do not add size when its 1 (default)Joas Schilling2013-11-221-1/+1
| * | | | [ticket/10910] Fix unit testsJoas Schilling2013-11-221-5/+20
| * | | | [ticket/10910] Add unit tests for selectMario Skouat2013-11-221-0/+35
| * | | | [ticket/10910] Allow setting size selects in build_cfg_template()Mario Skouat2013-11-221-1/+3
* | | | | Merge remote-tracking branch 'Marc/ticket/11842' into developJoas Schilling2013-12-049-16/+120
|\ \ \ \ \
| * | | | | [ticket/11842] Add functional test for creating groupMarc Alexander2013-12-041-0/+31
| * | | | | [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-045-4/+13
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842Marc Alexander2013-11-27422-4805/+5718
| |\ \ \ \ \
| * | | | | | [ticket/11842] Use type map for updating avatar types in databaseMarc Alexander2013-11-251-28/+23
| * | | | | | [ticket/11842] Add missing prefix for group id in avatar dataMarc Alexander2013-11-231-1/+1
| * | | | | | [ticket/11842] Use only new avatar type in user_delete functionMarc Alexander2013-11-201-1/+1
| * | | | | | [ticket/11842] Add migration file for updating avatar type in databaseMarc Alexander2013-11-201-0/+65
| * | | | | | [ticket/11842] Replace outdated occurences of user and group avatar_typeMarc Alexander2013-10-242-11/+11
| * | | | | | [ticket/11842] Use group_id 0 and correct avatar name after creating groupMarc Alexander2013-10-242-1/+5