mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
12,256 Commits 17 Branches 190 Tags
Commit Graph

12256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Smith
2e7d9ec805 [feature/new-tz-handling] Fixed bug with signature of user::create_datetime(). 
First argument to user::create_datetime() should be optional.

PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
74be23a098 [feature/new-tz-handling] Added a user::create_datetime() method. 
New method which handles instantiating new phpbb_datetime objects in
the context of the current user.

PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
6a783b843b [feature/new-tz-handling] Replace user::$timezone with user::$tz. 
user::$tz will store the new DateTimeZone object representing the users
timezone instead of the existing user::$timezone and user::$dst combination.

PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
9e1812a0ca [feature/new-tz-handling] Remove old user::$dst property 
PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
b2a812e36b [feature/new-tz-handling] Correct capitalisation of phpbb_datetime. 
PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
3559d20624 [feature/new-tz-handling] Update user methods to use new date processing class. 
user::setup() now stores a DateTimeZone object in user::$timezone representing
the users timezone. For backwards compatibility a numeric value in
user/board_timezone will be converted into one of the legacy Etc/GMT±X
timezones. This will be used until the user updates his/her timezone in the
UCP.

user::format_date() is now basically a legacy wrapper that transforms a UTC
UNIX timestamp into a formatted localised date using phpbb_datetime::format().

PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
a5c3ff3769 [feature/new-tz-handling] Renamed old variables and removed extra conditional. 
PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
e8b60fc3d8 [feature/new-tz-handling] Use phpbb_datetime rather than phpbb_DateTime. 
PHPBB3-9558
 2012-03-14 22:57:29 -04:00
Chris Smith
6f7d095e3f [feature/new-tz-handling] Wrapper around DateTime for new date time handling. 
Wrapped PHP's DateTime with some extensions for supporting phpBB's relative
date formats and provided the DateTime::getTimestamp() method to PHP < 5.3.

PHPBB3-9558
 2012-03-14 22:57:28 -04:00
Nils Adermann
5e225d5d7a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:21:57 +01:00
Nils Adermann
cafe74a88d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:21:30 +01:00
Nils Adermann
7f8968595b Merge remote-tracking branch 'github-bantu/ticket/10480' into prep-release-3.0.10 
* github-bantu/ticket/10480:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
 2011-12-01 22:20:48 +01:00
Nils Adermann
29723c97c6 Merge remote-tracking branch 'github-bantu/ticket/10502' into prep-release-3.0.10 
* github-bantu/ticket/10502:
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:20:11 +01:00
Andreas Fischer
af867de77c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:51 +01:00
Andreas Fischer
050fb83dfe Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:38 +01:00
Andreas Fischer
e596d2ca7e Merge remote-tracking branch 'nickvergessen/ticket/10501' into prep-release-3.0.10 
* nickvergessen/ticket/10501:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:25 +01:00
Andreas Fischer
f351914137 [ticket/10480] Add a build target for changelog building. 
PHPBB3-10480
 2011-11-29 20:05:27 +01:00
Andreas Fischer
4cf059e38f [ticket/10480] Add a build script for exporting the changelog from tracker. 
PHPBB3-10480
 2011-11-29 20:05:21 +01:00
Andreas Fischer
8f1f42cc6c [ticket/10502] Fix typo in changelog. 'red' should have been 'read'. 
PHPBB3-10502
 2011-11-29 19:59:31 +01:00
Andreas Fischer
705730bfa7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
 2011-11-28 23:12:53 +01:00
Andreas Fischer
895501743d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
 2011-11-28 23:12:44 +01:00
Andreas Fischer
593ac9ed43 [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog. 2011-11-28 23:10:01 +01:00
Joas Schilling
cb4e72298b [ticket/10501] Fix description of table prefixes 
They must start with a letter, not an alphanumeric character

PHPBB3-10501
 2011-11-28 11:28:46 +01:00
Andreas Fischer
2b3319c239 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
 2011-11-27 16:24:02 +01:00
Andreas Fischer
fc47fa06a3 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
 2011-11-27 16:23:53 +01:00
Andreas Fischer
799be4469a [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release. release-3.0.10-RC2 2011-11-27 16:23:15 +01:00
Andreas Fischer
6215740112 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:13:18 +01:00
Andreas Fischer
ede3963951 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:13:11 +01:00
Andreas Fischer
b89320ad39 Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10 
* rxu/ticket/10497:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:12:39 +01:00
rxu
77e00d14a1 [ticket/10497] Fix SQL error when guest visits forum with unread topic 
Regression from the ticket PHPBB3-9008 fix.

When topic marking was enabled for guests, and a guest visited a forum with
a new topic which is marked unread, the built SQL missed an alias for a
TOPICS_TABLE which resulted in the following error:

Unknown column 't.topic_approved' in 'where clause' [1054]

The fix is to add an alias for the table.

PHPBB3-10497
PHPBB3-9008
 2011-11-27 23:11:22 +08:00
Andreas Fischer
791464258f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

Conflicts:
	phpBB/install/database_update.php
 2011-11-26 22:26:59 +01:00
Andreas Fischer
7520b27639 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2011-11-26 22:20:32 +01:00
Andreas Fischer
007457f182 [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. 2011-11-26 22:17:43 +01:00
Andreas Fischer
c4e29bde23 Merge remote-tracking branch 'p/ticket/10481' into develop 
* p/ticket/10481:
  [ticket/10481] Use phar:// url for requiring goutte.
  [ticket/10481] Skip functional tests if phar extension is missing.
 2011-11-25 19:37:59 +01:00
Andreas Fischer
79443eb1d4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10280] Change the display of user activation settings in the ACP.
 2011-11-25 18:15:00 +01:00
Andreas Fischer
f856cc2ef6 Merge remote-tracking branch 'p/ticket/10280' into develop-olympus 
* p/ticket/10280:
  [ticket/10280] Change the display of user activation settings in the ACP.
 2011-11-25 18:13:58 +01:00
RMcGirr83
3ce5b1d386 [ticket/10280] Change the display of user activation settings in the ACP. 
Use a select box to be consistent with other settings.

PHPBB3-10280
 2011-11-25 01:27:44 -05:00
Oleg Pudeyev
7b4fd00ae5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10483] Fix test suite when running with MySQL strict mode
 2011-11-25 01:08:05 -05:00
Oleg Pudeyev
372698218a Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10483] Fix test suite when running with MySQL strict mode
 2011-11-25 01:08:01 -05:00
Oleg Pudeyev
e08e22ca12 Merge remote-tracking branch 'igorw/ticket/10483' into prep-release-3.0.10 
* igorw/ticket/10483:
  [ticket/10483] Fix test suite when running with MySQL strict mode
 2011-11-25 01:07:40 -05:00
Oleg Pudeyev
90a7f55831 Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop 
* nickvergessen/ticket/10484:
  [ticket/10484] Use variables for sql_build_query() calls

Conflicts:
	phpBB/includes/mcp/mcp_front.php
 2011-11-24 21:51:10 -05:00
Oleg Pudeyev
6b2b98d855 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
 2011-11-24 21:38:35 -05:00
Oleg Pudeyev
58e35759d9 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
 2011-11-24 21:33:44 -05:00
Oleg Pudeyev
b531e02871 Merge remote-tracking branch 'nickvergessen/ticket/10485' into prep-release-3.0.10 
* nickvergessen/ticket/10485:
  [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
 2011-11-24 21:32:50 -05:00
Oleg Pudeyev
2ddc4acd90 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10486] Create git shortlog and git diff --stat in build script.
 2011-11-24 20:14:09 -05:00
Oleg Pudeyev
a29a9266e3 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10486] Create git shortlog and git diff --stat in build script.
 2011-11-24 20:14:03 -05:00
Oleg Pudeyev
39c62cd175 Merge remote-tracking branch 'bantu/ticket/10486' into prep-release-3.0.10 
* bantu/ticket/10486:
  [ticket/10486] Create git shortlog and git diff --stat in build script.
 2011-11-24 19:58:53 -05:00
Oleg Pudeyev
ba1603a5f0 [ticket/10481] Use phar:// url for requiring goutte. 
It does not seem to work on my machine without phar:// even with
phar extension installed.

PHPBB3-10481
 2011-11-24 14:16:58 -05:00
Oleg Pudeyev
44cab5696f [ticket/10481] Skip functional tests if phar extension is missing. 
PHPBB3-10481
 2011-11-24 14:03:09 -05:00
Oleg Pudeyev
3d17816812 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
 2011-11-23 20:50:06 -05:00