1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

526 Commits

Author SHA1 Message Date
Matt Friedman
73d6855edf [ticket/10155] Make effectively installed test more specific
PHPBB3-10155
2013-03-22 11:22:25 -07:00
Matt Friedman
ac26be98c6 [ticket/10155] Use more descriptive title for migration file
PHPBB3-10155
2013-03-17 17:01:38 -07:00
Matt Friedman
56914e72b7 [ticket/10155] Use new migration file for jQuery config update 2013-03-15 09:51:34 -07:00
Matt Friedman
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
Nathaniel Guse
48bad80f4a Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop
# By OpenShift guest
# Via OpenShift guest
* remotes/Blitze/ticket/11383:
  [ticket/11383] Correctly revert modules added/removed by migrator
2013-03-09 18:33:19 -06:00
Andreas Fischer
3a4b34ca32 [ticket/10202] Add migration file for config_db_text.
PHPBB3-10202
2013-03-05 22:59:58 +01:00
Marc Alexander
e7d9cfa009 [ticket/11398] Correctly call permission_set method in permission tool
The permission_set method calls itself inside the permission tool.
Probably due to an oversight, it is called as $this->set(), which causes a
fatal error. This patch will get rid of this issue.

PHPBB3-11398
2013-03-05 01:06:22 +01:00
David King
1148f3fca5 Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386-3:
  [ticket/11386] Fix missing ;
  [ticket/11386] Send list of migrations instead of using load_migrations
2013-03-04 15:22:29 -05:00
David King
1a8f72fd65 Merge remote-tracking branch 'EXreaction/ticket/11394' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11394:
  [ticket/11394] Relax Migration Tools
2013-03-04 15:10:48 -05:00
Nathaniel Guse
2aadc5a22c [ticket/11394] Relax Migration Tools
Do not throw as many exceptions in the migration tools (when something
unexpected occurs but can be safely ignored).

PHPBB3-11394
2013-03-04 14:06:52 -06:00
David King
e652c078e6 Merge remote-tracking branch 'EXreaction/ticket/11393' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11393:
  [ticket/11393] Give more information on database updater
2013-03-04 14:51:00 -05:00
Nathaniel Guse
c1840c78c5 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3
Conflicts:
	phpBB/includes/db/migrator.php
2013-03-04 13:48:29 -06:00
Nathaniel Guse
941b7287b7 Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [feature/avatars] Use "Main" as category for avatars in root of gallery
  [feature/avatars] Remove trailing whitespace from avatar code
  [feature/avatars] Pass phpbb_user to prepare and process form functions
  [feature/avatars] Document the use of the allowed extensions array
  [feature/avatars] Use array for allowed extensions and implode if needed
  [feature/avatars] Use deprecated for compatibility function
  [feature/avatars] Correct license, copyright and package info
  [feature/avatars] Move list of supported formats to avatar driver class
  [feature/avatars] Add include of functions_display.php in BC function
  [feature/avatars] Add note about when compatibility function was added
  [feature/avatars] Add compatibility function for get_user_avatar()
  [feature/avatars] Move definition of driver_collection to avatars.yml
  [feature/avatars] Remove the obsolete request argument for avatar drivers
  [feature/avatars] Add missing @var to docblocks in avatar manager
  [feature/avatars] Remove not needed inline style
  [feature/avatars] Differentiate tests for get drivers functions
  ...
2013-03-04 13:33:42 -06:00
Nathaniel Guse
029f096411 Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/10411-2: (33 commits)
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  [ticket/10411] Add maxlength to category name input field
  [ticket/10411] Test for thrown exceptions when group does not exist
  [ticket/10411] Catch exceptions from grouppositions
  [ticket/10411] Throw exceptions instead of using trigger_error()
  [ticket/10411] Add return values to add/delete function
  [ticket/10411] Add return value to move functions
  [ticket/10411] Fix typehinting and change private to protected
  [ticket/10411] Use template loops instead of defining the html in php files
  [ticket/10411] Ensure we only get services that do exist
  [ticket/10411] Add a comment why we left join the group table
  [ticket/10411] Rename template variable CUR_ to CURRENT_
  [ticket/10411] Move globals to the top and use array for cache destroy
  [ticket/10411] Use new ajax callback name row_up/row_down
  [ticket/10411] Fix logic error when editing/creating a group
  ...
2013-03-04 13:25:53 -06:00
Nathaniel Guse
071defded6 [ticket/11386] Fix missing ;
PHPBB3-11386
2013-03-04 09:55:23 -06:00
Marc Alexander
2e2ddd7e85 [feature/avatars] Update module_auth of ucp module and fix small issues
Reduced the check effectively_installed() to just checking for the config
entry "allow_avatar_gravatar". Also added the missing update of the
module_auth of the ucp_profile avatar mode.

PHPBB3-10018
2013-03-04 10:30:49 +01:00
Nathaniel Guse
ae15fabb32 [ticket/11396] Rename insert_migration to set_migration_state
PHPBB3-11396
2013-03-03 20:59:21 -06:00
Nathaniel Guse
6cad032fbb [ticket/11393] Give more information on database updater
PHPBB3-11393
2013-03-03 20:18:05 -06:00
Nathaniel Guse
e4f7828199 [ticket/11386] Send list of migrations instead of using load_migrations
Remove dependency of extension manager for migrator.

Keeping load_migrations function for others to use if they desire
but requiring the finder be sent to it in order to use it.

PHPBB3-11386
2013-03-03 19:54:22 -06:00
Marc Alexander
c7ca4e445c [feature/avatars] Add migrations data file for avatars
The module_auth of the ucp avatar settings are used for checking if the
migration has already been installed.

PHPBB3-10018
2013-03-04 01:04:36 +01:00
OpenShift guest
eb61edf4d1 [ticket/11383] Correctly revert modules added/removed by migrator
PHPBB3-11383
2013-03-03 01:44:21 -05:00
David King
e08edd36b9 Merge remote-tracking branch 'EXreaction/ticket/11386' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386:
  [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
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
2013-03-02 17:12:43 -05:00
OpenShift guest
c73f0a7c78 [ticket/11385] Fix issue with migration module tool not getting extension module info
PHPBB3-11385
2013-03-02 15:43:42 -06:00
Nathaniel Guse
59638a6a7d Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386
Conflicts:
	phpBB/includes/extension/finder.php
2013-03-02 14:48:44 -06:00
Nathaniel Guse
a6f877c0d8 [ticket/11386] Fix circular reference error & serialize error
PHPBB3-11386
2013-03-02 14:15:59 -06:00
Nathaniel Guse
1368470f74 [ticket/11386] Forgot to get the migration classes
PHPBB3-11386
2013-03-02 11:42:30 -06:00
Nathaniel Guse
39ca212e17 [ticket/11386] Use finder to find migration files
PHPBB3-11386
2013-03-02 11:12:12 -06:00
Nathaniel Guse
e483e3f459 [ticket/11363] Fix to make get_module_infos get from all extensions
Depends on 11381

PHPBB3-11363
2013-03-01 12:05:08 -06:00
Joas Schilling
19c3917de9 [ticket/10411] Fix call to function on non-object $db->...()
PHPBB3-10411
2013-03-01 12:46:55 +01:00
Nathan Guse
247ecdf11b [ticket/11103] Fix effectively installed check
PHPBB3-11103
2013-02-28 15:06:52 -06:00
Nathan Guse
11ca2c15d6 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
2013-02-28 10:27:16 -06:00
David King
1eead4da97 Merge remote-tracking branch 'EXreaction/ticket/11363' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363:
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11363] Load module info files for extensions too
2013-02-28 11:19:30 -05:00
David King
b1735e30bd Merge remote-tracking branch 'EXreaction/ticket/11372' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11372:
  [ticket/11372] Migrator should only check if effectively installed if not
2013-02-28 11:17:23 -05:00
Nathan Guse
f665a4b5cf Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Nathaniel Guse
# Via David King (2) and Nathaniel Guse (1)
* 'develop' of github.com:phpbb/phpbb3:
  [ticket/11370] Effectively installed migrations not inserted into table
  [ticket/11369] Reverting migration throws error
2013-02-28 09:52:23 -06:00
David King
0808e08c0b Merge remote-tracking branch 'EXreaction/ticket/11370' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11370:
  [ticket/11370] Effectively installed migrations not inserted into table
2013-02-28 10:44:49 -05:00
Nathaniel Guse
c3434dec40 [ticket/11363] Fix a couple bugs and throw errors if the file not found
PHPBB3-11363
2013-02-27 14:09:27 -06:00
Nathaniel Guse
9b554fbf3c [ticket/11372] Migrator should only check if effectively installed if not
installed at all

PHPBB3-11372
2013-02-27 13:52:45 -06:00
Joas Schilling
3362baca51 [ticket/10411] Add migrations file for teampage table
PHPBB3-10411
2013-02-27 19:27:30 +01:00
Nathaniel Guse
d296e809d5 [ticket/11363] Load module info files for extensions too
Use the acp_modules::get_module_infos function instead of our own include code

PHPBB3-11363
2013-02-27 11:12:18 -06:00
Nathaniel Guse
c6aabab039 [ticket/11103] Notifications Migration file
PHPBB3-11103
2013-02-26 19:54:47 -06:00
Nathaniel Guse
51651b3d9f [ticket/11370] Effectively installed migrations not inserted into table
insert_migration() function now handles inserting/updating

Move all insert/update code to insert_migration() function to prevent this from occurring again.

PHPBB3-11370
2013-02-26 19:44:03 -06:00
Nathaniel Guse
f9cbf5b4c7 [ticket/11369] Reverting migration throws error
String is attempted to be unserialized

PHPBB3-11369
2013-02-26 19:25:51 -06:00
David King
80bd78a5e5 Merge remote-tracking branch 'EXreaction/ticket/11367' into develop
# By Nathan Guse (1) and Nathaniel Guse (1)
# Via Nathan Guse
* EXreaction/ticket/11367:
  [ticket/11367] Always freeresult
  [ticket/11367] Migrator throws error if migrations table does not exist
2013-02-26 15:46:08 -05:00
Nathan Guse
9a319fefb2 [ticket/11367] Always freeresult
PHPBB3-11367
2013-02-26 10:22:13 -06:00
Nathaniel Guse
6045aa7aa2 [ticket/11367] Migrator throws error if migrations table does not exist
Force load_migration_state to not throw errors if the table does not exist.

PHPBB3-11367
2013-02-25 19:16:29 -06:00
Nathaniel Guse
4bf64b5e38 [feature/migrations] Fully revert the removal of the user_msnm field
PHBB3-9737
2013-02-23 15:10:21 -06:00
Nathaniel Guse
213bc09743 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data
Conflicts:
	phpBB/install/database_update.php
2013-02-23 15:05:47 -06:00
Nathan Guse
f6bb14569b [feature/migrations] getLocalisedMessage function for migration exception
PHPBB3-11351
2013-02-15 22:19:24 -06:00
Nathaniel Guse
f9a1b27a99 [feature/migrations] Fix unfulfillable function
Returned unfulfillable name in the wrong place previously

PHPBB3-11351
2013-02-09 21:16:39 -06:00
Nathaniel Guse
f18b096df9 [feature/migrations] getParameters function for migration exception
PHPBB3-11351
2013-02-09 21:10:56 -06:00