Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,133 Commits 2 Branches 8 Tags
6711688b73fa28737721b9ca538f11819ca4fb19
Commit Graph

2133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Alexander
e6fd931b39 Merge branch '2.1.x' 2015-06-16 10:48:50 +02:00
Marc Alexander
8a08e80368 Merge pull request #604 from marc1706/ticket/603 
[ticket/603] Correctly exclude files from phploc report
 2015-06-16 00:12:46 +02:00
Marc Alexander
3bf91b97f1 [ticket/603] Correctly exclude files from phploc report 
B3P-603
 2015-06-16 00:12:06 +02:00
Marc Alexander
d0d69befa4 Merge pull request #602 from marc1706/ticket/601 
[ticket/601] Clone phpBB's master branch for master branch
 2015-06-15 23:55:00 +02:00
Marc Alexander
be7b9e23d3 [ticket/601] Clone phpBB's master branch for master branch 
B3P-601
 2015-06-15 23:54:03 +02:00
Marc Alexander
72f6db8577 Merge branch '2.1.x' 2015-06-15 23:17:06 +02:00
Marc Alexander
ba921a8eae Merge pull request #600 from marc1706/ticket/597 
[ticket/597] Update composer.lock [ci skip]
 2015-06-15 23:16:12 +02:00
Marc Alexander
d72f1c0788 [ticket/597] Update composer.lock [ci skip] 
B3P-597
 2015-06-15 23:15:32 +02:00
Marc Alexander
36ef4dff01 Merge pull request #598 from marc1706/ticket/597 
[ticket/597] Update composer.lock and composer.phar
 2015-06-15 00:32:17 +02:00
Marc Alexander
b8981f54fa Merge pull request #599 from marc1706/ticket/583 
[ticket/583] Correctly show clock in legacy browsers
 2015-06-15 00:19:34 +02:00
Marc Alexander
b276309c2c [ticket/597] Update composer.lock and composer.phar 
B3P-597
 2015-06-15 00:03:58 +02:00
Marc Alexander
7af7268440 [ticket/583] Correctly show clock in legacy browsers 
B3P-583
 2015-06-14 23:39:20 +02:00
Marc Alexander
6f0dcb6699 Merge pull request #596 from marc1706/ticket/592 
[ticket/592] Use proper relative path for phploc
 2015-06-14 14:14:47 +02:00
Marc Alexander
51e88a7c56 [ticket/592] Use proper relative path for phploc 
B3P-592
 2015-06-14 14:14:06 +02:00
Marc Alexander
ea053a251d Merge pull request #595 from marc1706/ticket/592 
[ticket/592] Do not run phploc on complete git repository
 2015-06-14 14:12:16 +02:00
Marc Alexander
b8cbeb5b01 [ticket/592] Do not run phploc on complete git repository 
B3P-592
 2015-06-14 14:11:39 +02:00
Marc Alexander
b734d1f3fb Merge pull request #594 from marc1706/ticket/592 
[ticket/592] Correctly check if already setup inside phpBB
 2015-06-14 12:44:02 +02:00
Marc Alexander
d6c8538c13 [ticket/592] Correctly check if already setup inside phpBB 
B3P-592
 2015-06-14 12:43:08 +02:00
Marc Alexander
c47b7f5cef Merge pull request #593 from marc1706/ticket/592 
[ticket/592] Run phploc on jenkins build
 2015-06-14 12:34:25 +02:00
Marc Alexander
7f8d8ce50a [ticket/592] Run phploc on jenkins build 
B3P-592
 2015-06-14 12:33:25 +02:00
Marc Alexander
f64825e730 Merge branch '2.1.x' 
Conflicts:
	tests/unit/functions/version_check_test.php
 2015-06-13 18:20:43 +02:00
Marc Alexander
5aef24cb98 [ticket/584] Use correct repository for checkout 
B3P-584
 2015-06-13 18:19:15 +02:00
Marc Alexander
06da0228a6 Merge pull request #591 from marc1706/ticket/584 
[ticket/584] Check for file instead of directory
 2015-06-13 18:13:08 +02:00
Marc Alexander
252a91231f [ticket/584] Check for file instead of directory 
B3P-584
 2015-06-13 17:40:31 +02:00
Marc Alexander
9d1cbc0063 Merge pull request #590 from marc1706/ticket/584 
[ticket/584] Make sure phpunit is available during build
 2015-06-13 17:36:54 +02:00
Marc Alexander
ec68169445 [ticket/584] Make sure phpunit is available during build 
B3P-584
 2015-06-13 17:18:58 +02:00
Marc Alexander
2e067f8de5 Merge pull request #589 from marc1706/ticket/588 
[ticket/588] Fix code sniffer issues in portal files [ci skip]
 2015-06-13 16:19:47 +02:00
Marc Alexander
2c633fe567 [ticket/588] Fix code sniffer issues in portal files [ci skip] 
B3P-588
 2015-06-13 16:18:21 +02:00