1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 14:46:28 +02:00
Commit Graph

5578 Commits

Author SHA1 Message Date
d4e00b6c0d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
2012-02-07 16:57:09 +01:00
rxu
f832f5a4ee [ticket/9831] Fix saving unchecked checkbox field value
PHPBB3-9831
2012-02-05 22:03:02 +08:00
42d9edc4f2 [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
PHPBB3-10495
2012-02-04 00:57:39 +01:00
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05:00
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
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
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
237ddf9d22 [ticket/10076] STARTTLS support for SMTP via smtp_class.
PHPBB3-10076
2012-01-28 22:51:35 +01:00
ac492d8f1e [ticket/10076] Move EHLO/HELO code into its own method.
PHPBB3-10076
2012-01-28 22:51:34 +01:00
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
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
rxu
99164cd20b [ticket/9831] Correctly store checkbox default value for boolean CPF.
PHPBB3-9831
2012-01-18 22:33:51 +08:00
82c05a7ed6 [ticket/10477] Correctly document module (base)name parameter
PHPBB3-10477
2012-01-13 13:01:30 +01:00
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
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
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
3f754d118d [ticket/10477] Document parameters to p_master#load.
PHPBB3-10477
2012-01-13 04:25:22 +01:00
3e36ac6678 [ticket/10579] Delete extra v2 from license block.
PHPBB3-10579
2012-01-12 22:25:14 -05:00
4c62dcd0ff [feature/event-dispatcher] Correct copyright statement for Symfony2 files
Also add a notice to the files that were taken from Symfony2.

PHPBB3-9550
2012-01-08 13:20:44 +01:00
8242296879 [feature/event-dispatcher] Fix event class name in dispatcher interface
PHPBB3-9550
2012-01-08 00:48:21 +01:00
80f6f2b96f [feature/event-dispatcher] Prefix event name with 'core.'
PHPBB3-9550
2012-01-07 21:50:16 +01:00
03be976137 [feature/event-dispatcher] Support setting data on an event
PHPBB3-9550
2012-01-07 21:42:19 +01:00
58a99c97ca [feature/event-dispatcher] Add a sample hook in page_header
PHPBB3-9550
2012-01-07 20:54:01 +01:00
581b5624f7 [feature/event-dispatcher] Allow subscribers to be loaded from extensions
PHPBB3-9550
2012-01-07 20:53:44 +01:00
80840a5f08 [feature/event-dispatcher] Introduce a port of Symfony2 EventDispatcher
PHPBB3-9550
2012-01-07 20:51:03 +01:00
ffde8c8e06 [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
PHPBB3-10477
2012-01-06 17:45:42 +01:00
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
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
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
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
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2012-01-02 19:10:27 +01:00
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
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
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
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
2b88114365 [ticket/10557] Added IN_PHPBB check to functions_acp.php
PHPBB3-10557
2011-12-28 18:52:33 +00:00
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
5cc1eb27c7 Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympus
* bantu/ticket/10538:
  [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
2011-12-28 16:40:07 +01:00
7e3724c3e1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9681] Add password length to security settings
2011-12-25 15:17:09 +01:00
a45f03a5af Merge remote-tracking branch 'p/ticket/9681' into develop-olympus
* p/ticket/9681:
  [ticket/9681] Add password length to security settings
2011-12-25 15:16:25 +01:00
71698996ca Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10428] Documentation for optionget/optionset functions.
  [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
  [ticket/10428] Dispose of $this->keyvalues cache for optionget.
  [ticket/10428] Compare $data to false strictly.
2011-12-25 15:13:02 +01:00
b0fd3b2bf0 Merge remote-tracking branch 'p/ticket/10428' into develop-olympus
* p/ticket/10428:
  [ticket/10428] Documentation for optionget/optionset functions.
  [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
  [ticket/10428] Dispose of $this->keyvalues cache for optionget.
  [ticket/10428] Compare $data to false strictly.
2011-12-25 15:12:03 +01:00
10453b6752 [ticket/10428] Documentation for optionget/optionset functions.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
99c102344e [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
PHPBB3-10428
2011-12-25 01:51:32 -05:00
16ae99eec8 [ticket/10428] Dispose of $this->keyvalues cache for optionget.
It does not work properly when custom $data is provided, and
making it work will make the code so complicated that any benefits
from having this cache in the first place will be nullified.

Just get rid of it.

PHPBB3-10428
2011-12-25 01:51:32 -05:00
38c2d4da35 [ticket/10428] Compare $data to false strictly.
Users may pass 0 or '' for $data, this should cause the
user-specified $data code path to be taken.

PHPBB3-10428
2011-12-25 01:51:20 -05:00
b6999237f4 [ticket/9079] Always log backtrace to error log when logging errors.
PHPBB3-9079
2011-12-24 01:24:09 -05:00
d9fef488af [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
PHPBB3-9079
2011-12-24 01:14:25 -05:00
48463cba2e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp

Conflicts:
	phpBB/includes/acp/acp_styles.php
2011-12-24 00:57:36 -05:00
519db8e3b2 Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympus
* cyberalien/ticket/10507:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp
2011-12-24 00:57:07 -05:00