Commit Graph
100 Commits
Author SHA1 Message Date
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
Marc Alexander dd43a8364c Merge pull request #517 from marc1706/ticket/510
[ticket/510] Order groups by group_legend setting in leaders module
2015-03-21 11:10:23 +01:00
Marc Alexander 6c8b63db06 Merge pull request #516 from marc1706/ticket/513
[ticket/513] Add build script
2015-03-21 10:12:31 +01:00
Marc Alexander 7e0034cd1a [ticket/510] Order groups by group_legend setting in leaders module
B3P-510
2015-03-21 10:11:12 +01:00
Marc Alexander 112b7d2db7 [ticket/513] Add missing line at end of file
B3P-513
2015-03-21 09:52:35 +01:00
Marc Alexander 9792360f03 [ticket/513] Run tests while packaging board3 portal
B3P-513
2015-03-21 09:51:07 +01:00
Marc Alexander 4d042239d6 [ticket/513] Update composer dependencies
B3P-513
2015-03-21 09:51:02 +01:00
Marc Alexander 2a5d91b474 [ticket/513] Add build script
B3P-513
2015-03-21 09:50:57 +01:00
Marc Alexander 61782b6e77 Merge pull request #515 from marc1706/ticket/514
[ticket/514] Add PHP7 to travis build matrix
2015-03-20 18:47:37 +01:00
Marc Alexander 39482d5441 [ticket/514] Use preg_replace_callback in portal
B3P-514
2015-03-20 17:49:41 +01:00
Marc Alexander 6835979dbf [ticket/514] Use preg_replace_callback in main_menu
B3P-514
2015-03-20 17:49:29 +01:00
Marc Alexander 2dd46f61b6 [ticket/514] Add PHP7 to travis build matrix
B3P-514
2015-03-20 15:31:37 +01:00
Marc Alexander 24f18700bb Merge pull request #512 from marc1706/ticket/511
[ticket/511] Do not show <hr> at bottom of prosilver main menu
2015-03-19 11:00:58 +01:00
Marc Alexander 01cb85005a [ticket/511] Do not show <hr> at bottom of prosilver main menu
B3P-511
2015-03-18 13:51:36 +01:00
Marc Alexander 1a4587a2a3 Merge pull request #509 from marc1706/ticket/508
[ticket/508] Only execute portal once when accessed via domain only
2015-03-15 17:29:19 +01:00
Marc Alexander eb24ba1425 [ticket/508] Only execute portal once when accessed via domain only
B3P-508
2015-03-15 15:26:32 +01:00
Marc Alexander c0430bb20e Merge pull request #507 from marc1706/ticket/506
[ticket/506] Move module images to styles/all folder
2015-03-15 13:57:29 +01:00
Marc Alexander 08a4d74937 [ticket/506] Only check styles/all folder for module images and fix tests
B3P-506
2015-03-15 13:33:10 +01:00
Marc Alexander f8de6be004 [ticket/506] Move module images to styles/all folder
B3P-506
2015-03-15 11:56:16 +01:00
Marc Alexander cd4e7e2993 Merge pull request #505 from marc1706/ticket/504
[ticket/504] Order who is online based on phpBB ACP setting
2015-03-15 11:09:53 +01:00
Marc Alexander 22e48beb8f [ticket/504] Order who is online based on phpBB ACP setting
B3P-504
2015-03-15 09:00:20 +01:00
Marc Alexander 545f7af4de Merge pull request #503 from marc1706/ticket/502
[ticket/502] Remove inner rounded corners from center modules
2015-03-10 21:17:45 +01:00
Marc Alexander 53a9dbf5dd [ticket/502] Remove inner rounded corners from center modules
B3P-502
2015-03-10 20:30:36 +01:00
Marc Alexander 9ca1e197ee Merge pull request #501 from marc1706/ticket/500
[ticket/500] Show correct number of replies in news and announcements
2015-03-09 22:32:24 +01:00
Marc Alexander 131b7a691d [ticket/500] Show correct number of replies in news and announcements
B3P-500
2015-03-09 21:42:27 +01:00
Marc Alexander c3e1128ad6 Merge pull request #499 from marc1706/ticket/498
[ticket/498] Add nofollow for calendar and add roles for elements
2015-03-05 11:17:36 +01:00
Marc Alexander 2d5a14db22 [ticket/498] Add nofollow for calendar and add roles for elements
B3P-498
2015-03-05 10:59:57 +01:00
Marc Alexander 4134f59a15 Merge pull request #497 from marc1706/ticket/494
[ticket/494] Improve caching and query performance of portal
2015-03-05 10:31:43 +01:00
Marc Alexander 1a74082154 [ticket/494] Remove SQL queries to portal_modules when changing settings
B3P-494
2015-03-04 17:32:53 +01:00
Marc Alexander 9fe7e17124 [ticket/494] Correctly mock sql_save and sql_load methods of cache
B3P-494
2015-03-04 10:23:37 +01:00
Marc Alexander 726f94e798 Merge pull request #496 from marc1706/ticket/495
[ticket/495] Correctly load template files for modules
2015-03-03 15:32:55 +01:00
Marc Alexander 1e405e9d91 [ticket/494] Cache more queries on portal page
B3P-494
2015-03-03 15:25:22 +01:00
Marc Alexander 42973b1a10 [ticket/495] Correctly load template files for modules
B3P-495
2015-03-03 14:55:56 +01:00
Marc Alexander a699a92e31 Merge pull request #493 from marc1706/ticket/492
[ticket/492] Use B3P controller helper for loading module language
2015-03-02 14:14:33 +01:00
Marc Alexander 22ef20d0e7 [ticket/492] Use B3P controller helper for loading module language
B3P-492
2015-03-02 13:50:28 +01:00
Marc Alexander a9c5913c1f Merge pull request #491 from Galixte/patch-4
Update for FRENCH translation - UTF8 FRENCH quotes
2015-03-02 11:01:01 +01:00
Marc Alexander 6488dd8d0c Merge pull request #490 from marc1706/ticket/487
[ticket/487] Add missing language entries to German language
2015-02-27 21:00:17 +01:00
Marc Alexander df854fe083 [ticket/487] Add missing language entries to German language
B3P-487
2015-02-27 20:41:57 +01:00
Marc Alexander 36db7c0b28 Merge pull request #488 from marc1706/ticket/477
[ticket/477] Expect version_helper to throw RuntimeException
2015-02-27 10:40:39 +01:00
Marc Alexander 3c23f6b405 [ticket/477] Expect version check to return false
B3P-477
2015-02-27 09:24:51 +01:00
Marc Alexander de98a00df5 [ticket/477] Use class members instead of passing by reference
B3P-477
2015-02-27 09:19:25 +01:00
Marc Alexander 96b31e8abb [ticket/477] Move assignment of update information to seperate method
B3P-477
2015-02-27 09:16:19 +01:00
Marc Alexander dec789fef7 Merge pull request #489 from marc1706/ticket/464
[ticket/464] Use phpbb_admin_path for links to acp pages
2015-02-27 09:08:13 +01:00
Marc Alexander 3e18e50f89 [ticket/464] Use phpbb_admin_path for links to acp pages
B3P-464
2015-02-26 23:12:29 +01:00
Marc Alexander 53eb8ebe02 [ticket/477] Expect version_helper to throw RuntimeException
B3P-477
2015-02-26 23:08:07 +01:00
Marc Alexander 9551290fcf Merge pull request #485 from marc1706/ticket/482
[ticket/482] Get rid of conflicts between portal and phpBB CSS
2015-02-26 21:12:21 +01:00
Marc Alexander e838684ae5 Merge pull request #486 from marc1706/ticket/481
[ticket/481] Remove unneeded assignment of S_SEARCH_ACTION in search
2015-02-26 21:06:34 +01:00
Marc Alexander b68bb7f4a6 [ticket/481] Remove unneeded assignment of S_SEARCH_ACTION in search
B3P-481
2015-02-26 17:55:34 +01:00
Marc Alexander 119855aedf Merge pull request #484 from marc1706/ticket/483
[ticket/483] Use phpBB's 3.1.x branch for travis builds
2015-02-26 17:45:21 +01:00
Marc Alexander 5b6b6740ca [ticket/483] Use phpBB's 3.1.x branch for travis builds
B3P-483
2015-02-26 17:08:00 +01:00
Marc Alexander 3ab38cdf31 [ticket/482] Get rid of conflicts between portal and phpBB CSS
B3P-482
2015-02-26 17:02:11 +01:00
Marc Alexander 5c79d9452a Merge pull request #480 from Galixte/patch-3
Update for FRENCH translation for portal_acp.php file
2015-02-21 11:31:22 +01:00
Marc Alexander 7b9380360c Merge pull request #476 from marc1706/ticket/475
[ticket/475] Show "No announcements" if no announcements present
2015-02-15 10:31:47 +01:00
Marc Alexander a8655fc78d Merge pull request #474 from marc1706/ticket/473
[ticket/473] Correctly create news on read all page
2015-02-15 01:16:57 +01:00
Marc Alexander d16acc444b [ticket/475] Show "No announcements" if no announcements present
B3P-475
2015-02-15 01:09:57 +01:00
Marc Alexander 76c5f62cbd [ticket/473] Correctly create news on read all page
B3P-473
2015-02-15 01:01:58 +01:00
Marc Alexander faedc2bd25 Merge pull request #470 from marc1706/ticket/469
[ticket/469] Add setting for displaying portal side columns on all pages
2015-02-14 22:51:08 +01:00
Marc Alexander cfa2657da4 [ticket/469] Correctly create path to images on pages outside root
B3P-469
2015-02-14 22:30:57 +01:00
Marc Alexander 8e85752c65 [ticket/469] Enable portal on all pages in subsilver2 & add tests
B3P-469
2015-02-14 22:21:10 +01:00
Marc Alexander 9899d4fd3c [ticket/469] Fix incorrect doc block
B3P-469
2015-02-13 22:23:49 +01:00
Marc Alexander 1e7dc9b576 [ticket/469] Add tests for displaying all pages using main controller
B3P-469
2015-02-13 22:23:23 +01:00
Marc Alexander 30bd67f3d8 [ticket/469] Fix tests with new settings
B3P-469
2015-02-13 19:52:00 +01:00
Marc Alexander 311c7cb97f [ticket/469] Only allow showing left or right module on all pages
B3P-469
2015-02-13 16:34:53 +01:00
Marc Alexander f75dd66601 [ticket/469] Add prosilver events required for portal on all pages
B3P-469
2015-02-13 16:34:52 +01:00
Marc Alexander 0ea8d11360 [ticket/469] Remove unused template variable
B3P-469
2015-02-13 16:34:52 +01:00
Marc Alexander 70efdf099e [ticket/469] Add CSS if portal is displayed on all pages
B3P-469
2015-02-13 16:34:51 +01:00
Marc Alexander bc3b430569 [ticket/469] Add new language entries for displaying portal on all pages
B3P-469
2015-02-13 16:34:51 +01:00
Marc Alexander ee096bf60d [ticket/469] Allow restricting portal columns based on parameter in handle
B3P-469
2015-02-13 16:34:50 +01:00
Marc Alexander f2b002c49b [ticket/469] Check current page with get_current_url()
The current session page seems to be wrong on the first page access.

B3P-469
2015-02-13 16:34:49 +01:00
Marc Alexander a50e6c04d0 [ticket/469] Make listener display portal if settings are set to true
B3P-469
2015-02-13 16:34:49 +01:00
Marc Alexander e4861caed8 [ticket/469] Add settings for displaying portal on all pages
B3P-469
2015-02-13 16:34:48 +01:00
Marc Alexander 7a63c9a3a8 [ticket/469] Make sure to not define constants more than once
B3P-469
2015-02-13 16:34:47 +01:00
Marc Alexander 2397563b9a Merge pull request #472 from marc1706/ticket/471
[ticket/471] Do not shorten text if limit is at 0
2015-02-12 23:52:15 +01:00
Marc Alexander ce42fb4fb8 [ticket/471] Do not shorten text if limit is at 0
Also, text will no longer be shortened if the modules is using the compact
style.

B3P-471
2015-02-12 23:03:33 +01:00
Marc Alexander b98c6fed23 Merge pull request #468 from marc1706/ticket/467
[ticket/467] Update composer dependencies
2015-02-11 15:30:21 +01:00
Marc Alexander 8d38348f15 [ticket/467] Update composer dependencies
B3P-467
2015-02-11 15:14:39 +01:00
Marc Alexander 64eb8f871a [ticket/467] Update composer.phar to latest version
B3P-467
2015-02-11 15:13:48 +01:00
Marc Alexander 6614a7c320 Merge pull request #466 from marc1706/ticket/465
[ticket/465] Use path instead of pattern in routing.yml
2015-02-11 12:08:26 +01:00
Marc Alexander 9bf8fd049d [ticket/465] Use path instead of pattern in routing.yml
B3P-465
2015-02-11 11:53:19 +01:00