aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'Marc/ticket/11914' into developJoas Schilling2013-11-276-181/+206
|\ | | | | | | | | | | | | * Marc/ticket/11914: [ticket/11914] Add assets version to included plupload scripts [ticket/11914] Update plupload to 2.0.0 [ticket/11914] Use unix line endings in plupload queue css file
| * [ticket/11914] Update plupload to 2.0.0Marc Alexander2013-10-236-17/+42
| | | | | | | | | | | | | | There are no longer seperate javascript files for each type of uploader. New filenames have been kept as used inside the plupload package. PHPBB3-11914
| * [ticket/11914] Use unix line endings in plupload queue css fileMarc Alexander2013-10-231-177/+177
| | | | | | | | PHPBB3-11914
* | Merge pull request #1856 from prototech/ticket/12001Nathan Guse2013-11-211-1/+1
|\ \ | | | | | | [ticket/12001] Ensure that form data is sent to server in AJAX requests.
| * | [ticket/12001] Ensure that form data is sent to server in AJAX requests.Cesar G2013-11-081-1/+1
| | | | | | | | | | | | PHPBB3-12001
* | | Merge pull request #1834 from cyberalien/ticket/11984Nathan Guse2013-11-211-2/+4
|\ \ \ | | | | | | | | Move responsive design adjustments
| * | | [ticket/11984] Do not resize textarea on touch devicesVjacheslav Trushkin2013-11-191-2/+4
| | | | | | | | | | | | | | | | PHPBB3-11984
* | | | [ticket/10810] Make the color palette usable outside of the editor context.Cesar G2013-11-131-8/+42
| | | | | | | | | | | | | | | | PHPBB3-10810
* | | | [ticket/10810] Move the color palette code to core.js.Cesar G2013-11-122-61/+57
|/ / / | | | | | | | | | PHPBB3-10810
* | | [ticket/11472] Make the color swatch configurable and fix it in subsilver2Cesar G2013-11-121-1/+5
| | | | | | | | | | | | PHPBB3-11472
* | | [ticket/11472] Make prosilver's editor.js an asset used by all styles.Cesar G2013-11-121-0/+422
|/ / | | | | | | PHPBB3-11472
* | [ticket/11928] Javascript requires camel case.Cesar G2013-11-031-14/+14
| | | | | | | | PHPBB3-11928
* | [ticket/11928] Rename loadingAlert to loading_indicator.Cesar G2013-10-301-14/+14
| | | | | | | | PHPBB3-11928
* | [ticket/11928] Replace AJAX loading popup with animation.Cesar G2013-10-291-13/+20
| | | | | | | | PHPBB3-11928
* | [ticket/11956] Move code that hides dropdowns to assetsVjacheslav Trushkin2013-10-261-1/+19
| | | | | | | | PHPBB3-11956
* | [ticket/11956] Move dropdown handler to assetsVjacheslav Trushkin2013-10-261-0/+116
| | | | | | | | PHPBB3-11956
* | [ticket/11138] Increase AJAX timeout period to 15 seconds.Cesar G2013-10-231-2/+2
|/ | | | PHPBB3-11138
* [ticket/11916] Remove files from hidden attach list after deletionMarc Alexander2013-10-231-20/+43
| | | | | | | | The hidden attachment_data list needs to be updated if a file got removed. This was not done until now and caused a general error after submitting a post if a file was removed after uploading it. PHPBB3-11916
* Merge pull request #1719 from cyberalien/ticket/11552Nils Adermann2013-10-201-10/+10
|\ | | | | Responsive design for prosilver
| * [ticket/11552] Fixes for auto-resize textareaVjacheslav Trushkin2013-10-181-10/+10
| | | | | | | | | | | | | | Changing auto-resize code to work with all possible box-sizing and checking for negative height. PHPBB3-11552
* | [ticket/11947] Notification link fixesVjacheslav Trushkin2013-10-191-4/+4
|/ | | | | | Allow clicking child elements of link that toggles notification popup PHPBB3-11947
* Merge pull request #1772 from bantu/feature/plupload/integrationNils Adermann2013-10-131-0/+281
|\ | | | | [ticket/10929] Integration of Plupload
| * [feature/plupload/integration] Add missing javascript file.Fyorl2013-10-141-0/+281
| | | | | | | | PHPBB3-10929
* | [feature/plupload/deps] Adding parts of plupload_1_5_7.zipAndreas Fischer2013-07-1712-0/+181
|/ | | | PHPBB3-10929
* 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