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

12439 Commits

Author SHA1 Message Date
Joas Schilling
a5628cbdc8 [feature/new-tz-handling] Fix docs in phpbb_user class
PHPBB3-9558
2012-06-20 00:29:31 +02:00
Joas Schilling
c7d32a1b2d [feature/new-tz-handling] Prefix function with phpbb_
PHPBB3-9558
2012-06-19 19:26:57 +02:00
Joas Schilling
a613caab09 [feature/new-tz-handling] Trim comment length and remove leading underscores
PHPBB3-9558
2012-06-19 19:24:03 +02:00
Joas Schilling
217d9280dd [feature/new-tz-handling] Fix comment and validation in ACP board module
PHPBB3-9558
2012-06-19 19:21:59 +02:00
Joas Schilling
dcd7d96296 [feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates
PHPBB3-9558
2012-06-19 19:08:53 +02:00
Joas Schilling
7b4f9765f8 [feature/new-tz-handling] Move js functions into assets core.js
PHPBB3-9558
2012-06-19 18:57:20 +02:00
Joas Schilling
79a0390970 [feature/new-tz-handling] Fix javascript in prosilver
Use new coding guidelines, wrap code with (function($)) and use phpbb. prefix

PHPBB3-9558
2012-06-19 15:41:18 +02:00
Joas Schilling
3e3489195f [feature/new-tz-handling] Add a function to get the timestamp of a date
The function uses the given timezone and returns the correct UNIX timestamp of it.

PHPBB3-9558
2012-06-18 15:11:07 +02:00
Joas Schilling
1716e2a2a5 [feature/new-tz-handling] Update doc blocks for the three timezone functions
PHPBB3-9558
2012-06-18 15:10:59 +02:00
Joas Schilling
2c4677b79e [feature/new-tz-handling] Remove function getTimestamp() as we require php 5.3
PHPBB3-9558
2012-06-18 15:10:50 +02:00
Joas Schilling
fb77b6b70c [feature/new-tz-handling] Fix documentation in includes/datetime.php
PHPBB3-9558
2012-06-18 15:10:40 +02:00
Joas Schilling
9836efc13c [feature/new-tz-handling] Inject $user to avoid the usage of global
PHPBB3-9558
2012-06-18 15:10:33 +02:00
Joas Schilling
2a880dafdf [feature/new-tz-handling] Do not use underscore as prefix for user
PHPBB3-9558
2012-06-18 15:10:22 +02:00
Joas Schilling
c21275fa95 [feature/new-tz-handling] Use js and data attributes to create the events
PHPBB3-9558
2012-06-18 15:10:14 +02:00
Joas Schilling
8d65f1f7d2 [feature/new-tz-handling] Add doc blocks to js functions
PHPBB3-9558
2012-06-18 15:10:04 +02:00
Joas Schilling
5441ee1ee4 [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascript
PHPBB3-9558
2012-06-18 15:09:55 +02:00
Joas Schilling
5f96e5d374 [feature/new-tz-handling] Fix timezone option when editing a user in the ACP
PHPBB3-9558
2012-06-18 15:09:45 +02:00
Joas Schilling
435573a9cb [feature/new-tz-handling] Fix Timezone selection on registration page
PHPBB3-9558
2012-06-18 15:09:36 +02:00
Joas Schilling
a6bace039a [feature/new-tz-handling] Fix timezone selection in subsilver2
PHPBB3-9558
2012-06-18 15:09:25 +02:00
Joas Schilling
4fbee37752 [feature/new-tz-handling] Move timezone option into its own template file
This should make it much easier for extensions to change the handling of the timezone selection

PHPBB3-9558
2012-06-18 15:09:12 +02:00
Joas Schilling
66f7d45603 [feature/new-tz-handling] Introduce 2 step timezone selection using javascript
PHPBB3-9558
2012-06-18 15:08:57 +02:00
Joas Schilling
3c6272ff04 [feature/new-tz-handling] Remove appearances of board_dst and user_dst
PHPBB3-9558
2012-06-18 15:08:46 +02:00
Joas Schilling
963d4afc2c [feature/new-tz-handling] Replace gmmktime() and mktime() with phpbb_datetime
PHPBB3-9558
2012-06-18 15:08:36 +02:00
Joas Schilling
f9bc825264 [feature/new-tz-handling] Fix timezone validation in ACP user section
PHPBB3-9558
2012-06-18 15:08:23 +02:00
Joas Schilling
66ae9ee2ea [feature/new-tz-handling] Fix timezone selection on registration page
PHPBB3-9558
2012-06-18 15:08:14 +02:00
Joas Schilling
09499fb128 [feature/new-tz-handling] Fix handling of timezone and dst in dateformat_select
PHPBB3-9558
2012-06-18 15:07:58 +02:00
Joas Schilling
00b5e5345d [feature/new-tz-handling] Fix displaying of "All times are" string
PHPBB3-9558
2012-06-18 15:07:44 +02:00
Joas Schilling
50936cb2ef [feature/new-tz-handling] Fix selecting and validating of timezone in UCP
PHPBB3-9558
2012-06-18 15:07:12 +02:00
Joas Schilling
8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
2012-06-04 18:09:35 +02:00
Andreas Fischer
4af503e11b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
  [develop-olympus] Add changelog for 3.0.11 release.
  [develop-olympus] Bump version numbers for 3.0.11-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.11 releases.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2012-05-31 23:11:27 +02:00
Andreas Fischer
118c5d90da [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. 2012-05-31 22:07:34 +02:00
Andreas Fischer
19a47dfbbc [develop-olympus] Add changelog for 3.0.11 release. 2012-05-31 22:07:02 +02:00
Andreas Fischer
2011085c29 [develop-olympus] Bump version numbers for 3.0.11-RC1 release. 2012-05-31 22:07:02 +02:00
Andreas Fischer
d8ddda5121 [develop-olympus] Bumping version numbers to final for 3.0.11 releases. 2012-05-31 20:19:28 +02:00
Nils Adermann
b0eb7768bd Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Nils Adermann (2) and Andreas Fischer (1)
* develop-olympus:
  [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
2012-05-31 20:07:18 +02:00
Nils Adermann
791c4136f7 Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10788:
  [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
2012-05-31 20:06:29 +02:00
Andreas Fischer
d22e7ce9df [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
PHPBB3-10788
2012-05-31 19:57:13 +02:00
Nils Adermann
edefd11087 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
2012-05-31 15:50:32 +02:00
Nils Adermann
f616c4e7a0 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
2012-05-31 15:50:19 +02:00
Nils Adermann
b16f3834a3 Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.

Conflicts:
	phpBB/includes/acp/acp_styles.php
2012-05-31 15:46:23 +02:00
Nils Adermann
7eaedcc8de Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.
2012-05-31 15:43:09 +02:00
Nils Adermann
bafaf3700c Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10611] Filter out not existing database tables when making a backup.
  [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
  [ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:58 +02:00
Nils Adermann
b10757ef14 Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10611:
  [ticket/10611] Filter out not existing database tables when making a backup.
  [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
  [ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:48 +02:00
Nils Adermann
4a5004781a Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
  [ticket/10162] Add test cases for top level domain names longer than 6 chars.
2012-05-31 15:30:05 +02:00
Nils Adermann
f6f300d3f9 Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10162:
  [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
  [ticket/10162] Add test cases for top level domain names longer than 6 chars.
2012-05-31 15:29:33 +02:00
Nils Adermann
1b73f82430 Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
  [ticket/10751] Add sql_lower_text() to database abstraction layer.

Conflicts:
	phpBB/includes/db/dbal.php
2012-05-31 15:28:08 +02:00
Nils Adermann
b789758f1b Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10751:
  [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
  [ticket/10751] Add sql_lower_text() to database abstraction layer.
2012-05-31 15:27:32 +02:00
Andreas Fischer
9ab5ad2986 [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
PHPBB3-10751
2012-05-31 12:15:46 +02:00
Andreas Fischer
643a86504a [ticket/10751] Add sql_lower_text() to database abstraction layer.
On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char).
So, in order to use it on a text column, we have to convert it to an
appropriate type. We do so using the SUBSTRING function.

PHPBB3-10751
2012-05-31 12:15:46 +02:00
Andreas Fischer
7edb52b9be Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10908] Document that 0 filesize configuration means limited by PHP
  [ticket/10908] Download files only up to max_upload_filesize if limit is 0
2012-05-31 11:55:12 +02:00