aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'Marc/ticket/11842' into developJoas Schilling2013-12-042-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | * 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] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-042-2/+2
| | | | | | | | PHPBB3-11842
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842Marc Alexander2013-11-2711-54/+69
| |\ | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_groups.php
| * | [ticket/11842] Add missing prefix for group id in avatar dataMarc Alexander2013-11-231-1/+1
| | | | | | | | | | | | PHPBB3-11842
| * | [ticket/11842] Use group_id 0 and correct avatar name after creating groupMarc Alexander2013-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [ticket/12045] Only display group selection if there are groupsJoas Schilling2013-11-281-2/+9
| | | | | | | | | | | | | | | | | | Also fixed the empty option which is not allowed. PHPBB3-12045
* | | [ticket/11507] Handle empty sets correctly.Cesar G2013-11-271-5/+5
| | | | | | | | | | | | | | | | | | | | | Using the last parameter in $db->sql_in_set() does not give the correct behaviour expected here. The query should not be negated if the set is empty. PHPBB3-11507
* | | [ticket/11507] Allow group & unapproved post count options to be used alone.Cesar G2013-11-271-21/+37
| | | | | | | | | | | | PHPBB3-11507
* | | [ticket/11507] Fix the unapproved posts count query.Cesar G2013-11-271-1/+2
| | | | | | | | | | | | | | | | | | Only unapproved posts should be counted. PHPBB3-11507
* | | [ticket/11507] Allow the posts awaiting approval value to be 0.Cesar G2013-11-271-3/+3
| |/ |/| | | | | PHPBB3-11507
* | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-211-3/+0
|\ \ | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| * | [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-081-3/+0
| | | | | | | | | | | | PHPBB3-12005
* | | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-211-1/+0
|\ \ \ | | | | | | | | [ticket/10810] Move color swatches from popup windows to inline blocks.
| * | | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-131-1/+0
| | | | | | | | | | | | | | | | PHPBB3-10810
* | | | Merge pull request #1815 from marc1706/ticket/11525Nils Adermann2013-11-132-2/+2
|\ \ \ \ | |/ / / |/| | | [ticket/11525] Only remove group or user prefix from given avatar data
| * | | [ticket/11525] Only remove group or user prefix from given avatar dataMarc Alexander2013-10-242-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the user data had both user_id and group_id keys in the avatar data. As both group_ and user_ prefixes were removed the group_id was collapsed onto the user_id and therefore all users in the same group had the same prefix for their uploaded avatars. This patch will make sure that the correct id is used depending on whether it's a group's or user's avatar data. PHPBB3-11525
* | | [ticket/12002] Add link hash to extension manager linksJoas Schilling2013-11-081-6/+11
| | | | | | | | | | | | PHPBB3-12002
* | | [ticket/11994] Change error level for missing .json fileJoas Schilling2013-11-081-1/+1
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Rename "uninstall" to "delete data"Joas Schilling2013-11-081-9/+12
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Make install/enable just one UI thingJoas Schilling2013-11-081-8/+4
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Use display name on confirmation screenJoas Schilling2013-11-081-3/+3
| | | | | | | | | | | | PHPBB3-11994
* | | [ticket/11994] Make extension manager UI less misleadingJoas Schilling2013-11-081-13/+21
| | | | | | | | | | | | | | | | | | | | | Enable and Install were split into two different expressions. Purge was renamed to uninstall to make clearer what is going to happen. PHPBB3-11994
* | | Merge remote-tracking branch 'nickvergessen/ticket/11973' into developDhruv2013-11-041-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11973: [ticket/11973] Remove logic from tokens language array
| * | | [ticket/11973] Remove logic from tokens language arrayJoas Schilling2013-10-261-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if a translator did no translate a token, it would not be displayed. On the other hand, the translator could add additional tokens which have no functionality. Functionality is already hardcoded into bbcode.php so we can that in the ACP aswell, in order to prevent namend issues. PHPBB3-11973
* | | [ticket/11990] Remove result_mssqlnative usage in acp_database.phpPatrick Webster2013-11-031-8/+9
| |/ |/| | | | | | | | | | | | | | | | | | | The class result_mssqlnative was removed in ticket 11980. This removes the dependency on that class from the database backup utility. It is possible to use the sqlsrv functions to retrieve the field information, but they must be then mapped back to type names. That mapping was removed in 11980 and it is easier to just look it up in the information schema table. PHPBB3-11990
* | Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-021-0/+3
|\ \ | | | | | | [ticket/11746] Add "admin activation required" notification.
| * | [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-261-1/+1
| | | | | | | | | | | | PHPBB3-11746
| * | [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-241-0/+3
| |/ | | | | | | PHPBB3-11746
* | Merge pull request #1839 from bantu/task/code-snifferNils Adermann2013-11-013-5/+5
|\ \ | | | | | | More PHP Code Sniffer rules
| * | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-303-5/+5
| | | | | | | | | | | | PHPBB3-11980
* | | [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.Cesar G2013-10-302-2/+0
|/ / | | | | | | PHPBB3-11987
* | Merge remote-tracking branch 'marc1706/ticket/11981' into developAndreas Fischer2013-10-293-11/+15
|\ \ | | | | | | | | | | | | * marc1706/ticket/11981: [ticket/11981] Fix code sniffer complaints
| * | [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-283-11/+15
| |/ | | | | | | PHPBB3-11981
* | [ticket/11924] Fix some minor issues with the php event docsJoas Schilling2013-10-161-1/+1
|/ | | | PHPBB3-11924
* [ticket/11703] Make jQuery CDN switch more generic.Andreas Fischer2013-10-101-1/+1
| | | | | | | Config variable: load_jquery_cdn -> allow_cdn Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN PHPBB3-11703
* [ticket/11871] Allow backslash in classnames for ModulesJoas Schilling2013-09-271-1/+1
| | | | PHPBB3-11871
* Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
|\ | | | | | | | | * develop-olympus: [ticket/11864] Do not call exit after display_progress_bar in acp_forums
| * [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| | | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864
* | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-171-1/+1
| | | | | | | | PHPBB3-11700
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-165-34/+94
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * \ Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-0/+48
| |\ \
| | * | [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11824
| | * | [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-0/+48
| | | | | | | | | | | | | | | | PHPBB3-11824
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-121-0/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (188) and others # Via Andreas Fischer (41) and others * 'develop' of github.com:phpbb/phpbb3: (435 commits) [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [feature/oauth] Fix tabindex [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [feature/oauth] Fix bug on ucp_auth_link related to error display ...
| | * \ \ [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-064-34/+38
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | * | | [feature/oauth] Update auth provider interface docs for block vars in ACPJoseph Warner2013-07-231-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | [feature/oauth] ACP options for OAuth, needs some workJoseph Warner2013-07-231-1/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-271-0/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-11373
| * | | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-223-34/+37
| |\ \ \ | | | | | | | | | | Ticket/11582 Split permission logic from translations
| | * | | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11582
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-03 16:32:56 +0000