Commit graph

13720 commits

Author SHA1 Message Date
Igor Wiedler
4f0f63ae8f [feature/dic] Make cron task attributes protected, one per line
PHPBB3-10739
2012-08-25 16:51:19 +02:00
Igor Wiedler
4feb9aa8d7 [feature/dic] Coding style: Braces
PHPBB3-10739
2012-08-25 16:43:41 +02:00
Igor Wiedler
7e44ca4d49 [feature/dic] Re-order services alphabetically
PHPBB3-10739
2012-08-25 16:39:38 +02:00
Igor Wiedler
53f518ecc7 [feature/dic] Remove duplicate event-dispatcher dependency
PHPBB3-10739
2012-07-29 17:30:06 +02:00
Igor Wiedler
ed34451d5b [feature/dic] Adjust installer script to work with partially configured container
PHPBB3-10739
2012-07-26 17:02:07 +02:00
Igor Wiedler
a9c10a480c [feature/dic] Generate full cache driver class name on fresh install
PHPBB3-10739
2012-07-26 17:02:07 +02:00
Igor Wiedler
5a548fa344 [feature/dic] Adjust cache driver class name for BC
PHPBB3-10739
2012-07-26 17:02:07 +02:00
Igor Wiedler
5cdcaaa531 [feature/dic] Rename {phpEx => php_ext} for consistency
PHPBB3-10739
2012-07-26 16:15:56 +02:00
Igor Wiedler
cec4c94f2e Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (39 commits)
  [ticket/11025] Add underline for hover to classes
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
  [ticket/11025] Replace <b> with <strong> and/or class for semantic styling
  [ticket/11025] Make last topic titles in forum list Bold
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
  [ticket/10990] Changes for develop
  [ticket/10990] Do not use comma separator when storing it as a log.
  [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
  [ticket/11008] Change onunload_functions to not use eval()
  ...
2012-07-26 16:12:21 +02:00
Igor Wiedler
8a264228d0 [feature/dic] Add trailing newline to htaccess
PHPBB3-10739
2012-07-26 15:58:26 +02:00
Igor Wiedler
0f0622f625 [feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock file
PHPBB3-10739
2012-07-26 15:58:19 +02:00
Nils Adermann
d1e5686866 Merge pull request #924 from VSEphpbb/ticket/11025
[ticket/11025] Make last topic titles in forum list Bold
2012-07-23 18:50:59 -07:00
Matt Friedman
edec4a492e [ticket/11025] Add underline for hover to classes
PHPBB3-11025
2012-07-23 18:47:23 -07:00
Matt Friedman
4ff644890a [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
PHPBB3-11025
2012-07-23 18:43:28 -07:00
Matt Friedman
8c337a260b [ticket/11025] Replace <b> with <strong> and/or class for semantic styling
PHPBB3-11025
2012-07-23 18:33:32 -07:00
Matt Friedman
eeb7b1bac3 [ticket/11025] Make last topic titles in forum list Bold
This small style tweak will make the truncated last topic titles
shown in the forum list BOLD for better visual impact.

PHPBB3-11025
2012-07-23 17:08:40 -07:00
Andreas Fischer
efbc02acf3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/install/database_update.php
2012-07-23 23:57:08 +02:00
Andreas Fischer
49a53755e6 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-07-23 23:45:17 +02:00
Andreas Fischer
ece4a2edb7 [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. 2012-07-23 23:41:58 +02:00
Andreas Fischer
9f073e4c75 [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. 2012-07-23 23:41:47 +02:00
Andreas Fischer
f6b4aec9d0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:40:09 +02:00
Andreas Fischer
60acd63c70 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:39:58 +02:00
Andreas Fischer
9279c8f5ee Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11
* naderman/ticket/10965:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:39:42 +02:00
Nils Adermann
296fadfca4 [ticket/10965] Profile data is only grabbed when show_novalue is enabled
PHPBB3-10965
2012-07-23 23:35:48 +02:00
Andreas Fischer
dad99dcd8e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:57 +02:00
Andreas Fischer
27d9e3133b Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:47 +02:00
Andreas Fischer
3c64cccecc Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11
* naderman/ticket/10965:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:36 +02:00
Nils Adermann
2f5692d4bb [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
PHPBB3-10965
2012-07-23 22:38:38 +02:00
Andreas Fischer
9480a5e512 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php
2012-07-23 15:50:54 +02:00
Andreas Fischer
7b98e75ec3 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
2012-07-23 15:48:53 +02:00
Andreas Fischer
3da72e9864 Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11
* naderman/ticket/10965:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
2012-07-23 15:48:40 +02:00
Nils Adermann
19237f5613 [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
PHPBB3-10965
2012-07-23 15:46:04 +02:00
Nils Adermann
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
Nils Adermann
147a125f69 Merge pull request #914 from EXreaction/ticket/10990
Ticket/10990
2012-07-22 16:25:17 -07:00
Nathan Guse
577dbf8951 [ticket/10990] Changes for develop
PHPBB3-10990
2012-07-22 14:48:39 -05:00
Nathan Guse
eb5e33a768 [ticket/10990] Do not use comma separator when storing it as a log.
PHPBB3-10990
2012-07-22 14:39:10 -05:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
PHPBB3-10990
2012-07-22 14:32:03 -05:00
Nils Adermann
34d5fa6995 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:56 +02:00
Nils Adermann
da8d610011 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:46 +02:00
Nils Adermann
55aaa596d7 Merge branch 'ticket/10667' into prep-release-3.0.11
* ticket/10667:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:01 +02:00
Igor Wiedler
6ed63088fe [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-22 01:45:30 +02:00
Nils Adermann
691349a502 Merge pull request #909 from igorw/ticket/10667
[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-21 16:41:20 -07:00
Igor Wiedler
50bc453aa6 [feature/dic] Load services from extensions
PHPBB3-10739
2012-07-21 21:02:55 +02:00
Igor Wiedler
967cc550ed [feature/dic] Introduce DI processors instead of abusing compiler passes
PHPBB3-10739
2012-07-21 20:42:07 +02:00
Igor Wiedler
40af25115b [feature/dic] Add dbal_ class prefix to dbal.driver.class
PHPBB3-10739
2012-07-21 20:20:31 +02:00
Igor Wiedler
28c3ac2408 [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-21 19:28:55 +02:00
Nils Adermann
cc0aa90c49 Merge remote-tracking branch 'github-igorw/ticket/11012' into develop
* github-igorw/ticket/11012:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
2012-07-21 16:39:57 +02:00
Nils Adermann
61f05e027d Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into develop
* github-nickvergessen/ticket/11002:
  [ticket/11002] Use translating option to rename the Etc/GMT options
2012-07-21 16:35:24 +02:00
Igor Wiedler
87b278bda7 [ticket/11012] Fix php_ext change in mock_extension_manager
PHPBB3-11012
2012-07-21 16:31:26 +02:00
Igor Wiedler
85bcdbad46 [ticket/11012] Normalize $phpEx member vars to $php_ext
PHPBB3-11012
2012-07-21 16:19:01 +02:00