Commit graph

8183 commits

Author SHA1 Message Date
Marc Alexander
c56db535b4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/config/services.yml
2013-02-07 00:07:59 +01:00
Nathaniel Guse
5705c3d377 [feature/migrations] Fix path to extension migrations
PHPBB3-11318
2013-02-06 13:14:40 -06:00
Nathaniel Guse
daf243026a [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
PHPBB3-11350
2013-02-06 13:08:35 -06:00
Nathan Guse
a665ad5c2e [feature/migrations] Remove user_msnm migration
PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
e4afb68dc3 [feature/migrations] Correct depends_on
PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
58507f250b [feature/migrations] Subdirectories for migration data
Organization will set you free

PHPBB3-9737
2013-02-06 11:35:56 -06:00
Nathan Guse
747e514918 [feature/migrations] Reports table schema changes in recent develop
PHPBB3-9737
2013-02-06 11:35:55 -06:00
Nathan Guse
5e69e1a761 [feature/migrations] effectively installed check for migration data
PHPBB3-9737
2013-02-06 11:35:55 -06:00
Nathan Guse
dfcf9966e9 [feature/migrations] Comments for the return in the custom functions
PHPBB3-11318
2013-02-06 11:35:54 -06:00
Nathan Guse
8baceacc36 [feature/migrations] Fix migrations installer, schema for schema_data.sql
PHPBB3-11318
2013-02-06 11:35:53 -06:00
Nathan Guse
74f4397451 [feature/migrations] Make depends_on static to call it without dependencies
Move installing migrations to migration/install.php and handle figuring
out what migrations have been installed based on phpBB version.

PHPBB3-11318
2013-02-06 11:35:53 -06:00
Nathan Guse
ca55f6c481 [feature/migrations] Revert schema for migration data
PHPBB3-9737
2013-02-06 11:35:52 -06:00
Nathan Guse
fb4f7470d4 [feature/migrations] Rebuilding migrations data on develop
So this is easy to merge later.

PHPBB3-9737
2013-02-06 11:34:11 -06:00
Nathan Guse
aa67fa6dd8 [feature/migrations] Automatically install/revert migrations for extensions
Migrations from ext/ext_name/migrations/ are automatically installed
when enabling the extension and automatically reverted when the
extension is purged.

PHPBB3-11318
2013-02-06 11:31:50 -06:00
Nathan Guse
8d3a82a4fa [feature/migrations] Make the container available to extension installers
This allows extensions to load and install migrations easily as per their
needs.

PHPBB3-11318
2013-02-06 11:31:49 -06:00
David King
effaef6bdd Merge remote-tracking branch 'EXreaction/feature/migrations' into develop
* EXreaction/feature/migrations: (48 commits)
  [feature/migrations] Remove default values from necessary parameters
  [feature/migrations] Revert unrelated changes to functions.php
  [ticket/9737] Fix some comments
  [ticket/9737] Fix a few minor things in migrations
  [feature/migrations] Make sure migration data not done before running data step
  [feature/migrations] Function to populate the migrations table (for install)
  [feature/migrations] Function effectively_installed() in migrations
  [feature/migrations] Make load_migrations recursive (optionally)
  [feature/migrations] Make the test depends_on methods static
  [feature/migrations] Make depends_on static to call it without dependencies
  [feature/migrations] install/database_update_migrations.php
  [feature/migrations] Move test.php -> install/database_update_migrations.php
  [feature/migrations] Store depends on in the database (serialized)
  [feature/migrations] Revert method completed
  [feature/migrations] Basic reverting test
  [feature/migrations] Test for calling a step multiple times
  [feature/migrations] Creating revert method to attempt reverting a migration
  [feature/migrations] Some comments in db_tools
  [feature/migrations] Reverse data functionality
  [feature/migrations] Comment
  ...

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
2013-02-06 12:25:13 -05:00
David Tobin
293b65e3ef [ticket/10896] Adds email validation to email settings in ACP
Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.

PHPBB3-10896
2013-02-04 23:10:10 -06:00
Nathaniel Guse
77df9109b6 [feature/migrations] Remove default values from necessary parameters
Clean up some comments

PHPBB3-9737
2013-02-04 13:46:23 -06:00
Andreas Fischer
336187151a [ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d
 - 9affd6f7e7
which have been merged by d59431691c.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
Marc Alexander
11aff559d4 [feature/avatars] Use deprecated for compatibility function
Also moved use of global variables inside the only if statement they are
used in.

PHPBB3-10018
2013-02-03 23:06:30 +01:00
Marc Alexander
f322f4eac9 [feature/avatars] Correct license, copyright and package info
PHPBB3-10018
2013-02-03 23:02:35 +01:00
Andreas Fischer
01045a6bb0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:39 +01:00
Nathaniel Guse
75244eafd9 [feature/migrations] Revert unrelated changes to functions.php
PHPBB3-9737
2013-01-30 16:20:50 -06:00
Dhruv
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
2013-01-30 21:46:15 +05:30
Oleg Pudeyev
2df2f27b96 Merge PR #1219 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
2013-01-27 17:46:11 -05:00
Andreas Fischer
5a146df07f [ticket/11343] Remove spare parentheses.
PHPBB3-11343
2013-01-25 19:52:02 +01:00
Andreas Fischer
8421aa0b0e [ticket/11343] Remove spare space.
PHPBB3-11343
2013-01-25 19:51:17 +01:00
Andreas Fischer
305b2b8f48 [ticket/11343] Use === when checking stored user_actkey against user input.
Use strict comparison when checking whether stored user_actkey is equal to user
input.

PHPBB3-11343
2013-01-25 19:49:02 +01:00
Marc Alexander
9c3538eb0e [feature/avatars] Move list of supported formats to avatar driver class
Using the regex and turning it into an array if necessary seemed like the
cleanest approach to achieve this.

PHPBB3-10018
2013-01-25 01:24:15 +01:00
Marc Alexander
869de98f52 [feature/avatars] Add include of functions_display.php in BC function
The needed function phpbb_get_avatar() is defined in
includes/functions_display.php. Include that file in the backwards
compatible function get_user_avatar().

PHPBB3-10018
2013-01-24 00:23:45 +01:00
Nathaniel Guse
7338bfe3f0 [ticket/9737] Fix some comments
PHPBB3-9737
2013-01-23 09:45:20 -06:00
Joas Schilling
447e845274 [ticket/10714] Remove fallback code from previous commits and move global
PHPBB3-10714
2013-01-23 00:21:01 +01:00
Joas Schilling
e8fd8b9a4b [ticket/10714] Fix missing parameter and global phpbb_log in unit tests
PHPBB3-10714
2013-01-22 22:40:53 +01:00
Marc Alexander
e841453d03 [feature/avatars] Add note about when compatibility function was added
PHPBB3-10018
2013-01-22 21:05:31 +01:00
Nathaniel Guse
dfabdbca50 [ticket/9737] Fix a few minor things in migrations
PHPBB3-9737
2013-01-22 13:19:49 -06:00
Joas Schilling
d2e395b41f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11329] Moving colors to colours.css
  [ticket/9492] Fix missing phpbb_container in unit tests
  [ticket/9492] Fix typo in SQL query
  [ticket/9492] Ensure to delete the avatar/rank data when we change it
  [ticket/9492] Ensure to update all avatar values when the avatar is changed
  [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
  [ticket/9492] Add unit tests for custom ranks and avatars
  [ticket/9492] Retain custom ranks and avatars when setting users default group
  [ticket/11328] Replace long buttons text with short text
  [ticket/11328] Add language variables for buttons
2013-01-22 18:41:55 +01:00
Marc Alexander
79356f5441 [feature/avatars] Add compatibility function for get_user_avatar()
PHPBB3-10018
2013-01-22 17:21:49 +01:00
Joas Schilling
d5d282005c [ticket/10714] Add getter for is_in_admin and use it
PHPBB3-10714
2013-01-22 16:47:05 +01:00
Joas Schilling
c2504e9300 [ticket/10714] Fix more comments
PHPBB3-10714
2013-01-22 15:56:34 +01:00
Joas Schilling
ffde887aad [ticket/10714] Cast values to integer before using them in the query
PHPBB3-10714
2013-01-22 15:46:48 +01:00
Joas Schilling
c0ab3f3ddd [ticket/10714] Fix several doc blocks and comments
PHPBB3-10714
2013-01-22 15:45:20 +01:00
Joas Schilling
6a972da4c7 [ticket/9492] Fix typo in SQL query
PHPBB3-9492
2013-01-20 20:58:46 +01:00
Joas Schilling
9a6219d8b3 [ticket/9492] Ensure to delete the avatar/rank data when we change it
PHPBB3-9492
2013-01-17 14:45:40 +01:00
Joas Schilling
bd87b06858 [ticket/9492] Ensure to update all avatar values when the avatar is changed
PHPBB3-9492
2013-01-17 14:43:00 +01:00
Joas Schilling
64c27013d4 [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
PHPBB3-9492
2013-01-17 14:40:58 +01:00
Joas Schilling
3122aeff26 [ticket/9492] Retain custom ranks and avatars when setting users default group
PHPBB3-9492
2013-01-17 14:32:15 +01:00
Joas Schilling
786e2438d5 [ticket/10714] Use new core.adm_relative_path to create the object.
PHPBB3-10714
2013-01-16 16:23:41 +01:00
Joas Schilling
19b6ea8cf7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (205 commits)
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/11201] Remove database column on update
  [ticket/10431] Remove .left class from reply-all
  [ticket/10431] Remove reply-all custom css
  [ticket/10431] Adjustments for large buttons
  [ticket/11323] Add tests for inclusion of defined variables
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
  [ticket/11201] Remove MSN/WLM fields
  [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
  ...
2013-01-16 16:15:31 +01:00
Joas Schilling
37014abd02 [ticket/10714] Fix several comments and variable names
PHPBB3-10714
2013-01-16 14:18:09 +01:00
Nathan Guse
e9a3f09074 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympus
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
2013-01-15 22:24:58 -06:00