Commit graph

13593 commits

Author SHA1 Message Date
Joas Schilling
5b7884907c [feature/new-tz-handling] Fix size of suggestion button in chrome
PHPBB3-9558
2012-07-19 16:13:16 +02:00
Joas Schilling
196e634370 [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
This should avoid problems, when the board files are updated but database isn't.

PHPBB3-9558
2012-07-19 15:46:12 +02:00
Joas Schilling
6de222065e [feature/new-tz-handling] Add previous selected value to validation if valid
We also add the selected timezone if we can create an object with it.
DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
because some are only kept for backward compatible reasons. If the user has
a deprecated value, we add it here, so it can still be kept. Once the user
changed his value, there is no way back to deprecated values.

PHPBB3-9558
2012-07-19 14:36:20 +02:00
Joas Schilling
d099ef8cad [feature/new-tz-handling] Display suggestion when a different value is selected
PHPBB3-9558
2012-07-19 14:24:59 +02:00
Joas Schilling
81627e2888 [feature/new-tz-handling] Remove additional marking of selected items
PHPBB3-9558
2012-07-18 18:59:25 +02:00
Joas Schilling
14a07b1193 [feature/new-tz-handling] Move update helper function to new class
PHPBB3-9558
2012-07-18 17:18:10 +02:00
Joas Schilling
f3bd113d06 [feature/new-tz-handling] Fix unit test
PHPBB3-9558
2012-07-18 17:16:34 +02:00
Joas Schilling
248a52be2a [feature/new-tz-handling] Delete old variable which is not used anymore
PHPBB3-9558
2012-07-18 16:55:14 +02:00
Joas Schilling
a71e60cdbd [feature/new-tz-handling] Rename $user->tz back to $user->timezone
PHPBB3-9558
2012-07-18 16:52:52 +02:00
Joas Schilling
515e1662a9 [feature/new-tz-handling] Remove "timezone might be numeric"
As we updated all of the used values, there really shouldn't be one anymore.

PHPBB3-9558
2012-07-18 15:01:29 +02:00
Joas Schilling
8078a04f3a [feature/new-tz-handling] Add function to update the timezone
PHPBB3-9558
2012-07-18 15:01:29 +02:00
Joas Schilling
7ce66deca8 [feature/new-tz-handling] Correctly update user and board timezones on update
PHPBB3-9558
2012-07-18 15:01:09 +02:00
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
Andreas Fischer
b176b86f11 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
2012-07-18 09:46:32 +02:00
Andreas Fischer
eeef82ecc5 Merge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympus
* Noxwizard/ticket/10996:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
2012-07-18 09:46:14 +02:00
Patrick Webster
d157c3b3f4 [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
PHPBB3-10996
2012-07-18 01:22:24 -05:00
Nils Adermann
a3757763ac Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10678] Typo and formatting
  [ticket/10678] Add port handling for MSSQL tests
  [ticket/10678] Move config changes to new location
  [ticket/10678] Rename helper class file
  [ticket/10678] Lowercase class name, adjust comment width
  [ticket/10678] More formatting and docblocks
  [ticket/10678] More formatting requests
  [ticket/10678] Fix formatting
  [ticket/10678] Add better support for Firebird, Oracle, and MSSQL
2012-07-17 21:13:05 +02:00
Nils Adermann
4a87bc2aa9 Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus
* github-noxwizard/ticket/10678:
  [ticket/10678] Typo and formatting
  [ticket/10678] Add port handling for MSSQL tests
  [ticket/10678] Move config changes to new location
  [ticket/10678] Rename helper class file
  [ticket/10678] Lowercase class name, adjust comment width
  [ticket/10678] More formatting and docblocks
  [ticket/10678] More formatting requests
  [ticket/10678] Fix formatting
  [ticket/10678] Add better support for Firebird, Oracle, and MSSQL

Conflicts:
	tests/RUNNING_TESTS.txt
2012-07-17 21:12:47 +02:00
Nils Adermann
2090ecfb8f Merge remote-tracking branch 'github-bantu/ticket/10969' into develop
* github-bantu/ticket/10969:
  [ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()
  [ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
2012-07-17 20:58:50 +02:00
Andreas Fischer
a4e699db49 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
2012-07-17 20:56:48 +02:00
Andreas Fischer
0f70c930df Merge remote-tracking branch 'bantu/ticket/10995' into develop-olympus
* bantu/ticket/10995:
  [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
2012-07-17 20:56:41 +02:00
Patrick Webster
ae07e80a65 [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
PHPBB3-10995
2012-07-17 20:53:29 +02:00
Andreas Fischer
0de3b899c7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10789] Remove unnecessary variables from PM print - prosilver
2012-07-17 20:42:30 +02:00
Andreas Fischer
3a70bc2c75 Merge remote-tracking branch 'mvinny/ticket/10789' into develop-olympus
* mvinny/ticket/10789:
  [ticket/10789] Remove unnecessary variables from PM print - prosilver
2012-07-17 20:42:17 +02:00
Nils Adermann
fb34a7aa64 Merge remote-tracking branch 'github-exreaction/ticket/7598' into develop
* github-exreaction/ticket/7598:
  [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
  [ticket/7598] Inactive users action notification (ACP)
2012-07-17 20:32:07 +02:00
Andreas Fischer
6980b3dcfd Merge remote-tracking branch 'nickvergessen/ticket/10942' into develop
* nickvergessen/ticket/10942:
  [ticket/10942] Avoid possible conflicts with magic words in unit tests
  [ticket/10942] Add access modifiers
  [ticket/10942] Use ANSI SQL standard || in dbal.php
  [ticket/10942] Fix up unit tests for sql_case()
  [ticket/10942] Require same data type and do not cast expressions automatically
  [ticket/10942] Make unit tests for sql_case simpler
  [ticket/10942] Add a comment why we cast to sql_case()
  [ticket/10942] Rename method sql_conditional() to sql_case()
  [ticket/10942] Change term string to expression to avoid confusion
  [ticket/10942] Fix sql_conditional for mssql, postgre and oracle
  [ticket/10942] Fix function name on order_lower_test.php
  [ticket/10942] Add unit tests for sql_concatenate
  [ticket/10942] Add sql_concatenate to dbal
  [ticket/10942] Add unit tests for sql_conditional
  [ticket/10942] Add sql_conditional to dbal
2012-07-17 17:59:56 +02:00
Joas Schilling
3637cd395e [feature/new-tz-handling] Properly name new timezone selection function
Marked the old one as deprecated and made it using the new function.

PHPBB3-9558
2012-07-17 16:09:05 +02:00
Joas Schilling
48d3c68290 [feature/new-tz-handling] Use tmp variable for user timezone
PHPBB3-9558
2012-07-16 18:44:13 +02:00
Joas Schilling
b61ac43abe [feature/new-tz-handling] Allow phpbb prefix for user data validation functions
PHPBB3-9558
2012-07-16 18:41:30 +02:00
Joas Schilling
f5bb145040 [feature/new-tz-handling] Require user argument on phpbb_datetime
PHPBB3-9558
2012-07-16 18:29:31 +02:00
Joas Schilling
1b826842aa [ticket/10942] Avoid possible conflicts with magic words in unit tests
PHPBB3-10942
2012-07-16 16:59:40 +02:00
Nathan
97350944e3 [ticket/7598] Use $user->lang['COMMA_SEPARATOR']
PHPBB3-7598
2012-07-14 17:40:37 -05:00
Nathan
f3e6547acf [ticket/7598] Inactive users action notification (ACP)
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed

PHPBB3-7598
2012-07-13 22:18:28 -05:00
Andreas Fischer
b45bc27339 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:58 +02:00
Andreas Fischer
8f5182bf84 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:40 +02:00
Andreas Fischer
35e18a49a9 Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11
* Noxwizard/ticket/10978:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:19 +02:00
Patrick Webster
dd6955f833 [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
PHPBB3-10978
2012-07-09 19:29:17 -05:00
Andreas Fischer
348d9b8829 Merge remote-tracking branch 'Fyorl/ticket/10941' into develop
* Fyorl/ticket/10941: (30 commits)
  [ticket/10941] Removed superfluous array
  [ticket/10941] File 'txt' now too big so changed tests to reflect that
  [ticket/10941] Added a comment to ensure tags stay uppercase
  [ticket/10941] Modified tearDown to use DirectoryIterator instead of glob
  [ticket/10941] Added tests/upload/fixture/copies to tracking
  [ticket/10941] Fixed form test test_too_large
  [ticket/10941] Replaced use of English with language system
  [ticket/10941] Renamed classes and filenames so that tests run
  [ticket/10941] Moved comment into markTestIncomplete parameter
  [ticket/10941] Removed manual includes of mock classes
  [ticket/10941] Added subdirectory for file operations
  [ticket/10941] Added some comments for clarification
  [ticket/10941] Fixed a failing test
  [ticket/10941] Rearranged tests into their own classes or methods
  [ticket/10941] Removed the incomplete mark as is_image is fixed
  [ticket/10941] Refactored tearDown to stop iterating over the directory.
  [ticket/10941] Refactored init_filespec to return new object.
  [ticket/10941] Minor typo fixes
  [ticket/10941] Changed assertTrue to assertEquals
  [ticket/10941] Now actually checks for the value of errors.
  ...
2012-07-09 15:10:36 +02:00
Fyorl
65d7aae2f3 [ticket/10941] Removed superfluous array
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
d046b25124 [ticket/10941] File 'txt' now too big so changed tests to reflect that
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
1b3589aae8 [ticket/10941] Added a comment to ensure tags stay uppercase
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
f470eee8ab [ticket/10941] Modified tearDown to use DirectoryIterator instead of glob
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
ae9b642b81 [ticket/10941] Added tests/upload/fixture/copies to tracking
PHPBB3-10941
2012-07-09 14:08:21 +01:00
Fyorl
c8059cf7e7 [ticket/10941] Fixed form test test_too_large
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
8d43a6e851 [ticket/10941] Replaced use of English with language system
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
e0b63df6a4 [ticket/10941] Renamed classes and filenames so that tests run
Also fixed some minor issues that weren't flagged before because
the tests were being ignored.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
6a1c686025 [ticket/10941] Moved comment into markTestIncomplete parameter
PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
9f3a02d475 [ticket/10941] Removed manual includes of mock classes
Also marked a test as incomplete even though this appears to be
ignored when actually running the tests.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
580cec619b [ticket/10941] Added subdirectory for file operations
Also removed common.php as it was unnecessary.

PHPBB3-10941
2012-07-09 14:08:20 +01:00
Fyorl
d89af53f63 [ticket/10941] Added some comments for clarification
PHPBB3-10941
2012-07-09 14:08:20 +01:00