Tristan Darricau
f8fe437f49
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12812] Remove unused global $db from tests
[ticket/12812] Improve migrator config_text tool tests
[ticket/12812] Improve migrator config_text tool tests
[ticket/12812] Add a migrator tool for config_text database changes
2014-07-08 00:55:05 +02:00
Tristan Darricau
b170c6a8db
Merge pull request #2695 from VSEphpbb/ticket/12812
...
[ticket/12812] Add a migrator tool for config_text database changes
* VSEphpbb/ticket/12812:
[ticket/12812] Remove unused global $db from tests
[ticket/12812] Improve migrator config_text tool tests
[ticket/12812] Improve migrator config_text tool tests
[ticket/12812] Add a migrator tool for config_text database changes
2014-07-08 00:52:51 +02:00
Tristan Darricau
d5f693c9fd
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12802] Properly handle connection failures in SQLite3
2014-07-07 22:10:04 +02:00
Tristan Darricau
42fde81b21
Merge pull request #2690 from Noxwizard/ticket/12802
...
[ticket/12802] Properly handle connection failures in SQLite3
* Noxwizard/ticket/12802:
[ticket/12802] Properly handle connection failures in SQLite3
2014-07-07 21:56:35 +02:00
Matt Friedman
5ef7510fb3
[ticket/12812] Remove unused global $db from tests
...
PHPBB3-12812
2014-07-07 12:50:18 -07:00
Joas Schilling
85d241218e
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12825] Better sniff for the extensions and skip the vendor/ directory
2014-07-07 21:05:27 +02:00
Joas Schilling
80f8c550f9
Merge pull request #2706 from Nicofuma/ticket/12825
...
[ticket/12825] Better sniff for the extensions and skip the vendor/ directory
* Nicofuma/ticket/12825:
[ticket/12825] Better sniff for the extensions and skip the vendor/ directory
2014-07-07 21:05:23 +02:00
Joas Schilling
5a503f0cb6
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12824] Move MCP/ACP links after navigation_append event
2014-07-07 20:46:58 +02:00
Joas Schilling
4c1a9d1e5d
Merge pull request #2705 from PayBas/ticket/12824
...
[ticket/12824] Move MCP/ACP links after navigation_append event
* PayBas/ticket/12824:
[ticket/12824] Move MCP/ACP links after navigation_append event
2014-07-07 20:46:35 +02:00
Joas Schilling
c4f5b46f4a
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12827] Reorder quick-links
2014-07-07 20:38:58 +02:00
Joas Schilling
e8e9ad1bdf
Merge pull request #2708 from PayBas/ticket/12827
...
[ticket/12827] Reorder quick-links
* PayBas/ticket/12827:
[ticket/12827] Reorder quick-links
2014-07-07 20:38:54 +02:00
Joas Schilling
212606a0bb
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12830] Remove double .postlink in colours.css
2014-07-07 20:33:45 +02:00
Joas Schilling
f340e54e0c
Merge pull request #2710 from Crizz0/ticket/12830
...
[ticket/12830] Removes double .postlink in colours.css
* Crizz0/ticket/12830:
[ticket/12830] Remove double .postlink in colours.css
2014-07-07 20:33:35 +02:00
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
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
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
Andreas Fischer
8bd4b090e1
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12823] Remove all trailing whitespace
2014-07-06 23:46:25 +02:00
Andreas Fischer
730991e785
Merge pull request #2704 from hanakin/ticket/12823
...
[ticket/12823] Remove all trailing whitespace
* hanakin/ticket/12823:
[ticket/12823] Remove all trailing whitespace
2014-07-06 23:46:24 +02:00
Tristan Darricau
a2af95cb37
[ticket/12825] Better sniff for the extensions and skip the vendor/ directory
...
PHPBB3-12825
2014-07-06 23:34:17 +02:00
Tristan Darricau
e6f4c65573
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12515] Remove check for PostgreSQL 8.3+
2014-07-06 20:15:45 +02:00
Tristan Darricau
f8eca98b3f
Merge pull request #2654 from nickvergessen/ticket/12515
...
[ticket/12515] Remove check for PostgreSQL 8.3+ in search
* nickvergessen/ticket/12515:
[ticket/12515] Remove check for PostgreSQL 8.3+
2014-07-06 20:05:38 +02:00
Joas Schilling
e3e0c79b7a
[ticket/12515] Remove check for PostgreSQL 8.3+
...
PHPBB3-12515
2014-07-06 19:31:46 +02:00
PayBas
39261907da
[ticket/12824] Move MCP/ACP links after navigation_append event
...
PHPBB3-12824
2014-07-06 18:55:01 +02:00
Tristan Darricau
4202f80891
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12810] Use correct template vars for shadow pruning settings
2014-07-06 18:17:00 +02:00
Tristan Darricau
5dd19c726e
Merge pull request #2699 from marc1706/ticket/12810
...
[ticket/12810] Use correct template vars for shadow pruning settings
* marc1706/ticket/12810:
[ticket/12810] Use correct template vars for shadow pruning settings
2014-07-06 18:16:42 +02:00
Marc Alexander
18054332e4
[ticket/12810] Use correct template vars for shadow pruning settings
...
PHPBB3-12810
2014-07-06 18:03:09 +02:00
Marc Alexander
0fc5ba0eb4
Merge branch 'develop-ascraeus' into develop
2014-07-06 17:59:37 +02:00
Marc Alexander
57567d5611
Merge remote-tracking branch 'Crizzo/ticket/12807' into develop-ascraeus
2014-07-06 17:59:05 +02:00
Matt Friedman
5527044a00
[ticket/12812] Improve migrator config_text tool tests
...
PHPBB3-12812
2014-07-06 08:13:20 -07:00
hanakin
5136be4225
[ticket/12823] Remove all trailing whitespace
...
PHPBB3-12823
2014-07-06 17:09:21 +02:00
Cesar G
d35c5d1d39
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12808] Fix small gap between username and drop-down arrow
2014-07-06 06:15:15 -07:00
Cesar G
b412339cad
Merge remote-tracking branch 'PayBas/ticket/12808' into develop-ascraeus
...
* PayBas/ticket/12808:
[ticket/12808] Fix small gap between username and drop-down arrow
2014-07-06 06:14:56 -07:00
Cesar G
1829b13e68
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12815] Remove S_REGISTERED_USER for team link
[ticket/12815] Show memberlist link for guests (if permitted)
2014-07-06 06:04:27 -07:00
Cesar G
1504ec4ba3
Merge remote-tracking branch 'PayBas/ticket/12815' into develop-ascraeus
...
* PayBas/ticket/12815:
[ticket/12815] Remove S_REGISTERED_USER for team link
[ticket/12815] Show memberlist link for guests (if permitted)
2014-07-06 06:04:08 -07:00
PayBas
21320820ce
[ticket/12815] Remove S_REGISTERED_USER for team link
...
PHPBB3-12815
2014-07-06 14:53:23 +02:00
PayBas
c190ee315e
[ticket/12815] Show memberlist link for guests (if permitted)
...
PHPBB3-12815
2014-07-06 13:40:36 +02:00
PayBas
b323a01fd3
[ticket/12813] Move inline-CSS to css file
...
PHPBB3-12813
2014-07-06 13:02:26 +02:00
PayBas
8d6d21c7de
[ticket/12813] Use -moz-only fix instead of generic padding
...
PHPBB3-12813
2014-07-06 13:01:57 +02:00
Crizzo
addcbb1585
[ticket/12807] New variables for _EXPLAIN
...
PHPBB3-12807
2014-07-06 00:28:25 +02:00
Crizzo
dbefb74abe
[ticket/12807] Adds missing language variables language/en/acp/forums.php
...
PHPBB3-12807
2014-07-05 23:57:57 +02:00
