1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 17:01:07 +02:00
Commit Graph

5305 Commits

Author SHA1 Message Date
e02d92ac62 [feature/event-dispatcher] Use real EventDispatcher through composer
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading

PHPBB3-9550
2012-03-11 15:15:33 +01:00
5dd5df46a4 [feature/event-dispatcher] Remove copied EventDispatcher code
PHPBB3-9550
2012-03-11 14:55:30 +01: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
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
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
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
7779dae2cc [ticket/9681] Add password length to security settings
PHPBB3-9681
2011-12-23 00:42:13 -05:00
fa2edf5187 [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
PHPBB3-10546
2011-12-23 00:26:26 -05:00
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
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
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
53617dfce5 [ticket/10541] Fixed empty drop-down menu bug
PHPBB3-10541
2011-12-21 03:28:00 +00:00
82fff947c6 [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
PHPBB3-10538
2011-12-19 14:24:39 +01:00
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
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
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
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
a3e8d3b00b [ticket/10463] removed extra comma in malformed query in acp_styles.php
PHPBB3-10463
2011-12-15 13:22:04 +00:00
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
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
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
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
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
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