Joas Schilling
56a89fe0a2
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12782] Add doc block
[ticket/12782] Use an interface for the phpbb event_dispatcher
2014-07-07 20:23:19 +02:00
Joas Schilling
29a07404d3
Merge pull request #2672 from Nicofuma/ticket/12782
...
[ticket/12782] Use an interface for the phpbb event_dispatcher
* Nicofuma/ticket/12782:
[ticket/12782] Add doc block
[ticket/12782] Use an interface for the phpbb event_dispatcher
2014-07-07 20:23:10 +02:00
Tristan Darricau
7118f84d29
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12197] Fix several misleading FAQ entries
2014-07-07 19:13:13 +02:00
Tristan Darricau
b9750bb590
Merge pull request #2656 from nickvergessen/ticket/12197
...
[ticket/12197] Fix several misleading FAQ entries
* nickvergessen/ticket/12197:
[ticket/12197] Fix several misleading FAQ entries
2014-07-07 19:00:33 +02:00
Crizzo
22448a9c6d
[ticket/12830] Remove double .postlink in colours.css
...
PHPBB3-12830
2014-07-07 18:25:04 +02:00
PayBas
6759004642
[ticket/12827] Reorder quick-links
...
PHPBB3-12827
2014-07-07 12:05:46 +02:00
PayBas
0a286e044b
[ticket/12804] Dont use ternary form
...
PHPBB3-12804
2014-07-07 11:28:06 +02:00
PayBas
fbc07d3b14
[ticket/12804] Hide jabber for subSilver2 as well
...
PHPBB3-12804
2014-07-07 11:21:48 +02:00
Cesar G
1a6ccd0f1f
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12813] Move inline-CSS to css file
[ticket/12813] Use -moz-only fix instead of generic padding
[ticket/12813] Reorder .row pagination so it aligns better
[ticket/12813] Fix page-jump title lang and use input type=number
[ticket/12811] Responsive adjustments to margin changes
[ticket/12811] Fix padding/margin bug affecting bottom layout
2014-07-07 01:34:05 -07:00
Cesar G
3a317edc92
Merge remote-tracking branch 'VSEphpbb/ticket/12811' into develop-ascraeus
...
* VSEphpbb/ticket/12811:
[ticket/12811] Responsive adjustments to margin changes
[ticket/12811] Fix padding/margin bug affecting bottom layout
2014-07-07 01:33:34 -07:00
Cesar G
0b91c5488a
Merge remote-tracking branch 'PayBas/ticket/12813' into develop-ascraeus
...
* PayBas/ticket/12813:
[ticket/12813] Move inline-CSS to css file
[ticket/12813] Use -moz-only fix instead of generic padding
[ticket/12813] Reorder .row pagination so it aligns better
[ticket/12813] Fix page-jump title lang and use input type=number
2014-07-07 01:32:18 -07:00
PayBas
c5b4d0afb7
[ticket/12804] Hide Jabber from UCP & member search when disabled
...
PHPBB3-12804
2014-07-07 09:05:57 +02:00
Tristan Darricau
58a52fe5b9
[ticket/12775] Set dbal.conn.driver as synthetic during installation
...
PHPBB3-12775
2014-07-07 01:10:24 +02:00
Tristan Darricau
e2cbaf4f1a
[ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
...
PHPBB3-12775
2014-07-07 01:02:50 +02:00
Tristan Darricau
5b11ee8c97
[ticket/12775] Inject the connection when created in the container
...
PHPBB3-12775
2014-07-07 01:02:49 +02:00
Tristan Darricau
285656a6d4
[ticket/12775] Extract the vars later in install/install_update.php
...
PHPBB3-12775
2014-07-07 01:02:47 +02:00
Tristan Darricau
6c57fbecac
[ticket/12775] Rename config_php_handler to config_php_file container_builder
...
PHPBB3-12775
2014-07-07 01:02:46 +02:00
Tristan Darricau
8c0d179e3e
[ticket/12775] Set defined_vars as a property of config_php_file
...
PHPBB3-12775
2014-07-07 01:02:44 +02:00
Tristan Darricau
35c0b6d77a
[ticket/12775] Fix doc blocks in the container builder
...
PHPBB3-12775
2014-07-07 01:02:43 +02:00
Tristan Darricau
d226a73111
[ticket/12775] Remove useless includes of config.php
...
PHPBB3-12775
2014-07-07 01:02:42 +02:00
Tristan Darricau
ed812a9dfb
[ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
...
PHPBB3-12775
2014-07-07 01:02:40 +02:00
Tristan Darricau
98e8be966b
[ticket/12775] Fix comments
...
PHPBB3-12775
2014-07-07 01:02:39 +02:00
Tristan Darricau
15c23e60b8
[ticket/12775] Update doc blocks
...
PHPBB3-12775
2014-07-07 01:02:37 +02:00
Tristan Darricau
f2e8e928c0
[ticket/12775] Fix container_builder
...
PHPBB3-12775
2014-07-07 01:02:36 +02:00
Tristan Darricau
2db160ff87
[ticket/12775] Rename config_php to config_php_file
...
PHPBB3-12775
2014-07-07 01:02:34 +02:00
Tristan Darricau
40937e21c5
[ticket/12775] Renamed to \phpbb\di\container_builder
...
PHPBB3-12775
2014-07-07 01:02:33 +02:00
Tristan Darricau
11ff91c87d
[ticket/12775] Remove the last include of functions_container
...
PHPBB3-12775
2014-07-07 01:02:31 +02:00
Tristan Darricau
926e47e5a1
[ticket/12775] Fix unit tests
...
PHPBB3-12775
2014-07-07 01:02:30 +02:00
Tristan Darricau
afffec8184
[ticket/12775] Add tests for \phpbb\config_php
...
PHPBB3-12775
2014-07-07 01:02:29 +02:00
Tristan Darricau
1d966fbc86
[ticket/12775] Add tests for the container factory
...
PHPBB3-12775
2014-07-07 01:02:27 +02:00
Tristan Darricau
c87f44c669
[ticket/12775] Use a field instead of a local var in load_config_var()
...
PHPBB3-12775
2014-07-07 01:02:26 +02:00
Tristan Darricau
91ca12f20e
[ticket/12775] Update container and config in install/
...
PHPBB3-12775
2014-07-07 01:02:24 +02:00
Tristan Darricau
cefffe0777
[ticket/12775] Load the config file before constants.php
...
PHPBB3-12775
2014-07-07 01:02:23 +02:00
Tristan Darricau
20912d7af2
[ticket/12775] Skip the tests related to the container
...
PHPBB3-12775
2014-07-07 01:02:21 +02:00
Tristan Darricau
ef1346c931
[ticket/12775] Update phpBB/install/index.php
...
PHPBB3-12775
2014-07-07 01:02:20 +02:00
Tristan Darricau
e7804ecce4
[ticket/12775] Update phpBB/install/database_update.php
...
PHPBB3-12775
2014-07-07 01:02:19 +02:00
Tristan Darricau
f87e76b910
[ticket/12775] Update phpBB/download/file.php
...
PHPBB3-12775
2014-07-07 01:02:17 +02:00
Tristan Darricau
78648514fa
[ticket/12775] Update phpBB/bin/phpbbcli.php
...
PHPBB3-12775
2014-07-07 01:02:16 +02:00
Tristan Darricau
98890fe1a3
[ticket/12775] Fix config_php::load_config_file()
...
PHPBB3-12775
2014-07-07 01:02:14 +02:00
Tristan Darricau
4f56f9b904
[ticket/12775] Rename the variables into common.php
...
PHPBB3-12775
2014-07-07 01:02:13 +02:00
Tristan Darricau
01c25d3d6b
[ticket/12775] Use the config.php handler in \phpbb\config_php
...
PHPBB3-12775
2014-07-07 01:02:12 +02:00
Tristan Darricau
b9995405cf
[ticket/12775] Add get() and get_all() into config_php
...
PHPBB3-12775
2014-07-07 01:02:10 +02:00
Tristan Darricau
301d9ce990
[ticket/12775] Add a config.php class (and service)
...
PHPBB3-12775
2014-07-07 01:02:09 +02:00
Tristan Darricau
cbe846a64e
[ticket/12775] Don't assign $container to null
...
PHPBB3-12775
2014-07-07 01:02:07 +02:00
Tristan Darricau
86205454af
[ticket/12775] Add customs parameters
...
PHPBB3-12775
2014-07-07 01:02:06 +02:00
Tristan Darricau
cdf87e0078
[ticket/12775] Add a conter_factory class and remove functions_container
...
PHPBB3-12775
2014-07-07 01:02:04 +02:00
Andreas Fischer
a804c2b107
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12816] Fix comment about logs in user_ban function
2014-07-07 00:20:28 +02:00
Andreas Fischer
0bec9897d7
Merge pull request #2697 from n-aleha/ticket/12816
...
[ticket/12816] Fix comment about logs in user_ban function
* n-aleha/ticket/12816:
[ticket/12816] Fix comment about logs in user_ban function
2014-07-07 00:20:27 +02:00
Andreas Fischer
0dbf91cf63
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12788] Force 2.3.* on symfony dependencies
[ticket/12788] Update symfony components
2014-07-07 00:02:11 +02:00
Andreas Fischer
bd0f692bf3
Merge pull request #2679 from dhruvgoel92/ticket/12788
...
[ticket/12788] Update symfony components
* dhruvgoel92/ticket/12788:
[ticket/12788] Force 2.3.* on symfony dependencies
[ticket/12788] Update symfony components
2014-07-07 00:02:11 +02:00