aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-011-1/+1
|\ | | | | | | | | * develop-olympus: [ticket/10846] fixing SQL query bug in acp_main.php
| * [ticket/10846] fixing SQL query bug in acp_main.phpSenky2012-04-301-1/+1
| | | | | | | | PHPBB3-10846
* | Merge PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ \ | | | | | | | | | | | | * VSEphpbb/ticket/10779: [ticket/10779] Move jQuery CDN option to Load Settings
| * | [ticket/10779] Move jQuery CDN option to Load SettingsMatt Friedman2012-04-101-2/+2
| | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-10779 PHPBB3-10779
| * | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
| * | [ticket/10650] Corrected space before trueRahul2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Inserted a space before 'true' as per coding guidelines. PHPBB3-10650
| * | [ticket/10650] Displaying last topic on forum listRahul2012-04-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | | [ticket/10762] Check for phpbb_version when installing styleVjacheslav Trushkin2012-04-041-1/+1
|/ / | | | | | | | | | | Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch. PHPBB3-10762
* | [ticket/10752] Fixes for acp_stylesVjacheslav Trushkin2012-04-031-39/+51
| | | | | | | | | | | | Adding form token, changing functions to public/protected, fixing few more errors PHPBB3-10752
* | [ticket/10752] Changing private to protected variables in acp_stylesVjacheslav Trushkin2012-04-031-8/+8
| | | | | | | | | | | | Changing private to protected variables in acp_styles PHPBB3-10752
* | [ticket/10752] More fixes for acp_stylesVjacheslav Trushkin2012-04-031-102/+101
| | | | | | | | | | | | Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes PHPBB3-10752
* | [ticket/10752] Pass-by-reference fix for acp_stylesVjacheslav Trushkin2012-04-031-12/+12
| | | | | | | | | | | | Fixing pass-by-reference bug in acp_styles PHPBB3-10752
* | [ticket/10752] Removing globals acp_stylesVjacheslav Trushkin2012-04-031-141/+127
| | | | | | | | | | | | Removing global variables from functions in acp_styles PHPBB3-10752
* | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-313-4/+4
| | | | | | | | PHPBB3-10609
* | [feature/merging-style-components] Fix back link on install pageIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | When on install page and all styles are installed, fix back link to go to main styles page. PHPBB3-10632
* | [feature/merging-style-components] Renaming "delete" to "uninstall" for stylesVjacheslav Trushkin2012-03-311-32/+32
| | | | | | | | | | | | Changing from "delete" to "uninstall" in acp_styles to avoid confusing users PHPBB3-10632
* | [feature/merging-style-components] Fixing few errors in acp_stylesVjacheslav Trushkin2012-03-311-6/+1
| | | | | | | | | | | | Fixing notices and usability issues PHPBB3-10632
* | [feature/merging-style-components] Fix notices in acp_stylesIgor Wiedler2012-03-311-2/+3
| | | | | | | | PHPBB3-10632
* | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-318-12/+118
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * | [feature/ajax] Add entirely unrelated but nice newlinesIgor Wiedler2012-03-311-0/+1
| | | | | | | | | | | | PHPBB3-10270
| * | [feature/ajax] Unify phpbb_json_response instantiationIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | PHPBB3-10270
| * | [feature/ajax] Send correct activate/deactivate JSON response in acp_profileIgor Wiedler2012-03-311-0/+18
| | | | | | | | | | | | PHPBB3-10270
| * | [feature/ajax] Replace static call to phpbb_request with OOIgor Wiedler2012-03-311-1/+2
| | | | | | | | | | | | PHPBB3-10270
| * | [feature/ajax] Handle acp_modules error cases with JSON responseIgor Wiedler2012-03-311-1/+9
| | | | | | | | | | | | PHPBB3-10270
| * | [ticket/10272] AJAXified the bots page in the ACP.Callum Macrae2012-03-311-1/+9
| | | | | | | | | | | | PHPBB3-10272
| * | [ticket/10271] AJAXified buttons on acp_main.Callum Macrae2012-03-311-2/+36
| | | | | | | | | | | | PHPBB3-10271
| * | [ticket/10271] AJAXified the styles tab in the ACP.Callum Macrae2012-03-311-2/+15
| | | | | | | | | | | | PHPBB3-10271
| * | [ticket/10271] AJAXified various deletions in the ACP.Callum Macrae2012-03-313-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following places have had deletion AJAXified: * Smilies and icons * Word censors * BBCodes * Attachment groups * Groups * Admin / User / Moderator / Forum roles * Report / denial reasons * Module management * Custom profile fields PHPBB3-10271
| * | [ticket/10328] Renamed the JSON class, also now using autoloading.Callum Macrae2012-03-311-1/+2
| | | | | | | | | | | | | | | | | | | | | It is no longer static, and uses autoloading. It has also been renamed from JSON to phpbb_json_response. PHPBB3-10328
| * | [ticket/10328] Added a JSON class.Callum Macrae2012-03-311-2/+1
| | | | | | | | | | | | | | | | | | | | | The JSON class adds a consistent way to send JSON to the client, making it perfect for AJAX (jQuery automatically parses it). PHPBB3-10328
| * | [ticket/10271] Changed AJAX functions to $request->is_ajax().Callum Macrae2012-03-311-2/+2
| | | | | | | | | | | | PHPBB3-10271
| * | [ticket/10281] AJAXified reordering forums in the ACP.Callum Macrae2012-03-311-0/+6
| | | | | | | | | | | | PHPBB3-10281
| * | Merge remote-tracking branch 'cyberalien/feature/purge-cache' into developDavid King2012-03-301-5/+0
| |\ \
| | * | [feature/purge-cache] Allow all admins to purge cacheVjacheslav Trushkin2012-02-181-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Allow all administrators to purge cache PHPBB3-10659
* | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-292-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-261-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10694] Adjusting details link to 5.3 announcement [ticket/10694] Update PHP warning to 5.3.2
| | * | [ticket/10694] Adjusting details link to 5.3 announcementMichael Cullum2012-03-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10694
| | * | [ticket/10694] Update PHP warning to 5.3.2Michael Cullum2012-03-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10694
| * | | [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.Oleg Pudeyev2012-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split module_auth into a static and a non-static version. Call the static version statically and the non-static version non-statically. PHPBB3-10615
* | | | [feature/merging-style-components] New acp_stylesVjacheslav Trushkin2012-03-142-2246/+949
|/ / / | | | | | | | | | | | | | | | New acp_styles, completely rewritten PHPBB3-10632
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-091-4/+31
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/9831] Fix saving unchecked checkbox field value [ticket/9831] Correctly store checkbox default value for boolean CPF.
| * | Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympusOleg Pudeyev2012-03-091-4/+31
| |\ \ | | | | | | | | | | | | | | | | | | | | * rxu/ticket/9831: [ticket/9831] Fix saving unchecked checkbox field value [ticket/9831] Correctly store checkbox default value for boolean CPF.
| | * | [ticket/9831] Fix saving unchecked checkbox field valuerxu2012-02-051-0/+8
| | | | | | | | | | | | | | | | PHPBB3-9831
| | * | [ticket/9831] Correctly store checkbox default value for boolean CPF.rxu2012-01-181-4/+23
| | | | | | | | | | | | | | | | PHPBB3-9831
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-281-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * develop-olympus: [ticket/10639] Do not allow negative post count as rank's minimum posts
| * | [ticket/10639] Do not allow negative post count as rank's minimum postsJoas Schilling2012-02-201-1/+1
| | | | | | | | | | | | PHPBB3-10639
* | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-071-9/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles
| * | [ticket/10616] Add template inheritance to exported templateVjacheslav Trushkin2012-02-031-9/+8
| |/ | | | | | | | | | | Add template inheritance when exporting template.cfg PHPBB3-10616
* | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-031-7/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | [ticket/10535] Removed email confirm field from acp_users moduleDavid King2011-12-231-7/+0
| | | | | | | | | | | | PHPBB3-10535