aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' ↵Nathaniel Guse2013-06-061-0/+159
|\ | | | | | | | | | | | | | | | | | | | | | | 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] Make inTag function reusableVjacheslav Trushkin2013-05-221-29/+44
| | | | | | | | | | | | | | Change inTag function to reusable JS function that can check for any BBCode PHPBB3-11557
| * [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-201-0/+4
| | | | | | | | | | | | | | Check for browser support and valid textarea in function instead of before applying function. PHPBB3-11557
| * [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-201-0/+140
| | | | | | | | | | | | | | | | 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/11279] Log error in consoleVjacheslav Trushkin2013-05-201-0/+3
| | | | | | | | PHPBB-11279
* | [ticket/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-201-2/+14
|/ | | | | | Display clearer AJAX errors rather than generic error PHPBB3-11279
* Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into developNathaniel Guse2013-05-111-0/+96
|\
| * [ticket/10741] Docblock for phpbb.resizeTextAreaVjacheslav Trushkin2013-04-301-15/+26
| | | | | | | | | | | | | | | | | | Better description of phpBB.resizeTextArea with detailed explanation of all optional parameters. Removed unnecessary semicolons PHPBB3-10741
| * [ticket/10741] Fix for browser-specific resizing of textareaVjacheslav Trushkin2013-04-121-3/+3
| | | | | | | | | | | | | | Disable browser-specific resizing only after textarea has been resized Enable browser-specific resizing after script resizing has been reset PHPBB3-10741
| * [ticket/10741] Function to resize textarea elementsVjacheslav Trushkin2013-04-121-0/+85
| | | | | | | | | | | | | | New function to automatically resize textarea elements as user types text PHPBB3-10741
* | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-081-18/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/10155: [ticket/10155] Update copyright in new migration file to 2013 [ticket/10155] Make effectively installed test more specific [ticket/10155] Use more descriptive title for migration file [ticket/10155] Use new migration file for jQuery config update [ticket/10155] Update jQuery to 1.8.3
| * | [ticket/10155] Update jQuery to 1.8.3Matt Friedman2013-03-141-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently included jQuery is old by now, v1.6.2. We should update to 1.8.3. This allows us to take advantage of the latest form of jQuery event delegation ($.on). I don't think it wise to update to jQuery 1.9.x yet, as many 3rd party scripts still need to be updated to cope with its deprecated features ($.browser). Therefor, 1.8.3 is the latest and most widely compatible stable version right now. PHPBB3-10155
* | | [ticket/11442] Use button name as indicator instead of css classesJoas Schilling2013-05-081-3/+3
| |/ |/| | | | | | | | | | | This leaves it up to the style authors how to style any buttons, without messing up any functionality. PHPBB3-11442
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-261-2/+15
|\ \ | |/ | | | | | | Conflicts: phpBB/styles/prosilver/template/timezone.js
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-061-156/+142
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | * [ticket/11103] Only lookup $(target) onceNathan Guse2013-01-151-2/+2
| | | | | | | | | | | | PHPBB3-11103
| | * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-156/+142
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html
| * | | [ticket/11166] Fix typo in commentJoas Schilling2013-01-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11166
| * | | [ticket/11166] Use provided custom templates on AJAX confirm boxJoas Schilling2012-12-181-1/+1
| |/ / | | | | | | | | | PHPBB3-11166
* | | [ticket/11314] Modify files to comply with coding standardsMarc Alexander2013-03-261-3/+2
| | | | | | | | | | | | PHPBB3-11314
* | | [ticket/11314] Fix issues mentioned in jshint reportMarc Alexander2013-03-261-7/+7
| | | | | | | | | | | | | | | | | | | | | Additionally, the editor.js files are now the same file in both subsilver2, prosilver, and the acp. PHPBB3-11314
* | | [ticket/11314] Fix whitespace issuesMarc Alexander2013-01-121-6/+6
| | | | | | | | | | | | PHPBB3-11314
* | | [ticket/11314] Cleanup core.js codingMarc Alexander2013-01-101-11/+9
| |/ |/| | | | | | | | | | | | | | | | | | | function errorHandler() was used in returnHandler() before it was defined. The unused variable alert has been removed from errorHandler(). Overuse of the var keyword for the variable sign has been removed and the if statement has been simplified. The definition of the variable i has been moved outside of the for loop definition. The var keyword shouldn't be used inside the definition of the for loop. PHPBB3-11314
* | [ticket/11313] Use correct object el instead of eel in alt_text callbackMarc Alexander2013-01-081-1/+1
| | | | | | | | | | | | | | | | This typo was added by the PRs #860 and #1178. Only the object el exists and is correct. Due to this the text of links using the alt_text callback were not modified while executing the callback. PHPBB3-11313
* | [ticket/10949] Converted missing code to new JS coding guidelinesMarc Alexander2013-01-041-37/+37
| | | | | | | | | | | | A few missing semi-colons were also added where needed. PHPBB3-10949
* | Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949Marc Alexander2013-01-041-114/+76
|\ \ | | | | | | | | | | | | Conflicts: phpBB/assets/javascript/core.js
| * | [ticket/10949] Converted AJAX coding standards to new guidelines.Callum Macrae2012-06-211-117/+78
| | | | | | | | | | | | | | | | | | | | | Basically, moved parentheses to same line and changed variable names to camel case. PHPBB3-10949
* | | Merge PR #1153 branch 'marc1706/ticket/10805' into developOleg Pudeyev2013-01-021-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/10805: [ticket/10805] Compare phpbbAlertTimer against null [ticket/10805] Clear loading alert timeout after ajax request finished
| * | | [ticket/10805] Compare phpbbAlertTimer against nullMarc Alexander2013-01-021-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10805
| * | | [ticket/10805] Clear loading alert timeout after ajax request finishedMarc Alexander2013-01-011-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout for the "request timed out" popup should be cleared if it finished. Since it is currently not cleared, the timeout alert appears as an extra overlay if another ajaxified function is ran within 5 seconds of the initial function call. This patch will take care of clearing the timeout if either the success (function return_handler()) or error (function error_handler()) functions are called. PHPBB3-10805
* | | | [ticket/11302] Correctly select first timezone or selected timezoneMarc Alexander2013-01-021-1/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While registering, we should default to a given timezone. By selecting the first timezone by default, this is fulfilled. This doesn't happen currently, as only the "Select a timezone" selection appears. If a user selects a timezone during the registration process we should also make sure that the selected element is still selected; even if we have to return to the registration page, i.e. if there was an error while submitting the form. This is currently not the case. With this patch the javascript code will behave correctly. Additionally, a duplicate inclusion of timezone.js has been removed as it was not needed. PHPBB3-11302
* | | [ticket/10803] Show failure message until user dismisses itMarc Alexander2012-12-181-6/+0
| |/ |/| | | | | PHPBB3-10803
* | Merge PR #890 branch 'nickvergessen/ticket/10982' into developOleg Pudeyev2012-10-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10982: [ticket/10982] Correctly check, whether data-overlay is set [ticket/10982] Remove overlay on first up/down move of forums in ACP [ticket/10982] Allow setting dimming control overlay also as data-overlay
| * | [ticket/10982] Correctly check, whether data-overlay is setJoas Schilling2012-07-111-1/+1
| | | | | | | | | | | | PHPBB3-10982
| * | [ticket/10982] Allow setting dimming control overlay also as data-overlayJoas Schilling2012-07-111-1/+1
| | | | | | | | | | | | PHPBB3-10982
* | | [ticket/11004] Always update suggestion button in timezone_preselect_selectJoas Schilling2012-07-241-6/+8
| | | | | | | | | | | | | | | | | | | | | Suggestion must also be updated when the suggestion is selected at first, so we can display a correct button, when the suggestion is not selected anymore. PHPBB3-11004
* | | [ticket/11003] Ability to show full list of timezones with JavaScript enabledJoas Schilling2012-07-231-2/+13
| | | | | | | | | | | | | | | | | | | | | This also fixes the problem with Chrome which displayed all timezones. PHPBB3-11007 PHPBB3-11003
* | | [feature/new-tz-handling] Display suggestion when a different value is selectedJoas Schilling2012-07-191-0/+8
| | | | | | | | | | | | PHPBB3-9558
* | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-181-1/+34
|\ \ \ | |/ / | | | | | | feature/new-tz-handling
| * | [ticket/10811] Make toogle_subscribe more generic so it can toogle all linksJoas Schilling2012-07-051-16/+23
| | | | | | | | | | | | PHPBB3-10811
| * | [ticket/10811] Make subscribe/unsubscribe repeatable with AJAXJoas Schilling2012-04-291-0/+25
| | | | | | | | | | | | PHPBB3-10811
| * | [ticket/10811] Fix AJAX callback alt_text so it can be repeated.Joas Schilling2012-04-191-1/+2
| |/ | | | | | | PHPBB3-10811
* | [feature/new-tz-handling] Move js functions into assets core.jsJoas Schilling2012-06-191-0/+85
|/ | | | PHPBB3-9558
* [ticket/10784] Do not show ajax overlay unless neededMarc Alexander2012-04-121-1/+5
| | | | PHPBB3-10784
* [ticket/10272] Removed code that was prevent event propogation in AJAX.Callum Macrae2012-03-311-5/+5
| | | | PHPBB3-10272
* [ticket/10291] Fixed a bug in the quick reply AJAX.Callum Macrae2012-03-311-1/+19
| | | | | | It wasn't submitting, as jQuery was ignoring the submit value. PHPBB3-10291
* [feature/ajax] Fix filter check, quick mod tools data-attributeIgor Wiedler2012-03-311-1/+1
| | | | PHPBB3-10270
* [feature/ajax] Use the error handlerIgor Wiedler2012-03-311-5/+9
| | | | PHPBB3-10270
* [feature/ajax] Generic error handling with a phpbb.alert boxIgor Wiedler2012-03-311-1/+17
| | | | PHPBB3-10270
* [feature/ajax] Change filter semantics, some minor adjustmentsIgor Wiedler2012-03-311-2/+2
| | | | PHPBB3-10270
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-26 10:46:35 +0000