aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | [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
| | * | | | | | | | [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".Andreas Fischer2013-12-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| | * | | | | | | | [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".Andreas Fischer2013-12-042-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| | * | | | | | | | [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"Andreas Fischer2013-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| | * | | | | | | | [ticket/12056] validate_config_vars: Fix "Creating ... from empty value".Andreas Fischer2013-12-041-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| | * | | | | | | | [ticket/12056] validate_range: Fix "Creating default object from empty value"Andreas Fischer2013-12-041-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| | * | | | | | | | [ticket/12056] build_select: Fix "Creating default object from empty value"Andreas Fischer2013-12-041-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| | * | | | | | | | [ticket/12056] h_radio test: Fix "Creating default object from empty value"Andreas Fischer2013-12-041-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| * | | | | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-12-041-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12056] Fix failure due to "Creating default object from empty value".
| | * | | | | | | | Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympusJoas Schilling2013-12-041-1/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12056: [ticket/12056] Fix failure due to "Creating default object from empty value".
| | | * | | | | | | | [ticket/12056] Fix failure due to "Creating default object from empty value".Andreas Fischer2013-12-041-1/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12056
| * | | | | | | | | Merge remote-tracking branch 'prototech/ticket/11672' into developJoas Schilling2013-12-035-129/+143
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/11672: [ticket/11672] Move the reapply_sid() call before meta_refresh() is called. [ticket/11672] Remove duplicate $request global. [ticket/11672] The json response call exits so the else is not necessary. [ticket/11672] Remove the messages for lock/unlock/change topic type. [ticket/11672] Clean up the logic in mcp_queue.php. [ticket/11672] Remove some messages that were missed in mcp_queue.php. [ticket/11672] Replace sprintf() usage with $user->lang(). [ticket/11672] Removed unnecessary text from alerts.
| | * | | | | | | | | [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.Cesar G2013-11-212-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $redirect assignment is not necessary because the variable has already been set near the start of the functions. The redirect value will also never default to index.php because a default value has already been provided when $redirect is initially assigned and passed to the template as a hidden field. PHPBB3-11672
| | * | | | | | | | | [ticket/11672] Remove duplicate $request global.Cesar G2013-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| | * | | | | | | | | [ticket/11672] The json response call exits so the else is not necessary.Cesar G2013-11-191-23/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| | * | | | | | | | | [ticket/11672] Remove the messages for lock/unlock/change topic type.Cesar G2013-11-191-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| | * | | | | | | | | [ticket/11672] Clean up the logic in mcp_queue.php.Cesar G2013-11-191-97/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| | * | | | | | | | | [ticket/11672] Remove some messages that were missed in mcp_queue.php.Cesar G2013-11-191-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| | * | | | | | | | | [ticket/11672] Replace sprintf() usage with $user->lang().Cesar G2013-11-194-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| | * | | | | | | | | [ticket/11672] Removed unnecessary text from alerts.callumacrae2013-11-194-14/+53
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Messages like "Return to forum last visited" are entirely unnecessary when using AJAX to delete a post, so this commit removes them. PHPBB3-11672
| * | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/11969' into developJoas Schilling2013-12-0311-27/+58
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11969: [ticket/11969] Change topic link to unread post in subsilver2 [ticket/11969] Change topic link to unread post in prosilver [ticket/11969] New language strings for first and last post links
| | * | | | | | | | | [ticket/11969] Change topic link to unread post in subsilver2Vjacheslav Trushkin2013-10-255-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11969
| | * | | | | | | | | [ticket/11969] Change topic link to unread post in prosilverVjacheslav Trushkin2013-10-255-22/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11969
| | * | | | | | | | | [ticket/11969] New language strings for first and last post linksVjacheslav Trushkin2013-10-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11969