1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 20:19:13 +02:00

13660 Commits

Author SHA1 Message Date
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
Vinny
5a068867ee [ticket/10998] Add border-radius to forum rules block - prosilver
PHPBB3-10998
2012-07-18 21:42:23 -03: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
Drae
584d49459d [feature/pagination-as-list] New parameter for name of start var
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.

PHPBB3-10968
2012-07-18 14:32:42 +01:00
Drae
27d8aef528 [feature/pagination-as-list] Updates for nils comments
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968
2012-07-18 14:32:18 +01:00
Drae
cf4d6e926d [feature/pagination-as-list] Rename and deprecate functions
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.

PHPBB3-10968
2012-07-18 14:31:50 +01:00
Drae
dc71c0629e [feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
2012-07-18 14:31:21 +01:00
Drae
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01: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
Fyorl
aa2f7bcc2c [ticket/10981] Added check for PHP version before running composer
PHPBB3-10981
2012-07-17 21:39:49 +01:00
Fyorl
74074994ba [ticket/10981] Modified travis to use composer with --dev
PHPBB3-10981
2012-07-17 21:39:49 +01:00
Fyorl
7a412f846a [ticket/10981] Removed setupBeforeClass
PHPBB3-10981
2012-07-17 21:39:48 +01: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
Fyorl
e71474abb5 [ticket/10944] strpos now stricter and removed superfluous ternary
PHPBB3-10944
2012-07-17 17:39:19 +01:00
Fyorl
6aea4db6c7 [ticket/10944] Reverted changes in PHPBB3-10963
is_image now just checks the mimetype reported by the browser
and get_mimetype goes back to being unused.

PHPBB3-10944
2012-07-17 17:39:00 +01: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
Andreas Fischer
cb9a25ca80 [ticket/10993] Use composer.phar from our repository in README.md
PHPBB3-10993
2012-07-17 02:28:04 +02:00
Fyorl
d88411e10d [ticket/10981] Modified functional framework to account for goutte changes
PHPBB3-10981
2012-07-16 17:52:03 +01:00
Fyorl
797ee16eaf [ticket/10981] Added goutte via composer
composer.phar added and autoloaded before tests

PHPBB3-10981
2012-07-16 17:52:03 +01: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
Fyorl
fa4eaeb306 [ticket/10992] Changed octetstream to octet-stream
PHPBB3-10992
2012-07-16 18:24:45 +02:00
Fyorl
e9a1189bfc [ticket/10992] test_empty_file() now tries to upload the correct file
PHPBB3-10992
2012-07-16 18:24:35 +02:00
Fyorl
91050356d3 [ticket/10992] Modified upload tests to work with new version
PHPBB3-10992
2012-07-16 18:24:16 +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