mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
12,565 Commits 17 Branches 190 Tags
Commit Graph

12565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ff3132a9c6 [ticket/10507] develop does not have imagesets, fix lower test. 
PHPBB3-10507
 2011-12-24 21:25:18 -05:00
Andreas Fischer
0f974f9494 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
 2011-12-25 00:58:11 +01: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
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
David King
4baa2bb52c [ticket/10535] Removed email confirm field from acp_users module 
PHPBB3-10535
 2011-12-23 21:55:49 +00: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
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
Oleg Pudeyev
b8ddd32922 [ticket/7432] Explain what users are inactive in more detail. 
PHPBB3-7432
 2011-12-23 01:45:41 -05: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
8cde5d7c47 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10399] Correctly encoding template component urls (3.0)
  [ticket/10399] Correctly encoding template component urls (3.0)
 2011-12-22 15:46:09 -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
525379cf6c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
 2011-12-16 18:08:16 +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
d42d097244 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [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

Conflicts:
	phpBB/styles/prosilver/template/forumlist_body.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
 2011-12-16 17:51:48 +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
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
Andreas Fischer
93701adf02 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [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:11 +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
Andreas Fischer
c575fb33f6 Merge remote-tracking branch 'imkingdavid/ticket/10463' into develop 
* imkingdavid/ticket/10463:
  [ticket/10463] removed extra comma in malformed query in acp_styles.php
 2011-12-16 10:46:59 +01:00
David King
fd58a0ad37 [ticket/10535] Forgot a subsilver2 change. *doh* 
PHPBB3-10535
 2011-12-15 23:17:21 +00:00
David King
d73c3a297e [ticket/10535] Removed email confirm from UCP, removed unused language entries 
PHPBB3-10535
 2011-12-15 23:15:24 +00: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
David King
18aa4e4ecd [ticket/10535] Remove email confirm check on registration form 
PHPBB3-10535
 2011-12-15 15:13:11 +00: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
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
Oleg Pudeyev
6233bde5ed Merge remote-tracking branch 'imkingdavid/ticket/10524' into develop 
* imkingdavid/ticket/10524:
  [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places
 2011-12-14 20:44:00 -05:00
Nils Adermann
72eb1ad8cc Merge remote-tracking branch 'github-igorw/feature/functional-tests' into develop 
* github-igorw/feature/functional-tests:
  [feature/functional-tests] Introduce bootstrap method
  [feature/functional-tests] Make sure functional tests only install once
 2011-12-14 14:35:20 +01:00
David King
b05c325dd2 [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places 
PHPBB3-10524
 2011-12-12 20:23:20 +00: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
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