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

1366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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