aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-181-2/+4
| | | | | | | | Up to now, the module or module category was always removed with jQuery, even if there was an error. With this change, the modules will not be deleted by jQuery if the return JSON array will have SUCCESS set to false. PHPBB3-11713
* [ticket/11675] Fix template loopNathaniel Guse2013-07-131-1/+1
| | | | PHPBB3-11675
* [ticket/10999] Fix assets_version in ACPVjacheslav Trushkin2013-07-131-1/+1
| | | | PHPBB3-10999
* Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-122-1/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner # Via Joseph Warner * remotes/Hardolaf/ticket/11626: [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [ticket/11626] Make identifier uppercase per style requirements [ticket/11626] Change the identifier template file in the template [ticket/11626] Call method only one time per provider [ticket/11626] Change interface to match functionality [ticket/11626] Include the template file in acp_board [ticket/11626] LDAP Auth ACP Template File [ticket/11626] Create get_acp_template method for auth providers
| * [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-111-1/+1
| | | | | | | | PHPBB3-11626
| * [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-111-1/+1
| | | | | | | | PHPBB3-11626
| * [ticket/11626] Include the template file in acp_boardJoseph Warner2013-07-111-1/+1
| | | | | | | | PHPBB3-11626
| * [ticket/11626] LDAP Auth ACP Template FileJoseph Warner2013-07-111-0/+32
| | | | | | | | PHPBB3-11626
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-011-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (7) and others # Via Andreas Fischer (7) and others * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11593] initialize $is_expr as null before being passed to get_varref [ticket/9341] Assert that page doesnt contain next or prev page posts [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not [ticket/9341] remove PREV_PAGE tpl var used for backward compatability [ticket/11618] Replace glob() with scandir() and string matching [ticket/9341] Add tests for checking Next and Previous template vars [ticket/9341] Move create_topic and post into functional test case [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity [ticket/9341] Use U_PREVIOUS and U_NEXT in template files [ticket/9341] Correctly named template vars Conflicts: tests/template/template_test_case.php
| * [ticket/9341] Use U_PREVIOUS and U_NEXT in template filesDhruv2013-06-221-2/+2
| | | | | | | | PHPBB3-9341
* | [feature/twig] Fix improper template syntax in acp_forums.htmlNathaniel Guse2013-06-141-1/+1
|/ | | | PHPBB3-11598
* Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathaniel Guse2013-06-062-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | into develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/feature/editor-code-tabs: [feature/editor-code-tabs] Make inTag function reusable [feature/editor-code-tabs] Check for browser support in function [feature/editor-code-tabs] Apply code editor to everything [feature/editor-code-tabs] Correctly count indentation on first line
| * [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-202-3/+3
| | | | | | | | | | | | | | | | Move code editor from prosilver to assets Apply code editor to subsilver2 Apply code editor to ACP elements where bbcode is allowed PHPBB3-11557
* | [ticket/11549] Do not set extension dir path for style in adm/index.phpJoas Schilling2013-05-311-1/+0
| | | | | | | | | | | | | | As we don't want style files in adm/adm/style/ we should not prepend the adm/ by setting it. Note, we did that correctly in adm/swatch.php. PHPBB3-11549
* | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-2117-42/+42
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky (19) and others # Via Senky * remotes/Senky/ticket/11010: (32 commits) [ticket/11010] properly tabifying 'max_autologin_time' [ticket/11010] resolving latest comments [ticket/11010] Fixes for number input in acp [ticket/11010] Fix input type for urls [ticket/11010] Fix email inputs [ticket/11010] updating tests [ticket/11010] dealing with dimensions problem, removing extra code [ticket/11010] Change input type to search for search forms [ticket/11010] Add all HTML5 input types to ACP [ticket/11010] Add HTML5 input types to installer [ticket/11010] validation to match type [ticket/11010] displaying min and max only if they are set [ticket/11010] fixing tests [ticket/11010] replacing maxlenght with max [ticket/11010] applying some of EXreaction notes [ticket/11010] Try to keep min < max. [ticket/11010] Mock user in order for the test to run standalone. [ticket/11010] Progress toward fixing the test suite. [ticket/11010] adding type="url" to 'site_home_url' [ticket/11010] fixing inputs types in memberlist_search.html ...
| * | [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-2014-33/+33
| | | | | | | | | | | | PHPBB3-11010
| * | [ticket/11010] Fix input type for urlsVjacheslav Trushkin2013-05-202-2/+2
| | | | | | | | | | | | PHPBB3-11010
| * | [ticket/11010] Fix email inputsVjacheslav Trushkin2013-05-202-3/+3
| | | | | | | | | | | | | | | | | | | | | Add type="email" to fields that should be email fields Change back to type="text" fields that might have wildcards or not necessary email PHPBB3-11010
| * | [ticket/11010] applying some of EXreaction notesSenky2013-05-201-4/+4
| | | | | | | | | | | | PHPBB3-11010
| * | [ticket/11010] Changing email and url types in adm templatesVinny2013-05-202-4/+4
| |/ | | | | | | PHPBB3-11010
* | [ticket/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-201-1/+1
|/ | | | | | Display clearer AJAX errors rather than generic error PHPBB3-11279
* [ticket/10741] Do not resize textarea.no-auto-resizeVjacheslav Trushkin2013-04-121-1/+1
| | | | | | Do not auto-resize textareas with class .no-auto-resize PHPBB3-10741
* [ticket/10741] Automatically resize textareas in prosilver and ACPVjacheslav Trushkin2013-04-121-0/+6
| | | | | | Automatically resize textareas in prosilver and ACP. PHPBB3-10741
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-2611-163/+222
|\ | | | | | | | | Conflicts: phpBB/styles/prosilver/template/timezone.js
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-0623-211/+257
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (799 commits) [ticket/11402] Fix undefined index in post/topic_in_queue [ticket/11400] If email is disabled, disable it for notifications [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working ... Conflicts: phpBB/assets/javascript/core.js
| | * Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-047-126/+122
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (100) and others # Via Marc Alexander (8) and Igor Wiedler (3) * remotes/marc/feature/avatars: (138 commits) [feature/avatars] Update module_auth of ucp module and fix small issues [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [feature/avatars] Auto-clear avatar dimensions when first changing avatars [feature/avatars] Use "Main" as category for avatars in root of gallery [feature/avatars] Remove trailing whitespace from avatar code [feature/avatars] Pass phpbb_user to prepare and process form functions [feature/avatars] Document the use of the allowed extensions array [feature/avatars] Use array for allowed extensions and implode if needed [feature/avatars] Use deprecated for compatibility function [feature/avatars] Correct license, copyright and package info [feature/avatars] Move list of supported formats to avatar driver class [feature/avatars] Add include of functions_display.php in BC function [feature/avatars] Add note about when compatibility function was added [feature/avatars] Add compatibility function for get_user_avatar() [feature/avatars] Move definition of driver_collection to avatars.yml [feature/avatars] Remove the obsolete request argument for avatar drivers [feature/avatars] Add missing @var to docblocks in avatar manager [feature/avatars] Remove not needed inline style [feature/avatars] Differentiate tests for get drivers functions ...
| | | * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-042-2/+14
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | | * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-072-46/+38
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| | | * | | [feature/avatars] Remove not needed inline styleMarc Alexander2013-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | [feature/avatars] Change avatar javascript to conform to new coding guidelinesMarc Alexander2013-01-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-044-7/+4
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_groups.php
| | | * \ \ \ Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-249-2/+13
| | | |\ \ \ \
| | | * | | | | [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-092-35/+57
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | | * | | | | | [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | | [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-257-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | | [feature/avatars] Remove duplicate form enctypeMarc Alexander2012-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | | [feature/avatars] Miscellaenous template fixesMarc Alexander2012-11-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | | [feature/avatars] Fix local and upload avatar in the ACPMarc Alexander2012-11-182-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | | [feature/avatars] Handle deletion of avatarsMarc Alexander2012-11-182-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this wasn't handled correctly if at all. PHPBB3-10018
| | | * | | | | | [feature/avatars] Fix acp front-end of user and group avatarsMarc Alexander2012-11-174-49/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the changes to the avatar manager etc. these had to be updated. PHPBB3-10018
| | | * | | | | | [feature/avatars] Replace colon usage with {L_COLON}Marc Alexander2012-11-125-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | | [feature/avatars] add missing html closing tags and fix tabbingMarc Alexander2012-11-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | * | | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into ↵Marc Alexander2012-11-126-85/+112
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/avatars Conflicts: phpBB/adm/style/acp_groups.html phpBB/adm/style/acp_users_avatar.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_display.php phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/styles/prosilver/template/ucp_avatar_options.html
| | | | * \ \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-2114-37/+81
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (201 commits) [feature/new-tz-handling] Don't use global user but make it a parameter [feature/new-tz-handling] Fix size of suggestion button in chrome [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid [feature/new-tz-handling] Add previous selected value to validation if valid [feature/new-tz-handling] Display suggestion when a different value is selected [ticket/10998] Add border-radius to forum rules block - prosilver [feature/new-tz-handling] Remove additional marking of selected items [feature/new-tz-handling] Move update helper function to new class [feature/new-tz-handling] Fix unit test [feature/new-tz-handling] Delete old variable which is not used anymore [feature/new-tz-handling] Rename $user->tz back to $user->timezone [feature/pagination-as-list] New parameter for name of start var [feature/pagination-as-list] Updates for nils comments [feature/pagination-as-list] Rename and deprecate functions [feature/pagination-as-list] Various fixes and improvements [ticket/10968] Render pagination within the template [feature/new-tz-handling] Remove "timezone might be numeric" [feature/new-tz-handling] Add function to update the timezone [feature/new-tz-handling] Correctly update user and board timezones on update [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL ...
| | | | * | | | | | | [feature/avatars] Fixup avatars.js rewriteIgor Wiedler2012-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | | * | | | | | | [feature/avatars] Add self-invoking closure around avatars.jsIgor Wiedler2012-06-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | | * | | | | | | [feature/avatars] Rewrite avatars event handler to use jQueryIgor Wiedler2012-06-271-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | | * | | | | | | [feature/avatars] Move avatars JavaScript code to external JS fileIgor Wiedler2012-06-273-42/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | | | * | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-279-41/+46
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (255 commits) [ticket/10935] Limit number of PM rules per user to 5000 [ticket/10801] Fixed quickmod tools. [ticket/9551] uncomment line and change length to 255 [ticket/10925] Clarify installation requirements for SQLite [ticket/10938] Serve subforum listing on forumlist from template loop [ticket/10640] Change subject length in mcp in subsilver [ticket/10640] Change subject length in MCP [ticket/10640] Do not change default value of truncate_string() [ticket/10640] Change maximum subject length [ticket/10936] remove PCRE and mbstring support check [ticket/10936] fix language key [ticket/10829] Delete T_STYLESHEET_NAME - no longer used. [ticket/10829] $style_name -> $style_path in style class. [ticket/10743] Renaming user->theme [ticket/10743] Changing obtain_cfg_items [ticket/10882] Fix test name - oops. [ticket/10931] Apply strtolower() correctly, i.e. not on false. [ticket/10931] Also test get_bytes() and get_string() with false. [ticket/10931] Make to_numeric function globally available. [ticket/10932] Use included composer.phar in build process ... Conflicts: phpBB/includes/mcp/mcp_warn.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_avatar_options.html
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-21 17:45:34 +0000