Commit graph

16376 commits

Author SHA1 Message Date
Marc Alexander
c31f489cce [ticket/11314] Add missing "use strict" to timezone.js files
PHPBB3-11314
2013-01-10 11:15:19 +01:00
Marc Alexander
f7af4eb2e9 [ticket/11314] Use return variable instead of overusing the return keyword
Use a return variable and modify it to our needs.

PHPBB3-11314
2013-01-10 11:11:30 +01:00
Marc Alexander
0fc863c68a [ticket/11314] Add missing semi-colons
Omitting the semi-colon is not legal behavior for JavaScript.

PHPBB3-11314
2013-01-10 11:06:05 +01:00
Marc Alexander
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
Oleg Pudeyev
dc8d4dbf30 Merge PR #1181 branch 'marc1706/ticket/11313' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11313:
  [ticket/11313] Use correct object el instead of eel in alt_text callback
2013-01-09 20:32:48 -05:00
Nathan Guse
44c10f661e [feature/migrations] Creating revert method to attempt reverting a migration
This code is in progress

PHPBB3-9737
2013-01-09 18:59:15 -06:00
Nathan Guse
595246f9bf [feature/migrations] Some comments in db_tools
PHPBB3-9737
2013-01-09 18:55:55 -06:00
Nathan Guse
3d4c00619f [feature/migrations] Reverse data functionality
If data step fails, attempt to roll back any previous calls from the
migration that failed.

Fix some failing tests

PHPBB3-9737
2013-01-09 18:24:32 -06:00
Nathan Guse
28cd253d19 [feature/migrations] Comment
PHPBB3-9737
2013-01-09 17:22:05 -06:00
Nathan Guse
79818c2139 [feature/migrations] Stop the update process if we are approaching time limit
PHPBB3-9737
2013-01-09 17:20:12 -06:00
Nathan Guse
5f9e1f1e89 [feature/migrations] Make sure the path sent to load_migrations is a directory
Prevent a lot++ of errors

PHPBB3-9737
2013-01-09 16:56:26 -06:00
Nathan Guse
445667a62e [feature/migrations] Fix if method (and create a test for it)
PHPBB3-9737
2013-01-09 16:44:10 -06:00
Nathan Guse
f56e400cd3 [feature/migrations] Comments
PHPBB3-9737
2013-01-09 16:44:09 -06:00
Nathan Guse
edf693e3bd [feature/migrations] Store state properly and send past result to callable
Fix return on module add

PHPBB3-9737
2013-01-09 16:44:09 -06:00
Nathan Guse
e3737978f7 [feature/migrations] Fixing returns of callables and handling data state
Lots of comments and some other miscellaneous fixes.

PHPBB3-9737
2013-01-09 16:44:08 -06:00
Nathan Guse
e9bcea5d82 [feature/migrations] Restore update_helpers.php file
This should be removed by the data branch

PHPBB3-9737
2013-01-09 16:44:08 -06:00
Nathan Guse
aceadfd77b [feature/migrations] Remove migration data (separate PR)
PHPBB3-9737
2013-01-09 16:44:07 -06:00
Nathan Guse
5c91e2569c [feature/migrations] Migrations now somewhat works
PHPBB3-9737
2013-01-09 16:44:07 -06:00
David King
826607a405 [feature/migrations] Add method and property visibility, use __construct()
PHPBB3-9737
2013-01-09 16:44:06 -06:00
David King
61debcf14c [feature/migrations] Update phpbb_db_migrator class for PHP 5.3.3
PHPBB3-9737
2013-01-09 16:44:06 -06:00
David King
ced035788b [feature/migrations] Update phpbb_db_migration class for PHP 5.3.3
PHPBB3-9737
2013-01-09 16:44:05 -06:00
Nathan Guse
6c44dadecb [feature/migrations] Move migrator to service container
Version numbers

3.1 updates

Restore database_update.php file to what it was in develop

Get first forum to place global announcements in

PHPBB3-9737
2013-01-09 16:44:05 -06:00
Nils Adermann
41de95bc11 [feature/migrations] Process migration steps and move to PHP5 code 2013-01-09 16:42:48 -06:00
Nathan Guse
82efb3e446 [feature/migrations] Remove references as it is now 3.1 code
PHPBB3-9737
2013-01-09 16:42:47 -06:00
Nils Adermann
91a921a96b [feature/migrations] Change migration data processing to run step by step 2013-01-09 16:42:47 -06:00
Nathan Guse
ce021710fb [feature/migrations] Rename classes, depends on
PHPBB3-9737
2013-01-09 16:42:46 -06:00
Nils Adermann
b52a0f50ab [feature/migrations] Update 3.0.3-3.0.5 migrations to work 2013-01-09 16:42:46 -06:00
Nathaniel Guse
167faed163 [feature/migrations] Depend on part2
PHPBB3-9737
2013-01-09 16:42:45 -06:00
Nathaniel Guse
ae8edf7b0e [feature/migrations] Use $this->db
PHPBB3-9737
2013-01-09 16:42:45 -06:00
Nathaniel Guse
2a7985c26f [feature/migrations] Migrations back through 3.0.6
PHPBB3-9737
2013-01-09 16:42:44 -06:00
Nathaniel Guse
e7389e4c32 [feature/migrations] 3.0.8-rc1 migration, fix some calls
PHPBB3-9737
2013-01-09 16:42:44 -06:00
Nathaniel Guse
b999a75528 [feature/migrations] Some migrations data
PHPBB3-9737
2013-01-09 16:42:43 -06:00
Nils Adermann
b1f9ca2f65 [feature/migrations] Moved database_update info to individual migration classes 2013-01-09 16:42:43 -06:00
Nils Adermann
c802f2a66c [feature/migrations] Standard vars for migrations and run sql with feedback
PHPBB3-9737
2013-01-09 16:40:00 -06:00
Nils Adermann
8645321f40 [feature/migrations] Return schema changes in database update style array
Returning the set of schema changes allows potentially aggregating to generate
the overall install schema automatically from a set of migrations

PHPBB3-9737
2013-01-09 16:40:00 -06:00
Nils Adermann
d304b6449d [feature/migrations] Store start and end time of migrations
PHPBB3-9737
2013-01-09 16:39:59 -06:00
Nils Adermann
f817e20f28 [feature/migrations] Basic migrations with schema and data changes
The migrator takes care of applying migrations as necessary.

RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337

PHPBB3-9737
2013-01-09 16:39:59 -06:00
Marc Alexander
7402add107 [feature/avatars] Add missing @var to docblocks in avatar manager
PHPBB3-10018
2013-01-09 15:50:15 +01:00
Oleg Pudeyev
0e9b7bcae9 Merge PR #1182 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [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.
2013-01-09 01:25:54 -05:00
Oleg Pudeyev
8b4e661904 Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11301:
  [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.
2013-01-09 01:25:44 -05:00
Marc Alexander
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
Andreas Fischer
41a07eedeb [ticket/11301] Guidelines: Add spaces in front and after the / operator.
PHPBB3-11301
2013-01-08 23:20:30 +01:00
Andreas Fischer
24befac7b4 [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
PHPBB3-11301
2013-01-08 23:18:17 +01:00
Marc Alexander
7ea0376958 [feature/avatars] Remove not needed inline style
PHPBB3-10018
2013-01-08 22:47:05 +01:00
Oleg Pudeyev
b96a2fce28 Merge PR #1178 branch 'marc1706/ticket/10949' into develop
# By Marc Alexander (2) and Callum Macrae (1)
# Via Marc Alexander
* marc1706/ticket/10949:
  [ticket/10949] Remove not needed comma
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/10949] Converted AJAX coding standards to new guidelines.
2013-01-08 16:36:35 -05:00
Marc Alexander
caa3516d13 [feature/avatars] Differentiate tests for get drivers functions
Tests for get_all_drivers() and get_enabled_drivers() should be different.

PHPBB3-10018
2013-01-08 21:58:03 +01:00
Marc Alexander
cb08bf3c0c [feature/avatars] Strictly check if avatar list is empty and cache result
PHPBB3-10018
2013-01-08 21:46:43 +01:00
Marc Alexander
9e001153d6 [feature/avatars] Pass phpbb_user object to prepare_form_acp()
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.

PHPBB3-10018
2013-01-08 15:42:30 +01:00
Marc Alexander
8778c9c945 [feature/avatars] Pass phpbb_user object to get_custom_html()
Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().

PHPBB3-10018
2013-01-08 15:34:20 +01:00
Marc Alexander
023d7a972d [feature/avatars] Remove $request property and pass as argument if needed
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().

PHPBB3-10018
2013-01-07 23:02:07 +01:00