mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-19 15:10:15 +01:00
Code Issues Releases Wiki Activity
10,883 Commits 18 Branches 191 Tags
Commit Graph

10883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rxu
aa21bc2a73 [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition 
PHPBB3-10589
 2012-01-15 18:18:04 +08: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
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
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
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
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
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
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
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
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
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
Andreas Fischer
ccd2ca55d4 Merge remote-tracking branch 'Dickyf/ticket/10542' into develop-olympus 
* Dickyf/ticket/10542:
  [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
 2011-12-25 00:58:03 +01:00
Richard Foote
fa003bb5fd [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html 
class="postlink" is not defined in stylesheet.css so remove it from
styles/subsilver2/template/faq_body.html

PHPBB3-10542
 2011-12-24 11:30:17 -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
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
02f7baa0a5 Merge remote-tracking branch 'p/ticket/10546' into develop-olympus 
* p/ticket/10546:
  [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
 2011-12-23 12:53:07 +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
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
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
51f8f642de 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-RC3 release.
 2011-12-16 18:08:08 +01:00
Andreas Fischer
ba576f823b [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release. release-3.0.10-RC3 2011-12-16 18:03:46 +01:00
Andreas Fischer
74c4b92760 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [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
 2011-12-16 17:45:08 +01:00
Andreas Fischer
6bfca76f1c Merge remote-tracking branch 'nickvergessen/ticket/10504' into prep-release-3.0.10 
* nickvergessen/ticket/10504:
  [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
 2011-12-16 17:44:57 +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
Andreas Fischer
f4bdfda69d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [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
 2011-12-16 15:50:04 +01:00
Andreas Fischer
1d9fb6b4ec Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into prep-release-3.0.10 
* nickvergessen/ticket/revert/8996:
  [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
 2011-12-16 15:49:30 +01:00
Joas Schilling
0cfa843677 [ticket/10531] Disallow deleting of the last style 
Regression from PHPBB3-9675 commit 0e02f5cb0b7f615f1eadd6606a89bfd1b28f0d0d

PHPBB3-9675
PHPBB3-10531
 2011-12-15 23:17:16 +01:00
Joas Schilling
2bf4e8d3d0 [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 
Revert
"[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey"

This reverts commit 219bdbaf7044bd203755ed138d109cf39ccdb837.

PHPBB3-8996
 2011-12-15 22:17:39 +01:00
Joas Schilling
730d2d5d19 [ticket/8996] Revert initial fix to keep old behaviour on empty selection 
Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc.

PHPBB3-8996
 2011-12-15 22:14:59 +01:00
Vjacheslav Trushkin
80149d0c87 [ticket/10507] DBAL unit test 
Unit test for ORDER BY LOWER(style_name)

PHPBB3-10507
 2011-12-15 16:18:52 +02: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
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
Nils Adermann
57ba746f51 Merge branch 'ticket/cyberalien/10319' into prep-release-3.0.10 
* ticket/cyberalien/10319:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:31:57 +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
Joas Schilling
8af9a0054c [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 
Revert "[ticket/6632] Better viewing of topics for wide screen displays"

This reverts commit bb733b0204aef71c40290a9c8db8ad0a7e3e3d0a.

PHPBB3-6632
PHPBB3-10504
 2011-12-08 23:14:02 +01:00
Joas Schilling
e3d81812fa [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 
Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and
MCP"

This reverts commit 88aacd0f2cffdf75af71d749c6ea602ed3912651.

PHPBB3-6632
PHPBB3-10408
PHPBB3-10504
 2011-12-08 23:07:44 +01:00
Joas Schilling
1a09f9005c [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485 
Revert "[ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632"

This reverts commit c67633577f276727e1d15106a87517b97c8a4d1a.

PHPBB3-6632
PHPBB3-10485
PHPBB3-10504
 2011-12-08 23:05:13 +01:00
Andreas Fischer
7ae12df3d2 Merge remote-tracking branch 'p/ticket/10511' into develop-olympus 
* p/ticket/10511:
  [ticket/10511] Fix a grammar defect in permissions language.
 2011-12-08 22:22:22 +01:00