Commit graph

16376 commits

Author SHA1 Message Date
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
Marc Alexander
84272b1028 [feature/avatars] Move definition of driver_collection to avatars.yml
PHPBB3-10018
2013-01-15 22:13:23 +01: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
Marc Alexander
aeeb85e1cf [feature/avatars] Remove the obsolete request argument for avatar drivers
This should have been removed earlier when the phpbb_request object was
dropped from the arguments to the avatar drivers.

PHPBB3-10018
2013-01-15 22:07:01 +01:00
Nathan Guse
bd49942552 [ticket/11103] Correcting constructor comments
PHPBB3-11103
2013-01-15 12:54:39 -06:00
Nathan Guse
623b9af38b [ticket/11103] Only lookup $(target) once
PHPBB3-11103
2013-01-15 12:30:26 -06:00
Nathan Guse
f089e099fe [ticket/11103] Including the set call in the declaration throws errors
Call the set_notification_manager from the load_object function instead.

PHPBB3-11103
2013-01-15 12:29:20 -06:00
Nathan Guse
07282a30ae [ticket/11103] Fix some various issues, better comments
PHPBB3-11103
2013-01-15 12:10:07 -06:00
Nathan Guse
51e0f002ee Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (37) and others
# Via Oleg Pudeyev (24) and others
* 'develop' of github.com:phpbb/phpbb3: (179 commits)
  [ticket/11323] Add tests for inclusion of defined variables
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
  [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
  [ticket/11305] Mock container for cache driver in functional create_user()
  [ticket/11305] Check for $cache being null before using it in db drivers.
  [ticket/10805] Compare phpbbAlertTimer against null
  [ticket/11305] Define hook finder as a service on the container.
  [ticket/11305] Adjust comment.
  [ticket/11305] Use phpbb_create_default_container.
  [ticket/11305] Create a normal container during final installation step.
  [ticket/11305] Retrieve cache driver from container rather than cache service.
  ...

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
	phpBB/styles/subsilver2/template/overall_footer.html
2013-01-15 11:31:39 -06:00
Joas Schilling
46b75f4cf9 [ticket/10411] Add a comment why we left join the group table
We left join the group table because we want to check that the group
does exist there aswell.

PHPBB3-10411
2013-01-15 13:20:35 +01:00
Joas Schilling
0baa36f6ba [ticket/11166] Add caption to AJAX confirm box default template
PHPBB3-11166
2013-01-15 13:11:01 +01:00
Joas Schilling
5028fb981d [ticket/11166] Fix typo in comment
PHPBB3-11166
2013-01-15 13:10:25 +01:00
Matt Friedman
44fcec520f [ticket/11103] CSS fixes to address text inside notifications drop down.
PHPBB3-11103
2013-01-15 00:57:18 -06:00
Matt Friedman
ce1fca2332 [ticket/11103] Clean up some notifications CSS
PHPBB3-11103
2013-01-15 00:57:18 -06:00
Matt Friedman
918053e478 [ticket/11103] Fix notifications link to handle non-JS fallback
PHPBB3-11103
2013-01-15 00:57:17 -06: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
Oleg Pudeyev
62279d46a6 Merge PR #1194 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11323] Add tests for inclusion of defined variables
2013-01-13 20:13:17 -05:00
Oleg Pudeyev
227f7f46df Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11323:
  [ticket/11323] Add tests for inclusion of defined variables
2013-01-13 20:11:31 -05:00
Marc Alexander
4c50a35b62 [ticket/11323] Add tests for inclusion of defined variables
This adds 2 tests for the template engine. The test using
include_define_variable.html will test if a defined variable, which was
defined with another template variable, can be used to include a file.
The second test will do the same inside a loop using a loop variable.

PHPBB3-11323
2013-01-14 01:14:29 +01:00
Oleg Pudeyev
90235754b3 [ticket/11323] Backport include_define test to olympus.
PHPBB3-11323
2013-01-13 18:28:51 -05:00
Oleg Pudeyev
56e6d0531b Merge PR #1191 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
2013-01-13 18:14:41 -05:00
Oleg Pudeyev
0b0b5e15c3 Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11324:
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
2013-01-13 18:14:39 -05:00
Andreas Fischer
405a1a1793 Merge remote-tracking branch 'EXreaction/ticket/11320' into develop
* EXreaction/ticket/11320:
  [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
2013-01-13 23:58:29 +01:00
Andreas Fischer
4001410c8c [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
PHPBB3-11324
2013-01-13 23:41:40 +01:00
Marc Alexander
2f6b072bb1 [ticket/11314] Add missing radix parameters
PHPBB3-11314
2013-01-13 23:00:48 +01: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
Nathan Guse
26c16559c3 [feature/migrations] Function effectively_installed() in migrations
Allows you to check if the migration is effectively installed
(entirely optionall)

This function is intended to help moving to migrations from a
previous database updater, where some migrations may have been
installed already even though they are not yet listed in the
migrations table.

PHPBB3-9737
2013-01-13 12:39:08 -06:00
Nathan Guse
93f9ebbb25 [feature/migrations] Make load_migrations recursive (optionally)
PHPBB3-9737
2013-01-12 18:27:33 -06:00
Marc Alexander
49edfa49ab [ticket/11314] Fix whitespace issues
PHPBB3-11314
2013-01-12 19:08:34 +01:00
Joas Schilling
9affd6f7e7 [ticket/11201] Remove MSN/WLM fields
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.

PHPBB3-11201
2013-01-11 14:32:44 +01:00
Andreas Fischer
6702a11dcb Merge remote-tracking branch 'nickvergessen/ticket/11321' into develop
* nickvergessen/ticket/11321:
  [ticket/11321] Recreate schema files with develop/create_schema_files.php
2013-01-11 14:29:15 +01:00
Joas Schilling
032f172a07 [ticket/11321] Recreate schema files with develop/create_schema_files.php
PHPBB3-11321
2013-01-11 14:27:05 +01:00
Nathan Guse
9f38dc67a8 [feature/migrations] Make the test depends_on methods static
PHPBB3-11318
2013-01-10 22:48:31 -06:00
Nathan Guse
db4fcab3bb [feature/migrations] Make depends_on static to call it without dependencies
PHPBB3-11318
2013-01-10 22:29:49 -06:00
Nathan Guse
71e07ecc47 [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
PHPBB3-11320
2013-01-10 19:27:51 -06:00
Nathan Guse
ebfa42455a [feature/migrations] install/database_update_migrations.php
Actually, this does not belong in the main PR, moving to the data PR.

PHPBB3-9737
2013-01-10 15:17:36 -06:00
Nathan Guse
63780bda8d [feature/migrations] Move test.php -> install/database_update_migrations.php
This should be used as a basis for the database updater using migrations.

PHPBB3-9737
2013-01-10 15:14:16 -06:00
Nathan Guse
d50500860f [feature/migrations] Store depends on in the database (serialized)
This is required so that when migrations are reverted we can check through
all installed migrations and make sure that all dependencies are handled
properly and so that we are only required to load the migrations files
that could be dependent on the ones installed.

I believe in normal proper use the old way might have worked, but in case
something happens and an unrelated migration file is installed, but cannot
be loaded, this makes sure we do not stop everything unless we absolutely
must (one of those files is dependent on something we want to revert).

PHPBB3-9737
2013-01-10 15:09:51 -06:00
Nathan Guse
dbe71bb170 [feature/migrations] Revert method completed
PHPBB3-9737
2013-01-10 13:53:09 -06:00
Nathan Guse
00385aa742 [feature/migrations] Basic reverting test
PHPBB3-9737
2013-01-10 13:52:11 -06:00
Nathan Guse
ddb1eaab68 [feature/migrations] Test for calling a step multiple times
This is used when a long-running process is needed during an update. For
example, iterating over all posts and applying some transformation. This
allows the process to be broken apart into multiple shorter steps to prevent
hitting the time limit.

PHPBB3-9737
2013-01-10 12:49:13 -06:00