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

12523 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
326ff46ef7 [ticket/10616] Add template inheritance to exported template
Add template inheritance when exporting template.cfg

PHPBB3-10616
2012-02-03 16:19:42 +02:00
Vjacheslav Trushkin
4aef6ea979 [ticket/10616] Ignore template inheritance that points to self
Ignore template inheritance if it points to self

PHPBB3-10616
2012-02-03 16:09:48 +02:00
Vjacheslav Trushkin
d2a3496149 [ticket/10616] Add template inheritance to default styles
Adding template inheritance field to prosilver and subsilver2

PHPBB3-10616
2012-02-03 16:00:14 +02:00
Vjacheslav Trushkin
879c92e8a2 [ticket/10569] Invalid string comparison in subsilver2
Fixing invalid string comparison in ucp_main_front.html in subsilver2

PHPBB3-10569
2012-02-03 15:38:52 +02:00
Oleg Pudeyev
be74b5286c [ticket/10614] Add a script to enable, disable and view status of extensions.
PHPBB3-10614
2012-02-03 03:42:53 -05:00
Andreas Fischer
6ad87d3aaf Merge remote-tracking branch 'naderman/ticket/10477' into develop
* naderman/ticket/10477:
  [ticket/10477] Correctly document module (base)name parameter
  [ticket/10477] Document parameters to p_master#load.
  [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
2012-02-02 13:59:19 +01:00
Andreas Fischer
237ddf9d22 [ticket/10076] STARTTLS support for SMTP via smtp_class.
PHPBB3-10076
2012-01-28 22:51:35 +01:00
Andreas Fischer
ac492d8f1e [ticket/10076] Move EHLO/HELO code into its own method.
PHPBB3-10076
2012-01-28 22:51:34 +01:00
Andreas Fischer
522090ab28 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10580] Remove checking of server timezone and DST when registering
2012-01-23 20:07:03 +01:00
Andreas Fischer
2ae6b8a5ed Merge remote-tracking branch 'Dickyf/ticket/10580' into develop-olympus
* Dickyf/ticket/10580:
  [ticket/10580] Remove checking of server timezone and DST when registering
2012-01-23 20:06:44 +01:00
Richard Foote
2cf586a372 [ticket/10580] Remove checking of server timezone and DST when registering
Remove checking of server timezone and DST. It causes a problem by
selecting the wrong timezone when registering when the board_timezone is 1
hour less than the server timezone.

PHPBB3-10580
2012-01-21 15:17:31 -05:00
Vjacheslav Trushkin
c54c06e98c [ticket/10378] Missing entries from imageset to css conversion
Adding missing entries from imageset to css conversion to prosilver/theme/en/stylesheet.css

PHPBB3-10378
2012-01-20 12:41:36 +02:00
Vjacheslav Trushkin
d4c3d4b21d [ticket/10378] Imageset to css convertor typo
Imageset to css convertor typo

PHPBB3-10378
2012-01-20 12:41:00 +02:00
Vjacheslav Trushkin
7295e5824a [ticket/10380] BIDI support for imageset
BIDI support for imageset conversion script, added RTL imageset entries to prosilver and subsilver2, fixed small bug in imageset.css, changed spacing in code to match phpbb coding guidelines

PHPBB3-10380
2012-01-16 14:35:29 +02:00
Andreas Fischer
11f0984d87 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
2012-01-15 21:43:29 +01:00
Andreas Fischer
1628a28e0c Merge remote-tracking branch 'rxu/ticket/10589' into develop-olympus
* rxu/ticket/10589:
  [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
2012-01-15 21:43:15 +01:00
rxu
aa21bc2a73 [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
PHPBB3-10589
2012-01-15 18:18:04 +08:00
rxu
cb7bb31129 [ticket/10532] Adjust total match count and limit
Set a variable for the limit of total matches count.
Adjust total match count to limit to provide proper $start value calculation.
Adjust $start value if no matches were found.

PHPBB3-10532
2012-01-14 16:09:04 +08:00
rxu
c9733ad719 [ticket/10532] Fix $start out of range for pre-made searches
PHPBB3-10532
2012-01-14 15:55:23 +08:00
Nils Adermann
82c05a7ed6 [ticket/10477] Correctly document module (base)name parameter
PHPBB3-10477
2012-01-13 13:01:30 +01:00
Igor Wiedler
660cfc2d2e Merge pull request #531 from p/ticket/10579
[ticket/10579] Delete extra v2 from license block.
2012-01-12 23:01:28 -08:00
Oleg Pudeyev
c3aa466523 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9079] Always log backtrace to error log when logging errors.
  [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
2012-01-12 22:30:23 -05:00
Oleg Pudeyev
d7aa3aab5e Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympus
* bantu/ticket/9079:
  [ticket/9079] Always log backtrace to error log when logging errors.
  [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
2012-01-12 22:28:45 -05:00
Oleg Pudeyev
3f754d118d [ticket/10477] Document parameters to p_master#load.
PHPBB3-10477
2012-01-13 04:25:22 +01:00
Oleg Pudeyev
3e36ac6678 [ticket/10579] Delete extra v2 from license block.
PHPBB3-10579
2012-01-12 22:25:14 -05:00
Nils Adermann
ffde8c8e06 [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
PHPBB3-10477
2012-01-06 17:45:42 +01:00
Oleg Pudeyev
466acfdd94 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10563] Show deactivated styles below active styles in acp
2012-01-06 02:46:52 -05:00
Oleg Pudeyev
95a74c7472 Merge remote-tracking branch 'cyberalien/ticket/10563' into develop-olympus
* cyberalien/ticket/10563:
  [ticket/10563] Show deactivated styles below active styles in acp
2012-01-06 02:45:35 -05:00
Vjacheslav Trushkin
23363efaaa [ticket/10563] Show deactivated styles below active styles in acp
Separates active and deactivated styles in styles list in acp

PHPBB3-10563
2012-01-02 21:07:40 +02:00
Andreas Fischer
2f010fe96e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10407] Fix check for empty image paths in convertor
  [ticket/10407] Fix check for empty image paths in convertor
2012-01-02 19:54:46 +01:00
Andreas Fischer
3e7a0a3746 Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympus
* Dickyf/ticket/10407a:
  [ticket/10407] Fix check for empty image paths in convertor
  [ticket/10407] Fix check for empty image paths in convertor
2012-01-02 19:54:14 +01:00
Andreas Fischer
6b8d5058c0 Merge branch 'ticket/unknownbliss/9916' into develop
* ticket/unknownbliss/9916:
  [ticket/9916] Updating license in non-distributed files
  [ticket/9916] Updating header license and removing Version $Id$
2012-01-02 19:10:47 +01:00
Unknown
66c50f6b30 [ticket/9916] Updating license in non-distributed files
PHPBB3-9916
2012-01-02 19:10:36 +01:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2012-01-02 19:10:27 +01:00
Richard Foote
24cf7f1d29 [ticket/10407] Fix check for empty image paths in convertor
This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will check the path without the trailing slash to see if the path is
actually empty.

PHPBB3-10407
2012-01-02 13:09:21 -05:00
Andreas Fischer
2345be38b6 Merge branch 'prep-release-3.0.10'
* prep-release-3.0.10: (221 commits)
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
  [ticket/10531] Disallow deleting of the last style
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
  [ticket/10319] Missing hidden fields in search form
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
  [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'.
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
  [ticket/10501] Fix description of table prefixes
  [ticket/10503] Debug error "Invalid arguments" when previewing edits
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.
  [ticket/10461] Add a comment explaining the logic here.
  ...
release-3.0.10
2012-01-02 18:53:55 +01:00
Andreas Fischer
69a725198b Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop
* unknownbliss/ticket/9916:
  [ticket/9916] Updating header license and removing Version $Id$
2012-01-02 17:54:54 +01:00
Andreas Fischer
a01e916737 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
2012-01-02 17:36:21 +01:00
Andreas Fischer
fd55d64996 Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-olympus
* unknownbliss/ticket/9916-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header
2012-01-02 17:35:49 +01:00
Unknown
5e52734c24 [ticket/9916] Changing header in non-distributed files
PHPBB3-9916
2012-01-02 16:20:30 +00:00
Unknown
0fc37fb397 [ticket/9916] Changing coding guidelines license
PHPBB3-9916
2012-01-02 16:20:22 +00:00
Unknown
17991823ea [ticket/9916] Updating License in the header
PHPBB3-9916
2012-01-02 16:18:32 +00:00
Andreas Fischer
d018b0b5f1 Merge remote-tracking branch 'imkingdavid/ticket/10557' into develop
* imkingdavid/ticket/10557:
  [ticket/10557] Added IN_PHPBB check to functions_acp.php
2012-01-02 04:22:50 +01:00
Andreas Fischer
44a236991c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.

Conflicts:
	phpBB/install/database_update.php
2012-01-01 16:09:53 +01:00
Andreas Fischer
3f91405acb 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 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-01-01 16:03:06 +01:00
Andreas Fischer
e14c3f3b77 [prep-release-3.0.10] Bumping version number for 3.0.10 final. 2012-01-01 16:00:17 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Richard Foote
d5dc70cbe3 [ticket/10407] Fix check for empty image paths in convertor
This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will temporarily remove the trailing slash, then check if the path is
empty.

PHPBB3-10407
2011-12-29 16:27:48 -05:00
David King
2b88114365 [ticket/10557] Added IN_PHPBB check to functions_acp.php
PHPBB3-10557
2011-12-28 18:52:33 +00:00
Igor Wiedler
96114f7e35 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
2011-12-28 16:41:38 +01:00