Marc Alexander
|
b805ce2e5f
|
[ticket/634] Increase test coverage of acp module
B3P-634
|
2015-06-22 16:59:14 +02:00 |
|
Marc Alexander
|
cba13d7a7d
|
Merge pull request #633 from marc1706/ticket/632
[ticket/632] Use different test_config for 2.2.x builds [ci skip]
|
2015-06-22 12:07:22 +02:00 |
|
Marc Alexander
|
c549ea4f1d
|
[ticket/632] Use different test_config for 2.2.x builds [ci skip]
B3P-632
|
2015-06-22 11:59:12 +02:00 |
|
Marc Alexander
|
c8a36b0c36
|
Merge branch '2.1.x'
|
2015-06-22 11:23:47 +02:00 |
|
Marc Alexander
|
0ea94ae9c8
|
Merge pull request #631 from marc1706/ticket/628
[ticket/628] Properly parse build number
|
2015-06-22 10:25:51 +02:00 |
|
Marc Alexander
|
5be701a09a
|
[ticket/628] Properly parse build number
B3P-628
|
2015-06-22 10:25:21 +02:00 |
|
Marc Alexander
|
b3adcbe97d
|
Merge pull request #630 from marc1706/ticket/628
[ticket/628] Correctly pass version.override [ci skip]
|
2015-06-21 23:44:00 +02:00 |
|
Marc Alexander
|
5e7cb9b63f
|
[ticket/628] Correctly pass version.override [ci skip]
B3P-628
|
2015-06-21 23:43:12 +02:00 |
|
Marc Alexander
|
8755e12b53
|
Merge pull request #629 from marc1706/ticket/628
[ticket/628] Name portal builds based on git commit ID [ci skip]
|
2015-06-21 23:31:20 +02:00 |
|
Marc Alexander
|
863933cc56
|
[ticket/628] Name portal builds based on git commit ID [ci skip]
B3P-628
|
2015-06-21 23:30:47 +02:00 |
|
Marc Alexander
|
c3d71b992f
|
Merge branch '2.1.x'
|
2015-06-21 23:01:45 +02:00 |
|
Marc Alexander
|
1714f1fb33
|
Merge pull request #627 from marc1706/ticket/626
[ticket/626] Correctly resize portal on all pages again
|
2015-06-21 21:45:54 +02:00 |
|
Marc Alexander
|
c0841d17b3
|
[ticket/626] Correctly resize portal on all pages again
B3P-626
|
2015-06-21 21:39:00 +02:00 |
|
Marc Alexander
|
7cf857fd93
|
Merge pull request #625 from marc1706/ticket/624
[ticket/624] Display modules on all pages if column disabled in portal
|
2015-06-21 21:37:01 +02:00 |
|
Marc Alexander
|
dc5638ef55
|
[ticket/624] Display modules on all pages if column disabled in portal
B3P-624
|
2015-06-21 20:31:03 +02:00 |
|
Marc Alexander
|
1ce0d2d535
|
Merge branch '2.1.x'
|
2015-06-21 13:26:04 +02:00 |
|
Marc Alexander
|
6a5c79787d
|
Merge pull request #623 from marc1706/ticket/622
[ticket/622] Return css settings to initial prosilver values in portal_all
|
2015-06-21 12:32:57 +02:00 |
|
Marc Alexander
|
511f7571c2
|
Merge pull request #621 from marc1706/ticket/550
[ticket/550] Update module_auth upon update to 2.1.0
|
2015-06-21 12:15:51 +02:00 |
|
Marc Alexander
|
f26b019a44
|
[ticket/622] Further improve responsiveness of forumlist
B3P-622
|
2015-06-21 12:14:06 +02:00 |
|
Marc Alexander
|
d2012e1712
|
[ticket/622] Return css settings to initial prosilver values in portal_all
B3P-622
|
2015-06-21 12:06:35 +02:00 |
|
Marc Alexander
|
a9a4e9af63
|
[ticket/550] Update module_auth upon update to 2.1.0
B3P-550
|
2015-06-21 12:00:00 +02:00 |
|
Marc Alexander
|
ba64d8aef6
|
Merge branch '2.1.x'
|
2015-06-20 19:44:23 +02:00 |
|
Marc Alexander
|
fe1ebd8299
|
Merge pull request #620 from marc1706/ticket/619
[ticket/619] Fix wrong overflow in compact center blocks
|
2015-06-20 19:43:25 +02:00 |
|
Marc Alexander
|
a15acd0382
|
[ticket/619] Fix wrong overflow in compact center blocks
B3P-619
|
2015-06-20 19:42:11 +02:00 |
|
Marc Alexander
|
1007dac3cb
|
Merge branch '2.1.x'
|
2015-06-20 15:05:19 +02:00 |
|
Marc Alexander
|
64facf06d0
|
Merge pull request #618 from marc1706/ticket/552
[ticket/552] Correctly create path to module images
|
2015-06-20 15:04:39 +02:00 |
|
Marc Alexander
|
83a2d7d816
|
[ticket/552] Correctly create path to module images
B3P-552
|
2015-06-20 14:42:00 +02:00 |
|
Marc Alexander
|
c76ba45e77
|
Merge pull request #617 from marc1706/ticket/616
[ticket/616] Update composer.json and composer.lock
|
2015-06-19 14:57:54 +02:00 |
|
Marc Alexander
|
4a1c82b140
|
[ticket/616] Update composer.json and composer.lock
B3P-616
|
2015-06-19 14:29:36 +02:00 |
|
Marc Alexander
|
46d22c53ea
|
Merge pull request #615 from marc1706/ticket/614
[ticket/614] Select correct role ID for hidden forum
|
2015-06-19 14:10:14 +02:00 |
|
Marc Alexander
|
d819efc34b
|
[ticket/614] Select correct role ID for hidden forum
B3P-614
|
2015-06-19 13:50:00 +02:00 |
|
Marc Alexander
|
805147a0f6
|
Merge branch '2.1.x'
|
2015-06-19 10:56:23 +02:00 |
|
Marc Alexander
|
7647af3673
|
Merge pull request #613 from marc1706/ticket/605
[ticket/605] Fix incorrect path to config [ci skip]
|
2015-06-19 10:55:42 +02:00 |
|
Marc Alexander
|
2140e03bd9
|
[ticket/605] Fix incorrect path to config [ci skip]
B3P-605
|
2015-06-19 10:55:03 +02:00 |
|
Marc Alexander
|
7814b373b4
|
Merge branch '2.1.x'
|
2015-06-19 10:50:11 +02:00 |
|
Marc Alexander
|
4183b631f3
|
Merge pull request #612 from marc1706/ticket/611
[ticket/611] Move paypal image to styles/all folder
|
2015-06-19 10:38:43 +02:00 |
|
Marc Alexander
|
77e03d27bd
|
[ticket/611] Move paypal image to styles/all folder
B3P-611
|
2015-06-19 10:16:00 +02:00 |
|
Marc Alexander
|
01a44515ce
|
Merge branch '2.1.x'
|
2015-06-16 21:01:32 +02:00 |
|
Marc Alexander
|
4697a1fbf5
|
Merge pull request #610 from marc1706/ticket/582
[ticket/582] Increase space for last post info [ci skip]
Conflicts:
styles/prosilver/theme/portal.css
|
2015-06-16 21:01:07 +02:00 |
|
Marc Alexander
|
50dcce6c59
|
[ticket/582] Increase space for last post info [ci skip]
B3P-582
|
2015-06-16 20:58:26 +02:00 |
|
Marc Alexander
|
9fef51e3e9
|
Merge pull request #609 from marc1706/ticket/582
[ticket/582] Improve responsiveness for prosilver SE
|
2015-06-16 20:57:35 +02:00 |
|
Marc Alexander
|
add30ed905
|
[ticket/582] Increase space for last post info
B3P-582
|
2015-06-16 20:49:03 +02:00 |
|
Marc Alexander
|
a1a6220e47
|
[ticket/582] Remove redundant CSS
B3P-582
|
2015-06-16 20:34:35 +02:00 |
|
Marc Alexander
|
a140f8ecc1
|
[ticket/582] Improve responsiveness for prosilver SE
B3P-582
|
2015-06-16 20:32:58 +02:00 |
|
Marc Alexander
|
57f4a56727
|
Merge pull request #608 from marc1706/ticket/605
[ticket/605] Fix incorrect path to config [ci skip]
|
2015-06-16 17:18:03 +02:00 |
|
Marc Alexander
|
5a19a3d4db
|
[ticket/605] Fix incorrect path to config [ci skip]
B3P-605
|
2015-06-16 17:16:52 +02:00 |
|
Marc Alexander
|
735e4f5297
|
Merge pull request #607 from marc1706/ticket/605
[ticket/605] Revert changes to chmod and change copy path [ci skip]
|
2015-06-16 17:00:55 +02:00 |
|
Marc Alexander
|
47cfa00f0e
|
[ticket/605] Revert changes to chmod and change copy path [ci skip]
B3P-605
|
2015-06-16 16:59:53 +02:00 |
|
Marc Alexander
|
3821609831
|
Merge pull request #606 from marc1706/ticket/605
[ticket/605] Recursively chmod cache directory
|
2015-06-16 16:11:28 +02:00 |
|
Marc Alexander
|
2944dbf057
|
[ticket/605] Recursively chmod cache directory
B3P-605
|
2015-06-16 14:43:59 +02:00 |
|