aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #1912 from marc1706/ticket/12058Nathan Guse2013-12-041-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [ticket/12058] Add missing apostrophe to avatar_types migration queries
| * | | | | [ticket/12058] Add missing apostrophe to avatar_types migration queriesMarc Alexander2013-12-041-2/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-12058
* | | | | Merge pull request #1813 from marc1706/ticket/11912Nathan Guse2013-12-0412-4/+1027
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11912] Add mimetype guesser for proper mimetype guessing
| * | | | | [ticket/11912] Expect logic exceptions in test if no guesser availableMarc Alexander2013-11-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912Marc Alexander2013-11-23423-4806/+5718
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | | | | [ticket/11912] Check if content_guesser is supported with function_existsMarc Alexander2013-11-231-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Remove obsolete "return null" in content_guesserMarc Alexander2013-11-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Remove obsolete variable $mimetype from content_guesserMarc Alexander2013-11-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Use inverted $overload for setting function_exists in testsMarc Alexander2013-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Remove IN_PHPBB checks from mimetype guesser filesMarc Alexander2013-11-115-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Remove obsolete $file_info from pluploadMarc Alexander2013-11-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Introduce guesser priority to mimetype guessersMarc Alexander2013-11-117-3/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mimetype guesser priority can now be set through the service definition. Mimetypes will be guessed from the guesser with the highest priority to the one with the lowest priority. Standard priority types have been added to the service definition file. Any integer value can be used though. Standard mimetype guessers that do not have the methods get_priority and set_priority implemented, like the standard MimeTypeGuessers of symfony, will have the default priority with the value of 0. Lower priority guessers have values lower than 0 while high priority ones can be added with values higher than 0. PHPBB3-11912
| * | | | | | [ticket/11912] Add extension_guesser for guessing mimetype by extensionMarc Alexander2013-11-114-483/+535
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content_guesser now only guesses the mimetype with the function mime_content_type() while the guessing by extension is done using the extension_guesser. PHPBB3-11912
| * | | | | | [ticket/11912] Use lowercase names for guesser servicesMarc Alexander2013-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Introduce guesser_interfaceMarc Alexander2013-10-242-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will contain proper documentation of the required methods if anyone would implement a newer guesser. PHPBB3-11912
| * | | | | | [ticket/11912] Supply filename to content_guesser for guessing on windowsMarc Alexander2013-10-244-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filename of the files sent to the guesser by plupload do not contain the file extension. Therefore, it's impossible to guess the mimetype if only the content_guesser is available and the function mime_content_type() doesn't exist. By supplying the filename we can circumvent this issue. PHPBB3-11912
| * | | | | | [ticket/11912] Remove typo in content_guesserMarc Alexander2013-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ŧicket/11912] Get rid of obsolete variables in content_guesserMarc Alexander2013-10-242-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Improve extension map in content_guesserMarc Alexander2013-10-241-90/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Add tests for content_guesserMarc Alexander2013-10-231-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Add content_guesserMarc Alexander2013-10-232-0/+556
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content_guesser will try to use the function mime_content_type() if it's available. If that is not the case, the content_guesser will try to guess the mimetype using the file extension of the supplied file. Since this guesser will be registered after the other guessers, it will be only used if the other guessers are not available. PHPBB3-11912
| * | | | | | [ticket/11912] Add tests for phpbb mimetype guesserMarc Alexander2013-10-234-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
| * | | | | | [ticket/11912] Add phpbb mimetype guesserMarc Alexander2013-10-231-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mimetype guesser will be used as front-end file for mimetype guessing. PHPBB3-11912
| * | | | | | [ticket/11912] Integrate mimetype guesser with pluploadMarc Alexander2013-10-233-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11912
* | | | | | | Merge pull request #1879 from Pico88/ticket/12026Nathan Guse2013-12-045-9/+95
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12026] Correct path for template files
| * \ \ \ \ \ \ Merge pull request #1 from nickvergessen/ticket/pico88/12026-2Pico882013-12-035-7/+93
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ticket/pico88/12026
| | * | | | | | | [ticket/12026] Add functional test for ucp extension moduleJoas Schilling2013-12-034-5/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12026
| | * | | | | | | [ticket/12026] Remove root path, its prepended laterJoas Schilling2013-12-031-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12026
| * | | | | | | [ticket/12026] Remove phpbb root pathLukasz2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12026
| * | | | | | | [ticket/12026] Correct path for template filesLukasz2013-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct path for template files in MCP and UCP modules, which are added via extenstions PHPBB3-12026
* | | | | | | | Merge pull request #1887 from nickvergessen/ticket/skouat/10910Nathan Guse2013-12-042-1/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/10910] Function build_cfg_template() allow $size for $tpl_type = select
| * | | | | | | | [ticket/10910] Do not add size when its 1 (default)Joas Schilling2013-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10910
| * | | | | | | | [ticket/10910] Fix unit testsJoas Schilling2013-11-221-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10910
| * | | | | | | | [ticket/10910] Add unit tests for selectMario Skouat2013-11-221-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10910
| * | | | | | | | [ticket/10910] Allow setting size selects in build_cfg_template()Mario Skouat2013-11-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10910
* | | | | | | | | Merge remote-tracking branch 'Marc/ticket/11842' into developJoas Schilling2013-12-049-16/+120
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11842: [ticket/11842] Add functional test for creating group [ticket/11842] Use avatar_data for obtaining driver that should be deleted [ticket/11842] Use type map for updating avatar types in database [ticket/11842] Add missing prefix for group id in avatar data [ticket/11842] Use only new avatar type in user_delete function [ticket/11842] Add migration file for updating avatar type in database [ticket/11842] Replace outdated occurences of user and group avatar_type [ticket/11842] Use group_id 0 and correct avatar name after creating group
| * | | | | | | | | [ticket/11842] Add functional test for creating groupMarc Alexander2013-12-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11842
| * | | | | | | | | [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-045-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11842
| * | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842Marc Alexander2013-11-27422-4805/+5718
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_groups.php
| * | | | | | | | | [ticket/11842] Use type map for updating avatar types in databaseMarc Alexander2013-11-251-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11842
| * | | | | | | | | [ticket/11842] Add missing prefix for group id in avatar dataMarc Alexander2013-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11842
| * | | | | | | | | [ticket/11842] Use only new avatar type in user_delete functionMarc Alexander2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11842
| * | | | | | | | | [ticket/11842] Add migration file for updating avatar type in databaseMarc Alexander2013-11-201-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11842
| * | | | | | | | | [ticket/11842] Replace outdated occurences of user and group avatar_typeMarc Alexander2013-10-242-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_avatar_type und group_avatar_type are now a string and should therefore be treated accordingly. PHPBB3-11842
| * | | | | | | | | [ticket/11842] Use group_id 0 and correct avatar name after creating groupMarc Alexander2013-10-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like the function group_correct_avatar() was forgotten while adding the new avatar system. We now pass the group_id 0 to the upload avatar and let the function group_correct_avatar() fix the avatar filename after creating the group like it was done previously. PHPBB3-11842
* | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/12056-develop' into developJoas Schilling2013-12-0411-35/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12056-develop: [ticket/12056] group_user_attributes: Fix "Creating ... from empty value". [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()" [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()" [ticket/12056] Fix "Call to a member function trigger_event() on a non-object". [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()". [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()". [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()" [ticket/12056] validate_config_vars: Fix "Creating ... from empty value". [ticket/12056] validate_range: Fix "Creating default object from empty value" [ticket/12056] build_select: Fix "Creating default object from empty value" [ticket/12056] h_radio test: Fix "Creating default object from empty value"
| * | | | | | | | | | [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".Andreas Fischer2013-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| * | | | | | | | | | [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"Andreas Fischer2013-12-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| * | | | | | | | | | [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"Andreas Fischer2013-12-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| * | | | | | | | | | [ticket/12056] Fix "Call to a member function trigger_event() on a non-object".Andreas Fischer2013-12-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056