aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/10860] Fixing js error in updater
| * Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympusAndreas Fischer2012-05-061-2/+2
| |\ | | | | | | | | | | | | * cyberalien/ticket/10860: [ticket/10860] Fixing js error in updater
| | * [ticket/10860] Fixing js error in updaterVjacheslav Trushkin2012-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixing javascript error in side-by-side diff styling in updater: resizing inner block instead of outer block and increasing height by inner/outer block difference. PHPBB3-10860
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-13/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| * | [ticket/10819] Remove support for older browsersPatrick Webster2012-04-171-4/+0
| | | | | | | | | | | | PHPBB3-10819
| * | [ticket/10819] Forgot this causes vertical scrollbars on IEPatrick Webster2012-04-151-1/+0
| | | | | | | | | | | | PHPBB3-10819
| * | [ticket/10819] Improve side-by-side diff stylingPatrick Webster2012-04-151-13/+14
| |/ | | | | | | | | | | | | | | | | | | | | Used transparent background for unchanged lines Shortened the table headers and make the background grey Added a border between the columns Increased the font size on pre blocks Added Consolas as the first pre font, for Windows users Added wordwrapping for pre blocks PHPBB3-10819
* | Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | [ticket/10688] Changed version 3.0 to 3.1Shibu Lijack2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | Replaced phpBB 3.0 to 3.1 in the stylesheets PHPBB-10688
* | | Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-134-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-callumacrae/ticket/10783: [ticket/10783] Added assets_version to ACP and simple_*.html. [ticket/10783] Added assets_version to subsilver2. [ticket/10783] Added ?assets_version to assets.
| * | | [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-114-5/+5
| | | | | | | | | | | | | | | | PHPBB3-10783
* | | | [ticket/10784] Do not show ajax overlay unless neededMarc Alexander2012-04-121-4/+8
| | | | | | | | | | | | | | | | PHPBB3-10784
* | | | Merge remote-tracking branch 'github-cyberalien/ticket/10754' into developNils Adermann2012-04-091-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * github-cyberalien/ticket/10754: [ticket/10754] Changing $style to $phpbb_style
| * | | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Renaming global variable $style to $phpbb_style PHPBB3-10754
* | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-5/+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
* | | | Merge remote-tracking branch 'rahulr92/ticket/10650' into developDavid King2012-04-041-0/+5
|\ \ \ \
| * | | | [ticket/10650] Displaying last topic on forum listRahul2012-04-051-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-042-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10607] Added 'Powered by' translation string. Conflicts: phpBB/adm/index.php phpBB/language/en/common.php
| * | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-043-2/+3
| | | | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
* | | [ticket/10665] Adding includejs to acp templatesVjacheslav Trushkin2012-04-011-1/+2
| | | | | | | | | | | | | | | | | | Adding includejs to acp overall_footer.html PHPBB3-10665
* | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-3117-30/+246
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Fix acp_styles activate_deactivate ajax callback nameIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [feature/ajax] Remove not working module enable/disable ajax codeIgor Wiedler2012-03-312-1/+4
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [ticket/10270] Changing close button for ajax popupsVjacheslav Trushkin2012-03-313-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css PHPBB3-10270
| * | | [feature/ajax] Generic error handling with a phpbb.alert boxIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [feature/ajax] Do not hard-code sorting images of acp_forums orderingIgor Wiedler2012-03-313-8/+43
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [feature/ajax] Make phpbb.ajaxify signature use single object (more explicit)Igor Wiedler2012-03-311-5/+21
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [feature/ajax] JavaScript strict modeIgor Wiedler2012-03-311-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [feature/ajax] Stylistic JavaScript adjustmentsIgor Wiedler2012-03-311-9/+16
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [feature/ajax] Use attr('data-foo') instead of data('foo')Igor Wiedler2012-03-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | data() is slower and does additional unwanted things like caching and type conversion. Just reading the value is safer. PHPBB3-10270
| * | | [ticket/10272] Removed some duplication calls to $.fn.data.Callum Macrae2012-03-311-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10272
| * | | [ticket/10270] Moved the AJAX error langyage entries to the footer.Callum Macrae2012-03-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [ticket/10272] Renamed AJAX callback act_deact to activate_deactivate.Callum Macrae2012-03-314-4/+4
| | | | | | | | | | | | | | | | PHPBB3-10272
| * | | [ticket/10270] Fixed JavaScript alerts in the ACP.Callum Macrae2012-03-313-4/+10
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [ticket/10271] Started using .call for javascript callbacks.Callum Macrae2012-03-311-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, they were just being called by appending parentheses and functions. Now, they're being called and the element is being set as the context instead of a parameter. It's a lot cleaner. PHPBB3-10271
| * | | [ticket/10271] data-ajax="false" is now ignored.Callum Macrae2012-03-311-2/+5
| | | | | | | | | | | | | | | | PHPBB3-10271
| * | | [ticket/10271] Reduced calls to $ in the AJAX JavaScript.Callum Macrae2012-03-311-13/+17
| | | | | | | | | | | | | | | | PHPBB3-10271
| * | | [ticket/10271] Added comments to AJAX callbacks.Callum Macrae2012-03-311-3/+21
| | | | | | | | | | | | | | | | PHPBB3-10271
| * | | [ticket/10270] Replaced find by tag names with class names in the js.Callum Macrae2012-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | What it was before (selecting by tag name) could have caused some problems for style authors. PHPBB3-10270
| * | | [ticket/10270] Added the alerts to the ACP footer.Callum Macrae2012-03-311-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | I had forgotten to do it previously. PHPBB3-10270
| * | | [feature/ajax] Moved script.js into a few different files.Callum Macrae2012-03-312-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Seperated it into: assets/javascript/core.js, styles/prosilver/template/ajax.js and adm/style/ajax.js. PHPBB3-10270
| * | | [ticket/10270] Got rid of the temporary jQuery for the AJAX changes.Callum Macrae2012-03-311-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The jQuery library wasn't included before, so a temporary one was included. Now that igorws jQuery patch has been merged, the temporary library can be removed. PHPBB3-10270
| * | | [ticket/10272] Renamed AJAX callback "style_act_deact" to "act_deact".Callum Macrae2012-03-314-4/+4
| | | | | | | | | | | | | | | | PHPBB3-10272
| * | | [ticket/10272] AJAXified the bots page in the ACP.Callum Macrae2012-03-311-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10272
| * | | [ticket/10271] AJAXified buttons on acp_main.Callum Macrae2012-03-311-7/+7
| | | | | | | | | | | | | | | | PHPBB3-10271
| * | | [ticket/10271] AJAXified the styles tab in the ACP.Callum Macrae2012-03-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10271
| * | | [ticket/10271] AJAXified various deletions in the ACP.Callum Macrae2012-03-3110-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/10270] Moved some HTML from the JavaScript to overall_footer.Callum Macrae2012-03-311-0/+5
| | | | | | | | | | | | | | | | PHPBB3-10270
| * | | [ticket/10270] Added jQuery popup CSS to the ACP.Callum Macrae2012-03-311-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was missing previously, meaning that it displayed wrong and in the footer. PHPBB3-10270
| * | | [ticket/10281] AJAXified reordering forums in the ACP.Callum Macrae2012-03-312-9/+13
| | | | | | | | | | | | | | | | PHPBB3-10281
generated by cgit v1.2.1 (git 2.21.0) at 2025-07-29 15:40:39 +0000