Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,891 Commits 2 Branches 8 Tags
f64825e730f554fad6cb498ef318e832b1b88c5a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Alexander adfdc0c817 Merge pull request #587 from marc1706/ticket/584 
[ticket/584] Allow building with test environment on Jenkins
 2015-06-13 15:35:15 +02:00
Marc Alexander 5e6c7ac4b6 [ticket/584] Properly set up whitelist filtering in phunit.xml.dist 
B3P-584
 2015-06-13 12:31:26 +02:00
Marc Alexander 81d08cbef1 [ticket/584] Create phpBB setup 
B3P-584
 2015-06-13 11:57:04 +02:00
Marc Alexander 053a31fef5 Merge pull request #586 from marc1706/ticket/585 
[ticket/585] Use up-to-date images in README.md
 2015-06-11 15:36:19 +02:00
Marc Alexander 4df5702eff [ticket/585] Use up-to-date images in README.md 
B3P-585
 2015-06-11 15:08:35 +02:00
Marc Alexander 2afa1c14c9 Merge pull request #580 from marc1706/ticket/577 
[ticket/577] Use phpBB's extension version check instead of B3P version
 2015-06-07 00:05:01 +02:00
Marc Alexander 2b05a550c5 [ticket/577] Fix tests 
B3P-577
 2015-06-06 23:46:05 +02:00
Marc Alexander a927aae498 [ticket/577] Use phpBB's extension version check instead of B3P version 
B3P-577
 2015-06-06 23:38:17 +02:00
Marc Alexander 426af6f844 Merge pull request #579 from marc1706/ticket/578 
[ticket/578] Correctly assign classes to elements upon deleting/moving modules
 2015-06-06 23:03:20 +02:00
Marc Alexander 24c7950dcb [ticket/578] Correctly align right and left columns 
This also fixes responsiveness in RTL languages.

B3P-578
 2015-06-06 22:44:47 +02:00
Marc Alexander b143c5f525 [ticket/578] Correctly align left column no matter what column enabled 
B3P-578
 2015-06-06 22:10:07 +02:00
Marc Alexander 215a29c0ac [ticket/578] Correctly assign classes upon moving modules up/down 
B3P-578
 2015-06-06 21:39:18 +02:00
Marc Alexander e5319bfbe3 [ticket/578] Correctly assign classes to element upon deleting modules 
B3P-578
 2015-06-06 21:22:37 +02:00
Marc Alexander 4739c5317c Merge branch '2.1.x' 2015-06-06 18:17:19 +02:00
Marc Alexander 55d7991829 Merge pull request #576 from marc1706/ticket/575 
[ticket/575] Remove border-radius from top and bottom modules
 2015-06-06 18:01:02 +02:00
Marc Alexander f92ef62843 Merge pull request #573 from marc1706/ticket/571 
[ticket/571] Intval more variables and fix validation issues
 2015-06-06 18:00:57 +02:00
Marc Alexander a364f1f258 [ticket/575] Remove border-radius from top and bottom modules 
B3P-575
 2015-06-06 17:01:29 +02:00
Marc Alexander 0665dba08f [ticket/571] Fix incorrect cast to integer in database_handler 
B3P-571
 2015-06-06 16:52:37 +02:00
Marc Alexander 04d4cc50af Merge pull request #574 from marc1706/ticket/572 
[ticket/572] Use json_decode/encode instead of serializing data
 2015-06-06 16:51:00 +02:00
Marc Alexander 2ee6b3c819 [ticket/572] Use json_decode/encode instead of serializing data 
B3P-572
 2015-06-06 16:26:28 +02:00
Marc Alexander 7d5128db80 [ticket/571] Improve docblocks and simplify check in controller helper 
B3P-571
 2015-06-06 15:46:16 +02:00
Marc Alexander 35e07a1201 [ticket/571] No longer enforce date formats 
B3P-571
 2015-06-06 15:45:58 +02:00
Marc Alexander 31d01f0aa4 [ticket/571] Use proper links for forms in ACP 
B3P-571
 2015-06-06 15:37:03 +02:00
Marc Alexander 45fb1c859d [ticket/571] Some more minor fixes 
B3P-571
 2015-06-06 15:29:37 +02:00
Marc Alexander 9d4515432c [ticket/571] Remove unused ext.php 
B3P-571
 2015-06-06 14:50:46 +02:00
Marc Alexander f3be40fd72 [ticket/571] Intval more variables and improve code quality 
B3P-571
 2015-06-06 14:47:35 +02:00
Marc Alexander dd25b5dc1f Merge branch '2.1.x' 2015-06-06 14:13:57 +02:00
Marc Alexander e72d8c0a5f Merge pull request #570 from marc1706/ticket/569 
[ticket/569] Do not display portal on login page if board is disabled
 2015-06-06 14:13:15 +02:00
Marc Alexander 4e3cbbc378 [ticket/569] Do not display portal on login page if board is disabled 
B3P-569
 2015-06-06 13:54:36 +02:00
Marc Alexander 62847190dd Merge branch '2.1.x' 2015-06-05 12:16:33 +02:00
Marc Alexander a7ee21e621 Merge pull request #568 from marc1706/ticket/527 
[ticket/527] Move calendar arrow icons to styles/all/
 2015-06-05 10:56:07 +02:00
Marc Alexander cbe29004bd [ticket/527] Move calendar arrow icons to styles/all/ 
B3P-527
 2015-06-05 10:02:15 +02:00
Marc Alexander eae00a3897 Merge pull request #567 from marc1706/ticket/565 
[ticket/565] Properly create select box for multiple options
 2015-06-04 22:50:52 +02:00
Marc Alexander a832bea536 [ticket/565] Properly create select box for multiple options 
B3P-565
 2015-06-04 22:28:33 +02:00
Marc Alexander c6767fa9f2 Merge pull request #563 from Galixte/patch-6 
Update of FRENCH translation for Board3 Portal extension
 2015-06-04 21:38:44 +02:00
Marc Alexander f3f6dc16ea Merge branch '2.1.x' 2015-06-03 19:40:16 +02:00
Marc Alexander b50d6012ea Merge pull request #562 from marc1706/ticket/550 
[ticket/550] Use extension ACL variable in portal_info
 2015-06-03 19:38:54 +02:00
Marc Alexander 9e1623e37d Merge pull request #561 from marc1706/ticket/560 
[ticket/560] Properly instantiate router class in tests
 2015-06-03 19:33:28 +02:00
Marc Alexander 2f0852cb70 [ticket/550] Use extension ACL variable in portal_info 
B3P-550
 2015-06-03 15:57:22 +02:00
Marc Alexander 309e6d06e2 [ticket/560] Properly instantiate router class in tests 
B3P-560
 2015-06-03 15:54:08 +02:00
Marc Alexander efdfa5a074 Merge branch '2.1.x' 2015-06-03 15:39:34 +02:00
Marc Alexander cddeb1eeac Merge pull request #559 from marc1706/ticket/558 
[ticket/558] Fix coding guidelines infractions
 2015-06-03 15:38:43 +02:00
Marc Alexander bad0316a94 Merge pull request #557 from marc1706/ticket/555 
[ticket/555] Allow setting default currency in ACP
 2015-06-03 14:48:23 +02:00
Marc Alexander 522b4d3087 [ticket/558] Fix coding guidelines infractions 
B3P-558
 2015-06-03 13:59:26 +02:00
Marc Alexander 530d841674 [ticket/555] Fix tests 
B3P-555
 2015-06-03 13:36:21 +02:00
Marc Alexander d3cca6a3e2 [ticket/555] Add missing language entries 
B3P-555
 2015-06-03 12:55:55 +02:00
Marc Alexander a5ccbb48c7 [ticket/555] Allow defining default currency in ACP 
B3P-555
 2015-06-03 12:53:21 +02:00
Marc Alexander 367d5168bd [ticket/555] Add default currency to donation modules in migration 
B3P-555
 2015-06-03 11:06:42 +02:00
Marc Alexander f4bf6e1d9f [ticket/555] Add setting for default currency 
B3P-555
 2015-06-03 11:01:51 +02:00
Marc Alexander 8cdf4a2161 Merge pull request #556 from marc1706/ticket/541 
[ticket/541] Update for final release of Board3 Portal
 2015-06-03 10:50:46 +02:00
Marc Alexander ba684e1025 Merge branch '2.1.x' 2015-06-03 10:43:57 +02:00
Marc Alexander c63ec881b1 Merge pull request #554 from marc1706/ticket/553 
[ticket/553] Fix code sniffer complaints
 2015-06-01 23:51:02 +02:00
Marc Alexander 9c90d2834b [ticket/553] Fix code sniffer complaints 
B3P-553
 2015-06-01 22:40:14 +02:00
Marc Alexander 7b7fde2a00 [ticket/541] Update for final release of Board3 Portal 
B3P-541
 2015-05-07 15:48:14 +02:00
Marc Alexander 127617ceaa Merge branch '2.1.x' 2015-05-07 15:45:51 +02:00
Marc Alexander 44a1937237 Merge pull request #548 from marc1706/ticket/541 
[ticket/541] Update versions in composer.json
 2015-05-07 15:43:51 +02:00
Marc Alexander 5899c9e7a5 [ticket/541] Update versions in composer.json 
B3P-541
 2015-05-07 15:01:41 +02:00
Marc Alexander d4a2b63b4e Merge pull request #547 from marc1706/ticket/546 
[ticket/546] Use phpbb\language\language for module language files
 2015-05-06 12:26:53 +02:00
Marc Alexander 6ad980975a [ticket/546] Use phpbb\language\language for module language files 
B3P-546
 2015-05-06 11:46:49 +02:00
Marc Alexander 5cee058e69 Merge pull request #545 from marc1706/ticket/544 
[ticket/544] Use dummy cache driver instead of replaced null driver
 2015-05-06 10:13:11 +02:00
Marc Alexander 5a32b757f6 [ticket/544] Use dummy cache driver instead of replaced null driver 
B3P-544
 2015-05-06 09:54:24 +02:00
Marc Alexander 76dbec58d9 Merge branch '2.1.x' 2015-05-06 01:05:21 +02:00
Marc Alexander 072957b6ec Merge pull request #543 from marc1706/ticket/542 
[ticket/542] Add missing calls to sql_freeresult()
 2015-05-06 01:05:17 +02:00
Marc Alexander 76003767d5 [ticket/542] Add missing calls to sql_freeresult() 
B3P-542
 2015-05-05 23:36:50 +02:00
Marc Alexander 27f9ae0949 Merge branch '2.1.x' 2015-05-05 23:29:19 +02:00
Marc Alexander 229033a618 Merge pull request #540 from marc1706/ticket/539 
[ticket/539] Do not show portal on all pages if board is disabled
 2015-05-05 23:07:37 +02:00
Marc Alexander 85337f9a09 [ticket/539] Do not show portal on all pages if board is disabled 
B3P-539
 2015-05-05 20:43:38 +02:00
Marc Alexander ddeeb97338 Merge branch '2.1.x' 2015-05-01 16:08:49 +02:00
Marc Alexander 3e0ec62751 Merge pull request #538 from marc1706/ticket/535 
[ticket/535] Update trimmessage tool
 2015-05-01 16:08:47 +02:00
Marc Alexander 2239850ba9 [ticket/535] Update trimmessage tool 
B3P-535
 2015-05-01 15:27:57 +02:00
Marc Alexander d5712e70cb Merge pull request #537 from marc1706/ticket/534 
[ticket/534] Adapt tests for master branch of phpBB
 2015-05-01 15:22:58 +02:00
Marc Alexander f61a0376dc [ticket/534] No longer test unsupported PHP 5.3.3 
B3P-534
 2015-05-01 15:07:01 +02:00
Marc Alexander 7ff4937108 [ticket/534] Adapt tests for master branch of phpBB 
B3P-534
 2015-05-01 15:00:46 +02:00
Marc Alexander 2d7232a392 Merge branch '2.1.x' 2015-04-30 17:50:21 +02:00
Marc Alexander 6cd36b4b13 Merge branch 'ticket/532' into 2.1.x 2015-04-30 17:50:18 +02:00
Marc Alexander 5678dd2251 [ticket/532] Update build excludes in travis.yml 
B3P-532
 2015-04-30 17:47:47 +02:00
Marc Alexander 5fe659d6b1 Merge remote-tracking branch 'upstream/2.2.x' 2015-04-30 17:42:14 +02:00
Marc Alexander a1659237ab Merge remote-tracking branch 'upstream/develop-2.1.x' 2015-04-30 17:41:44 +02:00
Marc Alexander 61077d332a [2.2.x] Enable tests that should work with up-to-date DOMCrawler 2015-04-30 17:39:11 +02:00
Marc Alexander 5d8026c3c8 [2.2.x] Add new branch for 2.2.x 2015-04-30 17:38:48 +02:00
Marc Alexander b4f68afd3c Merge pull request #531 from marc1706/ticket/530 
[ticket/530] Update composer.phar for PHP7 compatibility
 2015-04-27 19:18:59 +02:00
Marc Alexander 1f6ddc245e Merge pull request #529 from marc1706/ticket/528 
[ticket/528] Correctly load module language for 3rd party modules
 2015-04-27 19:18:51 +02:00
Marc Alexander 92a960ebd5 [ticket/530] Update composer.phar for PHP7 compatibility 
B3P-530
 2015-04-27 16:49:55 +02:00
Marc Alexander 9d0146918d [ticket/528] Add missing dependencies to tests 
B3P-528
 2015-04-27 16:48:21 +02:00
Marc Alexander d699ef0e3b [ticket/528] Correctly load module language for 3rd party modules 
B3P-528
 2015-04-27 16:18:04 +02:00
Marc Alexander 6767c6406b Merge pull request #520 from Galixte/patch-5 
Update of FRENCH translation for Board3 Portal extension
 2015-04-09 13:58:01 +02:00
Marc Alexander 33a96b967b Merge pull request #526 from marc1706/ticket/525 
[ticket/525] Use path instead of pattern for routes in tests
 2015-04-09 13:38:53 +02:00
Marc Alexander 7e4a6468a2 [ticket/525] Use path instead of pattern for routes in tests 
B3P-525
 2015-04-09 13:24:07 +02:00
Marc Alexander 5007b9ee35 Merge pull request #524 from marc1706/ticket/521 
[ticket/521] Display correct day of week in calendar module
 2015-04-08 00:38:02 +02:00
Marc Alexander 8c0c123627 [ticket/521] Display correct day of week in calendar module 
B3P-521
 2015-04-08 00:12:07 +02:00
Marc Alexander 605c7bc41f Merge pull request #523 from marc1706/ticket/522 
[ticket/522] Hide portal on all pages on low resolutions
 2015-04-06 23:05:13 +02:00
Marc Alexander 0123621025 [ticket/522] Hide portal on all pages on low resolutions 
B3P-522
 2015-04-06 17:22:57 +02:00