Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,375 Commits 2 Branches 8 Tags
fab235065f11288ed122b03988ed804b4d12727b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander fab235065f Merge pull request #348 from marc1706/ticket/346 
[ticket/346] Remove usage of legacy phpBB functions and methods
 2014-08-24 00:48:07 +02:00
Marc Alexander f0f8b85280 [ticket/346] Use phpbb_get_avtar() instead of deprecated function 
B3P-346
 2014-08-24 00:04:17 +02:00
Marc Alexander 3f87caf3f3 [ticket/346] Use phpBB log class instead of add_log() 
B3P-346
 2014-08-23 23:50:32 +02:00
Marc Alexander 8e232cec9d [ticket/346] Correctly pass config object in calendar test 
B3P-346
 2014-08-23 22:39:32 +02:00
Marc Alexander ff26914f72 [ticket/346] Use $config->set() instead of set_config() 
B3P-346
 2014-08-23 22:27:02 +02:00
Marc Alexander f8fa912342 Merge pull request #345 from marc1706/ticket/340 
[ticket/340] Correctly check if permission_setting template row exists
 2014-08-23 22:15:38 +02:00
Marc Alexander 61ec0eecf7 Merge pull request #344 from marc1706/ticket/339 
[ticket/339] Remove add_log call from welcome module acp settings
 2014-08-23 22:04:37 +02:00
Marc Alexander c02d214f85 Merge pull request #343 from marc1706/ticket/338 
[ticket/338] Make sure list style of modules is set to none
 2014-08-23 21:59:48 +02:00
Marc Alexander 7d6df389ed [ticket/340] Correctly check if permission_setting template row exists 
B3P-340
 2014-08-23 21:58:07 +02:00
Marc Alexander 5a285050a7 [ticket/339] Remove add_log call from welcome module acp settings 
B3P-339
 2014-08-23 21:48:00 +02:00
Marc Alexander 58b1d818d4 [ticket/338] Make sure list style of modules is set to none 
B3P-338
 2014-08-23 21:43:11 +02:00
Marc Alexander dac1b2bcaa Merge pull request #341 from marc1706/ticket/337 
[ticket/337] Move log and permission lang variables back to info_acp_portal
 2014-08-23 21:21:20 +02:00
Marc Alexander 7556ddfc3d [ticket/337] Explicitly state UTF8 as encoding in tests 
B3P-337
 2014-08-23 21:00:21 +02:00
Marc Alexander a61eab4b36 [ticket/337] Move log and permission lang variables back to info_acp_portal 
Tests for correct displayal of language variables have been added.

B3P-337
 2014-08-23 20:35:48 +02:00
Marc Alexander d81fc02ddb Merge pull request #336 from marc1706/ticket/335 
[ticket/335] Resolve merge conflicts when merging master into develop
 2014-08-20 23:45:12 +02:00
Marc Alexander ec858672d2 Merge branch 'master' into test 
Conflicts:
	acp/portal_module.php
	contrib/de.xml
	contrib/modx.prosilver.en.xsl
	contrib/subsilver2.xml
	contrib/update_201_to_202/contrib/de.xml
	contrib/update_201_to_202/contrib/modx.prosilver.en.xsl
	contrib/update_201_to_202/contrib/subsilver2.xml
	contrib/update_201_to_202/modx.prosilver.en.xsl
	contrib/update_201_to_202/update.xml
	includes/functions_upload.php
	install.xml
	language/de/modules/portal_attachments_module.php
	modules/custom.php
	modx.prosilver.en.xsl
	root/install/index.php
	root/portal/includes/functions.php
	root/portal/modules/portal_attachments.php
	root/portal/modules/portal_birthday_list.php
	root/portal/modules/portal_calendar.php
	root/portal/modules/portal_donation.php
	root/portal/modules/portal_poll.php
	root/styles/prosilver/template/portal/modules/donation_center.html
	root/styles/prosilver/theme/portal.css
	root/styles/subsilver2/template/portal/modules/recent_center.html
	root/umil/file.php
	root/umil/language/ar/umil.php
	root/umil/language/da/umil.php
	root/umil/language/de/umil.php
	root/umil/language/de_x_sie/umil.php
	root/umil/language/en/umil.php
	root/umil/language/es/umil.php
	root/umil/language/fr/umil.php
	root/umil/language/he/umil.php
	root/umil/language/hr/umil.php
	root/umil/language/hu/umil.php
	root/umil/language/id/umil.php
	root/umil/language/it/umil.php
	root/umil/language/ja/umil.php
	root/umil/language/nl-x-formal/umil.php
	root/umil/language/nl/umil.php
	root/umil/language/pl/umil.php
	root/umil/language/pt/umil.php
	root/umil/language/pt_br/umil.php
	root/umil/language/ro/umil.php
	root/umil/language/ru/umil.php
	root/umil/language/sk/umil.php
	root/umil/language/sv/umil.php
	root/umil/language/tr/umil.php
	root/umil/language/zh_cmn_hant/umil.php
	root/umil/style/parse.css
	root/umil/umil.php
	root/umil/umil_auto.php
	root/umil/umil_frontend.php
	styles/prosilver/template/portal/modules/birthdays_side.html
	styles/prosilver/template/portal/modules/recent_center.html
 2014-08-20 23:25:21 +02:00
Marc Alexander a05ffcba13 Merge pull request #333 from marc1706/ticket/314 
[ticket/314] Check copyright lines and fix incorrect comments
 2014-08-17 22:49:45 +02:00
Marc Alexander 39a14ea788 [ticket/314] Fix function and method comments 2014-08-17 22:36:45 +02:00
Marc Alexander ed33e19f4b [ticket/314] Check incorrect copyright lines 2014-08-17 22:13:19 +02:00
Marc Alexander c89d0c0d4f Merge pull request #332 from marc1706/ticket/331 
[ticket/331] Add EPV check to travis builds
 2014-08-17 18:20:07 +02:00
Marc Alexander 555b02fd16 [ticket/331] Remove spellchecker 2014-08-17 18:07:11 +02:00
Marc Alexander fa6f292365 [ticket/331] Exclude vendor and develop folder from spellcheck 2014-08-17 17:51:51 +02:00
Marc Alexander cf4f2209ff [ticket/331] Run spellchecker on travis again 2014-08-17 16:59:37 +02:00
Marc Alexander a031bd611e [ticket/331] Remove EPV errors in code 2014-08-17 16:01:53 +02:00
Marc Alexander 5eceecf442 [ticket/331] Removed board3 portal clock 2014-08-17 15:45:19 +02:00
Marc Alexander 61584baed7 [ticket/331] Rename jquery easing plugin 2014-08-17 15:44:28 +02:00
Marc Alexander 49707925b6 [ticket/331] Change call to run-epv.sh 2014-08-17 15:12:05 +02:00
Marc Alexander 3e0ff080bb [ticket/331] Add missing arguments to modules helper in tests 2014-08-17 14:45:15 +02:00
Marc Alexander 85d4d85ee5 [ticket/331] Specify datetime class in tests 2014-08-17 14:37:40 +02:00
Marc Alexander dfc78cafd6 [ticket/331] Add EPV check to travis builds 
B3P-331
 2014-08-17 14:09:33 +02:00
Marc Alexander 3fa1e7c745 Merge pull request #330 from marc1706/ticket/329 
[ticket/329] Remove span surrounding pagination
 2014-08-05 22:54:21 +02:00
Marc Alexander 83da7e0f23 [ticket/329] Remove span surrounding pagination 2014-08-05 22:30:44 +02:00
Marc Alexander 1e1af5f883 Merge pull request #328 from marc1706/ticket/321 
[ticket/321] Display jumpbox again
 2014-08-03 23:03:56 +02:00
Marc Alexander acdc7adbd7 [ticket/321] Display jumpbox again 2014-08-03 22:45:12 +02:00
Marc Alexander 4d7cc18c43 Merge pull request #326 from marc1706/ticket/232 
[ticket/232] Improve sizing of portal columns and modules
 2014-07-30 14:17:58 +02:00
Marc Alexander 4e3ff66f2d [ticket/232] Improve sizing of portal columns and modules 2014-07-30 13:49:02 +02:00
Marc Alexander 7925d69a12 Merge pull request #325 from marc1706/ticket/324 
[ticket/324] Do not load module if column is disabled
 2014-07-30 13:23:01 +02:00
Marc Alexander ce2d9bf90f Merge pull request #323 from marc1706/ticket/322 
[ŧicket/322] Fix margins if left/right column is disabled
 2014-07-30 12:19:54 +02:00
Marc Alexander c408f8b9c6 [ticket/324] Do not load module if column is disabled 2014-07-30 12:18:50 +02:00
Marc Alexander dfcb429278 [ŧicket/322] Fix margins if left/right column is disabled 2014-07-30 12:01:36 +02:00
Marc Alexander c5020a7608 Merge pull request #319 from marc1706/ticket/207 
[ticket/207] Add links to portal in header and footer
 2014-07-28 17:17:30 +02:00
Marc Alexander a166ae2553 [ticket/207] Remove unneeded method parameter in add_portal_link 2014-07-28 16:36:16 +02:00
Marc Alexander 4b099019e0 [ticket/207] Use different template var for redirect and fix portal link 2014-07-28 16:27:52 +02:00
Marc Alexander 8567a5c931 [ticket/207] Add links to portal in header and footer 
Also added tests for listener.
 2014-07-27 22:03:52 +02:00
Marc Alexander 3bc2bfd67e Merge pull request #318 from marc1706/ticket/317 
[ticket/317] Use correct block name in END statement
 2014-07-27 19:55:03 +02:00
Marc Alexander b98a67287c [ticket/317] Use correct block name in END statement 2014-07-27 19:42:09 +02:00
Marc Alexander 78887540a4 Merge pull request #313 from marc1706/ticket/289 
[ticket/289] Add method for assigning template vars
 2014-07-25 14:48:02 +02:00
Marc Alexander 9fd003bb00 [ticket/289] Add method for getting module template 2014-07-25 14:34:34 +02:00
Marc Alexander 6b8fcf120d [ticket/289] Add helper class for controller 2014-07-25 13:13:14 +02:00
Marc Alexander 1d37cbec80 [ticket/289] Add method for getting portal modules 2014-07-25 00:34:56 +02:00
Marc Alexander e8d32dd018 [ticket/289] Add methods for loading language files and displaying online list 2014-07-25 00:18:34 +02:00
Marc Alexander 2203614991 [ticket/289] Add method for assigning module template variables 2014-07-24 23:56:33 +02:00
Marc Alexander ca2304abb8 [ticket/289] Add method for checking if redirect is needed 2014-07-24 23:24:40 +02:00
Marc Alexander 50f5cfcbf3 [ticket/289] Add method for checking module count 2014-07-24 23:12:44 +02:00
Marc Alexander 149a92e822 [ticket/289] Add method for assigning template vars 2014-07-24 22:54:53 +02:00
Marc Alexander 2f45c5547d Merge pull request #312 from marc1706/ticket/289 
[ticket/289] Removed duplicated code from attachments.php
 2014-07-24 20:02:16 +02:00
Marc Alexander e3e60b3068 [ticket/289] Fix incorrect method docs 2014-07-24 19:22:46 +02:00
Marc Alexander d41bd0eab9 [ticket/289] Move store_selected_forums to modules_helper 2014-07-24 19:18:25 +02:00
Marc Alexander 2c279b71df [ticket/289] Use generate_forum_select() in all modules 2014-07-24 18:04:05 +02:00
Marc Alexander 483c621fac [ticket/289] Remove unneeded assignment 2014-07-24 17:52:34 +02:00
Marc Alexander d554480697 [ticket/289] Add missing class variable to modules_helper 2014-07-24 17:51:16 +02:00
Marc Alexander 7f887b872c [ticket/289] Add method for generating forum select boxes 2014-07-24 17:42:51 +02:00
Marc Alexander 240168e925 [ticket/289] Add method for generating select boxes in modules 2014-07-24 13:16:48 +02:00
Marc Alexander 53a58f8a7c [ticket/289] Removed duplicated code from attachments.php 2014-07-24 09:12:18 +02:00
Marc Alexander 8479cb28ca Merge pull request #311 from marc1706/ticket/289 
[ticket/289] Fix scrutinizer documentation issues
 2014-07-24 08:39:18 +02:00
Marc Alexander 304f7883d9 [ticket/289] Fix newly added scrutinizer issues 2014-07-24 08:28:34 +02:00
Marc Alexander 2692429e82 [ticket/289] Fix scrutinizer documentation issues 2014-07-23 23:21:39 +02:00
Marc Alexander 7732c23e3d Merge pull request #309 from marc1706/ticket/308 
[ticket/308] Fix pagination in compact announcements module
 2014-07-16 11:49:40 +02:00
Marc Alexander e43cb08db6 [ticket/308] Fix pagination in compact announcements module 
B3P-308
 2014-07-16 09:41:27 +02:00
Marc Alexander 023940466f Merge pull request #307 from marc1706/ticket/242 
[ticket/242] Remove corners-top and corners-bottom from portal files
 2014-07-15 09:09:58 +02:00
Marc Alexander ca59efa379 [ticket/242] Remove portal-corners from html and css files 
B3P-242
 2014-07-14 23:53:23 +02:00
Marc Alexander 2542c5ef30 [ticket/242] Remove rounded corners from portal html files 
B3P-242
 2014-07-14 23:44:27 +02:00
Marc Alexander 3b56ca328f Merge pull request #306 from marc1706/ticket/305 
[ticket/305] Turn phpbb_fetch_posts into service
 2014-07-14 01:06:40 +02:00
Marc Alexander 86afbe6fe1 [ticket/305] Add method for running sql query 
B3P-305
 2014-07-14 00:53:06 +02:00
Marc Alexander 6d21c1794c [ticket/305] Split up get_type_constraints() 
B3P-305
 2014-07-14 00:44:15 +02:00
Marc Alexander e57d1f411a [ticket/305] Use fetch posts service in news and announcements modules 
B3P-305
 2014-07-13 10:25:47 +02:00
Marc Alexander 1978fbc48f [ticket/305] Simplify method get_global_id() 
B3P-305
 2014-07-13 00:44:49 +02:00
Marc Alexander be8593d288 [ticket/305] Reduce complexity of set_forum_constraints() 
B3P-305
 2014-07-13 00:23:21 +02:00
Marc Alexander 7acaa371c7 [ticket/305] Make run-coveralls.sh executable 
B3P-305
 2014-07-13 00:14:48 +02:00
Marc Alexander fc65161989 [ticket/305] Only run coveralls on PHP 5.5 and mysqli 
B3P-305
 2014-07-13 00:00:24 +02:00
Marc Alexander b9d0236793 [ticket/305] Mark phpbb_fetch_posts() as deprecated 
B3P-305
 2014-07-12 23:29:42 +02:00
Marc Alexander 9922b6a7a7 [ticket/305] Add fetch_posts service as replacement for phpbb_fetch_posts 
B3P-305
 2014-07-12 23:16:18 +02:00
Marc Alexander ac88dde05b Merge pull request #304 from marc1706/ticket/303 
[ticket/303] Fix character_limit() tests
 2014-07-10 00:20:10 +02:00
Marc Alexander f2a6bce07b [ticket/303] Add sql_exists to cache mock 
B3P-303
 2014-07-09 23:55:00 +02:00
Marc Alexander 1a9dfa8a58 [ticket/303] Add tests for get_user_groups() 
B3P-303
 2014-07-09 23:25:26 +02:00
Marc Alexander 75d75df881 Merge pull request #302 from marc1706/ticket/301 
[ticket/301] Improve coverage of phpbb_fetch_posts() to 100%
 2014-07-09 22:32:02 +02:00
Marc Alexander 2cdc2ee211 [ticket/301] Extend phpbb_fetch_posts coverage to 100% 
B3P-301
 2014-07-09 22:17:46 +02:00
Marc Alexander a552a5cb8f [ticket/301] Add higher test coverage of phpbb_fetch_posts 
B3P-301
 2014-07-09 20:49:49 +02:00
Marc Alexander 63be896ca4 [ticket/301] Cover InvalidArgumentException in phpbb_fetch_posts 
B3P-301
 2014-07-09 20:05:08 +02:00
Marc Alexander 0a276c6ec6 [ticket/301] Throw Exception on incorrect call of phpbb_fetch_posts 
B3P-301
 2014-07-09 20:04:02 +02:00
Marc Alexander 9d678d86a9 Merge pull request #300 from marc1706/ticket/299 
[ticket/299] Add tests for phpbb_fetch_posts
 2014-07-08 20:23:21 +02:00
Marc Alexander 92e17646ed [ticket/299] Add missing sql_exists to fetch_news_test 
B3P-299
 2014-07-08 19:18:12 +02:00
Marc Alexander c4c884bd7c [ticket/299] Fix calendar module test 
B3P-299
 2014-07-08 19:00:44 +02:00
Marc Alexander aeb912a559 [ticket/299] Add tests for phpbb_fetch_posts 
B3P-299
 2014-07-08 18:45:49 +02:00
Marc Alexander 016bee7f72 Merge pull request #298 from marc1706/ticket/297 
[ticket/297] Enable codesniffer again
 2014-07-08 16:56:09 +02:00
Marc Alexander bf7b8eb99b [ticket/297] Rename version_check method to check to prevent 2nd constructor 
B3P-297
 2014-07-08 16:14:59 +02:00
Marc Alexander f4fd6f73e0 [ticket/297] Enable ext sniffer 
B3P-297
 2014-07-08 16:14:40 +02:00
Marc Alexander cefd447a67 Merge pull request #296 from marc1706/ticket/293 
[ticket/293] Use trimmessage as composer dependency
 2014-07-08 00:27:06 +02:00
Marc Alexander 496fb8b60b [ticket/293] Use trimmessage as composer dependency 
B3P-293
 2014-07-08 00:07:44 +02:00
Marc Alexander 0e7d1b01cc Merge pull request #295 from marc1706/ticket/294 
[ticket/294] Use composer dependencies for coveralls
 2014-07-07 23:53:06 +02:00