1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 08:53:05 +02:00
Commit Graph

98 Commits

Author SHA1 Message Date
e08db41d0d Merge pull request #1719 from cyberalien/ticket/11552
Responsive design for prosilver
2013-10-20 11:12:55 -07:00
18d505c171 [ticket/11947] Notification link fixes
Allow clicking child elements of link that toggles notification popup

PHPBB3-11947
2013-10-19 02:18:22 +03:00
12c34e4176 [ticket/11552] Fixes for auto-resize textarea
Changing auto-resize code to work with all possible
box-sizing and checking for negative height.

PHPBB3-11552
2013-10-18 23:43:32 +03:00
9f1c627988 [feature/plupload/integration] Add missing javascript file.
PHPBB3-10929
2013-10-14 00:52:37 +02:00
8c3bb26a62 Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' 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
2013-06-06 14:07:27 -05:00
9db0fa8856 [feature/editor-code-tabs] Make inTag function reusable
Change inTag function to reusable JS function that can check
for any BBCode

PHPBB3-11557
2013-05-22 20:52:15 +03:00
67053d0b4e [ticket/11279] Log error in console
PHPBB-11279
2013-05-20 22:12:20 +03:00
a9c9448ebb [ticket/11279] Clearer AJAX errors
Display clearer AJAX errors rather than generic error

PHPBB3-11279
2013-05-20 21:35:51 +03:00
809c51f30d [feature/editor-code-tabs] Check for browser support in function
Check for browser support and valid textarea in function instead of
before applying function.

PHPBB3-11557
2013-05-20 20:33:51 +03:00
b2e5cc8934 [feature/editor-code-tabs] Apply code editor to everything
Move code editor from prosilver to assets
Apply code editor to subsilver2
Apply code editor to ACP elements where bbcode is allowed

PHPBB3-11557
2013-05-20 20:29:37 +03:00
393ed4a2d0 Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into develop 2013-05-11 20:15:53 -05:00
6821a27ccf Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop
# 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
2013-05-08 19:35:59 -04:00
1834ceb614 [ticket/11442] Use button name as indicator instead of css classes
This leaves it up to the style authors how to style any buttons, without
messing up any functionality.

PHPBB3-11442
2013-05-08 00:08:35 +02:00
947550df8f [ticket/10741] Docblock for phpbb.resizeTextArea
Better description of phpBB.resizeTextArea with detailed
explanation of all optional parameters.

Removed unnecessary semicolons

PHPBB3-10741
2013-04-30 11:27:43 +03:00
cbb9f084fc [ticket/10741] Fix for browser-specific resizing of textarea
Disable browser-specific resizing only after textarea has been resized
Enable browser-specific resizing after script resizing has been reset

PHPBB3-10741
2013-04-12 16:46:55 +03:00
88072fd6c2 [ticket/10741] Function to resize textarea elements
New function to automatically resize textarea elements
as user types text

PHPBB3-10741
2013-04-12 16:46:54 +03:00
34cdbd0360 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
Conflicts:
	phpBB/styles/prosilver/template/timezone.js
2013-03-26 13:18:54 +01:00
f0b0978538 [ticket/11314] Modify files to comply with coding standards
PHPBB3-11314
2013-03-26 13:13:33 +01:00
36168b311e [ticket/11314] Fix issues mentioned in jshint report
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.

PHPBB3-11314
2013-03-26 10:31:28 +01:00
a38a92424d [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
2013-03-14 10:45:17 -07:00
0bbde4c122 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166
* '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
2013-03-06 07:35:47 +01:00
623b9af38b [ticket/11103] Only lookup $(target) once
PHPBB3-11103
2013-01-15 12:30:26 -06:00
51e0f002ee Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/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
2013-01-15 11:31:39 -06:00
5028fb981d [ticket/11166] Fix typo in comment
PHPBB3-11166
2013-01-15 13:10:25 +01:00
49edfa49ab [ticket/11314] Fix whitespace issues
PHPBB3-11314
2013-01-12 19:08:34 +01:00
9c4f0d51df [ticket/11314] Cleanup core.js coding
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
2013-01-10 10:59:20 +01:00
fbdd3170c9 [ticket/11313] Use correct object el instead of eel in alt_text callback
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
2013-01-08 23:35:39 +01:00
b5cc1ed683 [ticket/10949] Converted missing code to new JS coding guidelines
A few missing semi-colons were also added where needed.

PHPBB3-10949
2013-01-04 22:46:12 +01:00
46c33e08b5 Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949
Conflicts:
	phpBB/assets/javascript/core.js
2013-01-04 20:46:56 +01:00
300b8236eb Merge PR #1153 branch 'marc1706/ticket/10805' into develop
# 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
2013-01-02 16:56:38 -05:00
e211009eb7 [ticket/11302] Correctly select first timezone or selected timezone
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
2013-01-02 22:05:14 +01:00
48b6e45f7c [ticket/10805] Compare phpbbAlertTimer against null
PHPBB3-10805
2013-01-02 16:44:05 +01:00
5d07ddffaf [ticket/10805] Clear loading alert timeout after ajax request finished
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
2013-01-01 20:29:30 +01:00
693778fa07 [ticket/10803] Show failure message until user dismisses it
PHPBB3-10803
2012-12-18 23:42:14 +01:00
0d7f61dc7a [ticket/11166] Use provided custom templates on AJAX confirm box
PHPBB3-11166
2012-12-18 13:50:56 +01:00
51cd1129be Merge PR #890 branch 'nickvergessen/ticket/10982' into develop
* 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
2012-10-16 21:47:13 -04:00
fd40e841cb [ticket/11004] Always update suggestion button in timezone_preselect_select
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
2012-07-24 17:09:26 +02:00
5bdec7669b [ticket/11003] Ability to show full list of timezones with JavaScript enabled
This also fixes the problem with Chrome which displayed all timezones.

PHPBB3-11007
PHPBB3-11003
2012-07-23 18:13:22 +02:00
d099ef8cad [feature/new-tz-handling] Display suggestion when a different value is selected
PHPBB3-9558
2012-07-19 14:24:59 +02:00
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
c4c95fddaa [ticket/10982] Correctly check, whether data-overlay is set
PHPBB3-10982
2012-07-11 15:06:44 +02:00
95298de5ae [ticket/10982] Allow setting dimming control overlay also as data-overlay
PHPBB3-10982
2012-07-11 14:53:50 +02:00
f1056a9b2f [ticket/10811] Make toogle_subscribe more generic so it can toogle all links
PHPBB3-10811
2012-07-05 01:03:19 +02:00
d5a788ae5b [ticket/10949] Converted AJAX coding standards to new guidelines.
Basically, moved parentheses to same line and changed variable names to
camel case.

PHPBB3-10949
2012-06-21 19:16:05 +01:00
7b4f9765f8 [feature/new-tz-handling] Move js functions into assets core.js
PHPBB3-9558
2012-06-19 18:57:20 +02:00
53a47fdcc3 [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
PHPBB3-10811
2012-04-29 12:33:55 +02:00
286aebd93b [ticket/10811] Fix AJAX callback alt_text so it can be repeated.
PHPBB3-10811
2012-04-19 13:37:07 +02:00
7a9d9f97ef [ticket/10784] Do not show ajax overlay unless needed
PHPBB3-10784
2012-04-12 21:03:47 +02:00
64df9d1406 [ticket/10272] Removed code that was prevent event propogation in AJAX.
PHPBB3-10272
2012-03-31 02:10:16 +02:00
ba56e34b6d [ticket/10291] Fixed a bug in the quick reply AJAX.
It wasn't submitting, as jQuery was ignoring the submit value.

PHPBB3-10291
2012-03-31 02:10:15 +02:00