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

76 Commits

Author SHA1 Message Date
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
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
2f44850a28 [feature/ajax] Fix filter check, quick mod tools data-attribute
PHPBB3-10270
2012-03-31 02:10:14 +02:00
ea4362fc4c [feature/ajax] Use the error handler
PHPBB3-10270
2012-03-31 02:09:26 +02:00
27199bb509 [feature/ajax] Generic error handling with a phpbb.alert box
PHPBB3-10270
2012-03-31 02:09:26 +02:00
2f25173d93 [feature/ajax] Change filter semantics, some minor adjustments
PHPBB3-10270
2012-03-31 02:09:26 +02:00
de82608e6f [feature/ajax] Refactor phpbb.ajaxify event callback
PHPBB3-10270
2012-03-31 02:09:26 +02:00
4848d6c9e8 [feature/ajax] Bind to form.submit instead of form input.click
PHPBB3-10270
2012-03-31 02:09:25 +02:00
b8a6a50f5c [feature/ajax] Rename exception to filter
PHPBB3-10270
2012-03-31 02:09:25 +02:00
6ad4015a37 [feature/ajax] Add a missing semicolon
PHPBB3-10270
2012-03-31 02:09:25 +02:00
fc0d2425dc [feature/ajax] Fix the alt_text ajax callback
PHPBB3-10270
2012-03-31 02:09:25 +02:00
7ed2cbef75 [feature/ajax] Make phpbb.ajaxify signature use single object (more explicit)
PHPBB3-10270
2012-03-31 02:09:25 +02:00
d96b07a745 [feature/ajax] Only allow object argument for phpbb.ajaxify
PHPBB3-10270
2012-03-31 02:09:24 +02:00
a12b7a5c64 [feature/ajax] Fix alt_text and overlay closing
PHPBB3-10270
2012-03-31 02:09:24 +02:00
d53c36684d [feature/ajax] JavaScript strict mode
PHPBB3-10270
2012-03-31 02:09:24 +02:00
628074bf70 [feature/ajax] Stylistic JavaScript adjustments
PHPBB3-10270
2012-03-31 02:09:24 +02:00
b100bb9a69 [feature/ajax] Replace return false with explicit preventDefault()
PHPBB3-10270
2012-03-31 02:09:23 +02:00
30888ff2a0 [feature/ajax] Use attr('data-foo') instead of data('foo')
data() is slower and does additional unwanted things like
caching and type conversion. Just reading the value is safer.

PHPBB3-10270
2012-03-31 02:09:23 +02:00
265907b115 [feature/ajax] Replace keyboard vars with a keymap
PHPBB3-10270
2012-03-31 02:09:23 +02:00
3e53dff95c [ticket/10271] Added some documentation to phpbb.ajaxify.
PHPBB3-10271
2012-03-31 02:09:23 +02:00
eee0624a69 [ticket/10271] Renamed an unhelpful variable name in core.js.
PHPBB3-10271
2012-03-31 02:09:23 +02:00
2189efadc6 [ticket/10270] Moved the AJAX error langyage entries to the footer.
PHPBB3-10270
2012-03-31 02:09:22 +02:00
f9ddeacd8e [ticket/10272] Renamed l-err-processing-req to l-timeout-processing-req.
PHPBB3-10272
2012-03-31 02:09:22 +02:00
8da463ac9e [ticket/10270] Recoded some potentially buggy code in phpbb.confirm.
The code before could have removed event handlers defined by other code.

PHPBB3-10270
2012-03-31 02:09:21 +02:00