makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
12397 commits 18 branches 192 tags 206 MiB
Commit graph

5304 commits

Author SHA1 Message Date
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
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
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
3e36ac6678 [ticket/10579] Delete extra v2 from license block. 
PHPBB3-10579
 2012-01-12 22:25:14 -05: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
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
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
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
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
Igor Wiedler
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Oleg Pudeyev
10453b6752 [ticket/10428] Documentation for optionget/optionset functions. 
PHPBB3-10428
 2011-12-25 01:51:32 -05:00
Oleg Pudeyev
99c102344e [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. 
PHPBB3-10428
 2011-12-25 01:51:32 -05:00
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
b6999237f4 [ticket/9079] Always log backtrace to error log when logging errors. 
PHPBB3-9079
 2011-12-24 01:24:09 -05:00
Andreas Fischer
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Andreas Fischer
31ddac6091 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
 2011-12-23 12:53:34 +01:00
Igor Wiedler
7779dae2cc [ticket/9681] Add password length to security settings 
PHPBB3-9681
 2011-12-23 00:42:13 -05:00
Oleg Pudeyev
fa2edf5187 [ticket/10546] Add missing argument to adm_back_link in acp_captcha. 
PHPBB3-10546
 2011-12-23 00:26:26 -05:00
Oleg Pudeyev
3412a6d676 Merge remote-tracking branch 'imkingdavid/ticket/10541' into develop 
* imkingdavid/ticket/10541:
  [ticket/10541] Fixed empty drop-down menu bug
 2011-12-22 19:59:39 -05:00
Oleg Pudeyev
c8df8e4b8c Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into develop 
* cyberalien/ticket/develop/10399:
  [ticket/10399] Correctly encoding template component urls (3.1)
 2011-12-22 15:46:17 -05:00
Oleg Pudeyev
37fa5e56f3 Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympus 
* cyberalien/ticket/10399:
  [ticket/10399] Correctly encoding template component urls (3.0)
  [ticket/10399] Correctly encoding template component urls (3.0)
 2011-12-22 15:45:48 -05:00
David King
53617dfce5 [ticket/10541] Fixed empty drop-down menu bug 
PHPBB3-10541
 2011-12-21 03:28:00 +00:00
Andreas Fischer
82fff947c6 [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords. 
PHPBB3-10538
 2011-12-19 14:24:39 +01:00
Andreas Fischer
124ff6c50a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10531] Disallow deleting of the last style

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2011-12-16 16:19:22 +01:00
Andreas Fischer
8f690d3475 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10531] Disallow deleting of the last style
 2011-12-16 16:17:40 +01:00
Andreas Fischer
56c3a66c28 Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3.0.10 
* nickvergessen/ticket/10531:
  [ticket/10531] Disallow deleting of the last style
 2011-12-16 16:03:20 +01:00
Joas Schilling
0cfa843677 [ticket/10531] Disallow deleting of the last style 
Regression from PHPBB3-9675 commit 0e02f5cb0b

PHPBB3-9675
PHPBB3-10531
 2011-12-15 23:17:16 +01:00
David King
a3e8d3b00b [ticket/10463] removed extra comma in malformed query in acp_styles.php 
PHPBB3-10463
 2011-12-15 13:22:04 +00:00
Vjacheslav Trushkin
cd4958f72c [ticket/10507] Sort styles in acp 
Sort styles by name in admin control panel

PHPBB3-10507
 2011-12-15 14:44:09 +02:00
Nils Adermann
94d954281e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:32:29 +01:00
Nils Adermann
2c7495e1c7 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:32:21 +01:00
Vjacheslav Trushkin
dfb7cc625a [ticket/10319] Missing hidden fields in search form 
Missing hidden fields in search form (bug added in 3.0.9)

PHPBB3-10319
 2011-12-09 01:31:41 +01:00
Oleg Pudeyev
0c0befe2f8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
 2011-12-03 22:25:32 -05:00
Oleg Pudeyev
bf6d501ab1 Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus 
* Noxwizard/ticket/10349:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
 2011-12-03 22:07:34 -05:00
Andreas Fischer
69cbb4ac1d [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. 2011-12-04 00:22:10 +01:00