1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

13950 Commits

Author SHA1 Message Date
Nathaniel Guse
ec9328e943 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/migrations-extensions
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
2013-02-09 19:51:18 -06:00
Igor Wiedler
fa33eae556 Merge remote-tracking branch 'exreaction/ticket/11350' into develop
* exreaction/ticket/11350:
  [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver
2013-02-07 00:56:31 +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
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
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
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
Andreas Fischer
34c564062a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11220] Improvement to the info pop-up from "list="
2013-02-03 14:51:52 +01:00
Andreas Fischer
996f1abee3 Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympus
* Crizz0/ticket/11220:
  [ticket/11220] Improvement to the info pop-up from "list="
2013-02-03 14:51:39 +01:00
Crizz0
cf3edb2c6e [ticket/11220] Improvement to the info pop-up from "list="
A improvement to the info popup which is displayed when the cursor
is over the bbcode-button [list=] in the posting-editor

PHPBB3-11220
2013-02-03 13:24:00 +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
Andreas Fischer
a0b141b673 Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympus
* dhruvgoel92/ticket/11233:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:20 +01:00
Nathaniel Guse
67c85fa4d3 Merge branch 'develop-olympus' into develop
# By Senky
# Via Nathaniel Guse (1) and Senky (1)
* develop-olympus:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition

Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
2013-01-30 16:56:16 -06:00
Nathaniel Guse
5154c6960d Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympus
# By Senky
# Via Senky
* remotes/Senky/ticket/10050:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition
2013-01-30 16:51:50 -06: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
Senky
80283646e2 [ticket/10050] removing prosilver edits
PHPBB3-10050
2013-01-24 22:54:12 +01:00
Nathaniel Guse
7338bfe3f0 [ticket/9737] Fix some comments
PHPBB3-9737
2013-01-23 09:45:20 -06:00
Senky
317964174e [ticket/10050] adding .topicrow to template condition
PHPBB3-10050
2013-01-22 20:24:27 +01:00
Nathaniel Guse
dfabdbca50 [ticket/9737] Fix a few minor things in migrations
PHPBB3-9737
2013-01-22 13:19:49 -06:00
Nathan Guse
0e414f4880 Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11329:
  [ticket/11329] Moving colors to colours.css
2013-01-22 10:39:48 -06:00
Nathan Guse
05bb1e472c Merge remote-tracking branch 'remotes/cyberalien/ticket/11328' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11328:
  [ticket/11328] Replace long buttons text with short text
  [ticket/11328] Add language variables for buttons
2013-01-22 10:36:28 -06:00
Vjacheslav Trushkin
95c9095a1c [ticket/11329] Moving colors to colours.css
Moving color values from buttons.css to colours.css

PHPBB3-11329
2013-01-21 12:34:28 +02: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
Vjacheslav Trushkin
d68c4697be [ticket/11328] Replace long buttons text with short text
Replace long buttons text with short text, like it was on images

PHPBB3-11328
2013-01-16 11:37:50 +02:00
Vjacheslav Trushkin
1d5f8a2bbf [ticket/11328] Add language variables for buttons
New language variables for buttons

PHPBB3-11328
2013-01-16 11:37:13 +02:00
David Colón
4306a7641f [ticket/10786] Javascript toggle member search panel in memberlist.php
Search functions on the memberlist.php page are now rendered by default and displayed via javascript.  If javascript is disabled the page still works as it previously did.

PHPBB3-10786
2013-01-15 23:29:06 -06:00
David Colón
babe07caef [ticket/10786] Javascript toggle member search panel in memberlist.php
Search functions on the memberlist.php page are now rendered by default and displayed via javascript.  If javascript is disabled the page still works as it previously did.

PHPBB3-10786
2013-01-15 23:29:01 -06:00
David Colón
de541ac13b [ticket/10786] Javascript toggle member search panel in memberlist.php
PHPBB3-10786
2013-01-15 23:28:45 -06: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
Nathan Guse
28e0520fe4 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
2013-01-15 22:22:06 -06:00
Nathan Guse
6b895e0a02 Merge remote-tracking branch 'remotes/cyberalien/ticket/10431' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10431:
  [ticket/10431] Remove .left class from reply-all
  [ticket/10431] Remove reply-all custom css
  [ticket/10431] Adjustments for large buttons
  [ticket/10431] Changed fonts for Linux
  [ticket/10431] Adjustments for IE7
  [ticket/10431] Different font for iOS
  [ticket/10431] CSS3 buttons
2013-01-15 19:02:04 -06:00
Nathan Guse
d59431691c Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11201:
  [ticket/11201] Remove database column on update
  [ticket/11201] Remove MSN/WLM fields
2013-01-15 18:54:11 -06:00
Joas Schilling
460470229d [ticket/11201] Remove database column on update
PHPBB3-11201
2013-01-16 01:08:34 +01:00
Vjacheslav Trushkin
107a9016f1 [ticket/10431] Remove .left class from reply-all
Remove .left class from .reply-all button

PHPBB3-10431
2013-01-16 00:09:10 +02:00
Vjacheslav Trushkin
74b09c01ff [ticket/10431] Remove reply-all custom css
Remove CSS for reply-all button that is no longer used

PHPBB3-10431
2013-01-16 00:03:17 +02:00
Vjacheslav Trushkin
63b037b4bd [ticket/10431] Adjustments for large buttons
Changing CSS for large buttons to display better on Mac browsers.
Fixing tabs.

PHPBB3-10431
2013-01-15 23:12:44 +02:00
Nathan Guse
a2f6e494f3 Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
  [ticket/11171] Moved the DB schema changes to its place
  [ticket/11171] Cleanup of leftovers
  [ticket/11171] Adapted the code in report.php
  [ticket/11171] Use the options stored to decide how to show it
  [ticket/11171] DB changes for the update
  [ticket/11171] DB additions for these changes

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-01-14 12:16:59 -06:00
Nathan Guse
ccd08e21f6 [feature/migrations] Make sure migration data not done before running data step
PHPBB3-9737
2013-01-13 13:34:16 -06:00
Nathan Guse
000b8fefd2 [feature/migrations] Function to populate the migrations table (for install)
PHPBB3-9737
2013-01-13 13:21:01 -06:00