| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
PHPBB3-11914
|
|\ \
| | |
| | | |
[ticket/12001] Ensure that form data is sent to server in AJAX requests.
|
| | |
| | |
| | |
| | | |
PHPBB3-12001
|
|\ \ \
| | | |
| | | | |
Move responsive design adjustments
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11984
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10810
|
|/ / /
| | |
| | |
| | | |
PHPBB3-10810
|
| | |
| | |
| | |
| | | |
PHPBB3-11472
|
|/ /
| |
| |
| | |
PHPBB3-11472
|
| |
| |
| |
| | |
PHPBB3-11928
|
| |
| |
| |
| | |
PHPBB3-11928
|
| |
| |
| |
| | |
PHPBB3-11928
|
| |
| |
| |
| | |
PHPBB3-11956
|
| |
| |
| |
| | |
PHPBB3-11956
|
|/
|
|
| |
PHPBB3-11138
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| | |
Responsive design for prosilver
|
| |
| |
| |
| |
| |
| |
| | |
Changing auto-resize code to work with all possible
box-sizing and checking for negative height.
PHPBB3-11552
|
|/
|
|
|
|
| |
Allow clicking child elements of link that toggles notification popup
PHPBB3-11947
|
|\
| |
| | |
[ticket/10929] Integration of Plupload
|
| |
| |
| |
| | |
PHPBB3-10929
|
|/
|
|
| |
PHPBB3-10929
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Change inTag function to reusable JS function that can check
for any BBCode
PHPBB3-11557
|
| |
| |
| |
| |
| |
| |
| | |
Check for browser support and valid textarea in function instead of
before applying function.
PHPBB3-11557
|
| |
| |
| |
| |
| |
| |
| |
| | |
Move code editor from prosilver to assets
Apply code editor to subsilver2
Apply code editor to ACP elements where bbcode is allowed
PHPBB3-11557
|
| |
| |
| |
| | |
PHPBB-11279
|
|/
|
|
|
|
| |
Display clearer AJAX errors rather than generic error
PHPBB3-11279
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Better description of phpBB.resizeTextArea with detailed
explanation of all optional parameters.
Removed unnecessary semicolons
PHPBB3-10741
|
| |
| |
| |
| |
| |
| |
| | |
Disable browser-specific resizing only after textarea has been resized
Enable browser-specific resizing after script resizing has been reset
PHPBB3-10741
|
| |
| |
| |
| |
| |
| |
| | |
New function to automatically resize textarea elements
as user types text
PHPBB3-10741
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
# 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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
|/|
| |
| |
| |
| |
| | |
This leaves it up to the style authors how to style any buttons, without
messing up any functionality.
PHPBB3-11442
|
|\ \
| |/
| |
| |
| | |
Conflicts:
phpBB/styles/prosilver/template/timezone.js
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '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
|
| | |
| | |
| | |
| | | |
PHPBB3-11103
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
# 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
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11166
|
| |/ /
| | |
| | |
| | | |
PHPBB3-11166
|
| | |
| | |
| | |
| | | |
PHPBB3-11314
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.
PHPBB3-11314
|
| | |
| | |
| | |
| | | |
PHPBB3-11314
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
A few missing semi-colons were also added where needed.
PHPBB3-10949
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
phpBB/assets/javascript/core.js
|