1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

7060 Commits

Author SHA1 Message Date
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
David King
eb5075c80f Merge remote-tracking branch 'EXreaction/ticket/11395' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11395:
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
2013-03-04 14:42:12 -05: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
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
9dfc5fbf9a [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
PHPBB3-11395
2013-03-03 20:47:14 -06:00
Nathaniel Guse
6cad032fbb [ticket/11393] Give more information on database updater
PHPBB3-11393
2013-03-03 20:18:05 -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
Marc Alexander
e1bb76eb09 [feature/avatars] Reduce module auth of ucp avatar settings
Previously the avatar types that need to be enabled were hardcoded into
the module auth. This is no longer needed in the new avatar system.

PHPBB3-10018
2013-03-04 00:25:38 +01:00
Marc Alexander
d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2013-03-04 00:22:15 +01: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
David King
4670ffe90c Merge remote-tracking branch 'EXreaction/ticket/11363-2' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11363-2:
  [ticket/11363] Fix to make get_module_infos get from all extensions
2013-03-01 15:02:20 -05: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
Nathaniel Guse
e34f6a5269 [ticket/11381] Make finder able to search in all available extensions
PHPBB3-11381
2013-03-01 11:37:24 -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
ee264e7235 [ticket/11103] Don't call generate_board_url many times
Fix a URL and some comments

PHPBB3-11103
2013-02-28 17:25:39 -06:00
Nathan Guse
b41b1a36d1 [ticket/11103] Case time in queries as an int
PHPBB3-11103
2013-02-28 15:25:18 -06: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
Joas Schilling
f76f36c669 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11367] Always freeresult
  [ticket/11367] Migrator throws error if migrations table does not exist
  [feature/migrations] Inject migrator rather than the container.
  [feature/migrations] Use the user class for language handling
  [feature/migrations] Fully revert the removal of the user_msnm field
  [feature/migrations] Revert unrelated change to schema_data.sql
  [feature/migrations] Remove user_msnm migration
  [feature/migrations] Correct depends_on
  [feature/migrations] Subdirectories for migration data
  [feature/migrations] Reports table schema changes in recent develop
  [feature/migrations] Automatically populate migrations table on install
  [feature/migrations] effectively installed check for migration data
  [feature/migrations] Comments for the return in the custom functions
  [feature/migrations] Order the migrations schema in schema_data.sql
  [feature/migrations] Fix migrations installer, schema for schema_data.sql
  [feature/migrations] Make depends_on static to call it without dependencies
  [feature/migrations] Remove hardcoded language, use lang instead.
  [feature/migrations] Revert schema for migration data
  [feature/migrations] Replace database_update.php with migrations updater
  [feature/migrations] Rebuilding migrations data on develop
2013-02-27 00:12:51 +01:00
Nathaniel Guse
a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
2013-02-26 15:32:27 -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
David King
82b20cc257 Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop
# By Nathan Guse (14) and Nathaniel Guse (4)
# Via Nathaniel Guse
* EXreaction/feature/migrations-data:
  [feature/migrations] Inject migrator rather than the container.
  [feature/migrations] Use the user class for language handling
  [feature/migrations] Fully revert the removal of the user_msnm field
  [feature/migrations] Revert unrelated change to schema_data.sql
  [feature/migrations] Remove user_msnm migration
  [feature/migrations] Correct depends_on
  [feature/migrations] Subdirectories for migration data
  [feature/migrations] Reports table schema changes in recent develop
  [feature/migrations] Automatically populate migrations table on install
  [feature/migrations] effectively installed check for migration data
  [feature/migrations] Comments for the return in the custom functions
  [feature/migrations] Order the migrations schema in schema_data.sql
  [feature/migrations] Fix migrations installer, schema for schema_data.sql
  [feature/migrations] Make depends_on static to call it without dependencies
  [feature/migrations] Remove hardcoded language, use lang instead.
  [feature/migrations] Revert schema for migration data
  [feature/migrations] Replace database_update.php with migrations updater
  [feature/migrations] Rebuilding migrations data on develop
2013-02-26 14:20:12 -05:00
Nathan Guse
9a319fefb2 [ticket/11367] Always freeresult
PHPBB3-11367
2013-02-26 10:22:13 -06:00
Joas Schilling
9e70f7a4e0 [ticket/10411] Catch exceptions from grouppositions
PHPBB3-10411
2013-02-26 16:53:51 +01:00
Joas Schilling
e0df593448 [ticket/10411] Throw exceptions instead of using trigger_error()
PHPBB3-10411
2013-02-26 16:52:53 +01: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
Joas Schilling
41eea66da9 [ticket/10411] Add return values to add/delete function
PHPBB3-10411
2013-02-25 21:24:52 +01:00
Joas Schilling
8c6a1e50f5 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3: (497 commits)
  [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.
  [ticket/10896] Add missing email validation lost in develop merge
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
  [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
  [ticket/11342] Fix "unexpected token" syntax error
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/includes/functions_user.php
	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
2013-02-25 21:03:34 +01:00
Joas Schilling
1d7b082a6f [ticket/10411] Add return value to move functions
PHPBB3-10411
2013-02-25 20:58:12 +01:00
Joas Schilling
b0dc5925b9 [ticket/10411] Fix typehinting and change private to protected
PHPBB3-10411
2013-02-25 20:29:04 +01:00