alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
686 Commits 12 Branches 0 Tags 17 MiB
Commit Graph

605 Commits

Author SHA1 Message Date
Harry Bomrah 8b2281ca17 now the caching initialized with engine 
Conflicts:
	Gemfile
 2015-03-30 15:12:41 +08:00
manson 3262359911 update impression and add cache for page sub-parts, main-menu 2015-03-30 15:11:26 +08:00
Harry Bomrah 4b770b7fd1 group create fix 2015-03-25 15:50:58 +08:00
Harry Bomrah b290d3653f groups commit 2015-03-25 15:46:11 +08:00
rulingcom e1c8d61195 sdk precompile fixed 2015-03-23 17:39:58 +08:00
nccu 4603c8b53f help desinger fix IE8 2015-03-23 17:17:52 +08:00
nccu b0d454f274 help designer IE8 fix 2015-03-23 16:28:42 +08:00
nccu fcbb04ccc5 help designer IE8 fix 2015-03-23 16:12:26 +08:00
rulingcom f9ed19def0 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-03-23 13:25:13 +08:00
nccu 013ba56111 precompile fix and also impressionist fix 2015-03-19 18:42:29 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +08:00
Harry Bomrah 25bf24745c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-18 18:01:00 +08:00
Harry Bomrah 2432a587d5 css mods for archive 2015-03-18 17:59:36 +08:00
rulingcom 20350c4e14 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-03-13 17:13:35 +08:00
Harry Bomrah 366876ae29 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
 2015-03-13 17:10:52 +08:00
Harry Bomrah 52c78856be added insert new widgets to kernel 2015-03-13 16:39:09 +08:00
rulingcom 338824a509 addes bootstrap back 2015-03-12 19:06:42 +08:00
Harry Bomrah c4be6c5f63 visibility of group fixed 2015-03-12 19:05:49 +08:00
Harry Bomrah f71b5d6bbb groups started 2015-03-12 19:02:48 +08:00
rulingcom 16dae228b1 sdk updates from joshua 2015-03-11 16:18:56 +08:00
nccu 4870fc5ad3 help designer 2015-03-09 11:12:20 +08:00
Harry Bomrah 9be667d405 removed desktop 2015-03-06 18:03:43 +08:00
rulingcom e045025bc6 precompile fixes for orbit mobile template 2015-03-06 17:59:30 +08:00
rulingcom 7aa187497a sdk changes by joshua wq 2015-03-06 17:21:38 +08:00
Harry Bomrah dfd7865bd5 new error and success pages for google auth and also spinner fixed for update manager 2015-03-06 17:13:09 +08:00
manson 470d1b2405 display calendar 2015-03-06 12:41:51 +08:00
nccu 8d3d086629 fix search word 2015-03-06 12:39:30 +08:00
manson eaa63cc5aa enable calendar 2015-03-06 12:34:54 +08:00
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +08:00
nccu 007a46a373 help designer fix 2015-03-06 10:49:48 +08:00
Harry Bomrah e881d02bee fix 2015-03-04 20:43:01 +08:00
Harry Bomrah b53a7508f5 again small fix for js 
Conflicts:
	app/views/admin/members/show.html.erb
 2015-03-04 20:37:44 +08:00
Harry Bomrah 8e7319b3c3 fixed js 2015-03-04 20:31:33 +08:00
Harry Bomrah 2942ab8563 small fix in js for google connect 2015-03-04 20:17:39 +08:00
Harry Bomrah ed3308abbb google oauth added and also preferences 2015-03-04 18:31:36 +08:00
Harry Bomrah 2d1f9cb1ab Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-02-26 14:56:06 +05:30
Harry Bomrah 5773d49218 small fix for datepicker 2015-02-26 14:53:55 +05:30
Harry Bomrah 3e1032f801 fixed date and time for announcement and news 2015-02-26 14:53:55 +05:30
Ray eb21f6535c store css 2015-02-26 15:11:38 +08:00
Ray 5f90be20a2 update Templates storn & Module storn UI 2015-02-26 15:09:42 +08:00
Ray d64dc336a5 use CDN 
change jquery, Bootstrap and font-awesome url to CDN
 2015-02-26 15:06:45 +08:00
Ray aef48fe890 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-02-26 15:01:31 +08:00
Ray f3e9679e54 增加右上角的新增按鈕 
使用方式是當 render filter 在最後放個 true
範例：<%=  render_filter @filter_fields, "index_table", true %>
 2015-02-26 15:01:06 +08:00
nccu 95da400843 help designer to push code 2015-02-25 11:41:53 +08:00
JiangRu 17213fb41f if no data , hide title&table 2015-02-25 11:06:58 +08:00
nccu f41f128154 fix by Designer 2015-02-24 14:19:36 +08:00
Harry Bomrah 9862722252 url fixed for license 2015-02-09 15:09:16 +05:30
spen e616c4b947 fix member pic name 2015-01-20 15:27:43 +08:00
Harry Bomrah 5b570fe8a1 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-09 17:44:49 +08:00
spen 92575e01fa fix member plugins 2015-01-09 16:13:17 +08:00
Harry Bomrah e1a80e496a Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-08 23:06:25 +08:00
Harry Bomrah 5087a54daa fixed a small bug with no categories enabled. 2015-01-08 23:04:14 +08:00
Harry Bomrah ceb110e030 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-07 16:13:19 +08:00
rulingcom 6b469e78fd info json added to gallery 2015-01-07 16:09:47 +08:00
Harry Bomrah fea7113cd1 removed joshua from db 2015-01-07 15:02:00 +08:00
rulingcom 1c65e90699 small fix 2015-01-06 15:46:39 +08:00
rulingcom f1acfa34ac template default modified 2015-01-06 15:23:29 +08:00
Harry Bomrah 12107376b6 fix for restarting server 2014-12-31 16:41:47 +08:00
Harry Bomrah ceca2c58c0 fix for module permissions 2014-12-31 16:33:33 +08:00
Harry Bomrah 343294858e fix for non registered site and module update button 2014-12-31 15:27:18 +08:00
JiangRu 487d84c1d1 help designer's to push code 2014-12-31 15:16:24 +08:00
JiangRu 4425063a68 add module update button 2014-12-31 15:13:49 +08:00
JiangRu 76397de5ef fix member list 2014-12-31 10:11:39 +08:00
Ray 380e2cd4f9 License Denied. 2014-12-30 20:40:45 +08:00
Harry Bomrah 6e27bbd483 module store changes 2014-12-30 18:38:11 +08:00
Harry Bomrah c8d395aca1 fixed tags and also some store commits 2014-12-28 14:43:34 +08:00
Harry Bomrah 4575fce2a9 counter added and also some changes for store 2014-12-26 16:55:28 +08:00
JiangRu aac9135149 member plugin front page show 2014-12-26 16:23:51 +08:00
JiangRu 207fc9c0f8 fix member plugin intro or complete list & fix journal all author 2014-12-26 16:20:47 +08:00
JiangRu 71ea2eb2dd fix menu tag 2014-12-26 10:26:40 +08:00
Harry Bomrah e3e15a1ef2 fix for all members 2014-12-19 17:53:24 +08:00
Harry Bomrah fc184a7cea fix for members category 2014-12-19 17:14:31 +08:00
Harry Bomrah f19ce9b961 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	Gemfile
	app/controllers/pages_controller.rb
	app/views/orbit_bar/index.html.erb
 2014-12-19 16:41:15 +08:00
Harry Bomrah f62b3c7ae4 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2014-12-19 16:35:02 +08:00
Harry Bomrah 2402f953f0 fixed member categories all problem 2014-12-19 16:33:23 +08:00
Harry Bomrah e21ad257ff some changes in sdk for ad_banner 2014-12-18 20:04:38 +08:00
JiangRu 2ae34f1cbc fix journal all author 2014-12-18 16:08:34 +08:00
Harry Bomrah 1da348f747 some mods for calendar 2014-12-16 19:34:29 +08:00
Harry Bomrah adbbd044ef import modified 2014-12-11 15:01:42 +08:00
Harry Bomrah b11299a667 import modified 2014-12-10 19:28:40 +08:00
Harry Bomrah 54fd95163b lot of fixes and experience enhancement 2014-12-10 18:14:45 +08:00
Harry Bomrah 84308c3d10 category enhancements 2014-12-10 18:13:51 +08:00
Harry Bomrah 4b86270725 some category disable improvements 2014-12-10 18:13:51 +08:00
Harry Bomrah 4415093ce2 lot of fixes and experience enhancement 2014-12-10 18:09:50 +08:00
Harry Bomrah 05852ed09f category enhancements 2014-12-09 22:00:40 +08:00
Harry Bomrah e521e1ea26 some category disable improvements 2014-12-09 21:25:51 +08:00
nccu 568b6d3a46 update index3 2014-12-09 15:08:45 +08:00
Harry Bomrah 7947a45413 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	lib/orbit_tag/taggable.rb
 2014-12-08 19:02:06 +08:00
Harry Bomrah 8b7a139dc2 module page modified 2014-12-08 18:29:21 +08:00
Harry Bomrah 934edc5f81 removes uninstalled modules and also attemp to bundle install fast 2014-12-08 18:11:10 +08:00
Harry Bomrah b9a6e6fe05 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2014-12-08 15:54:03 +08:00
Harry Bomrah 8b2e88be0a added is user sub manager 2014-12-08 15:52:37 +08:00
Harry Bomrah 075ae1b135 site type added 2014-12-08 15:08:59 +08:00
rulingcom 5c33fa0ddb sdk changes 2014-12-08 14:54:40 +08:00
Harry Bomrah 96cf61f688 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2014-12-04 15:56:15 +08:00
Harry Bomrah a89e06087a store registration form changes 2014-12-02 21:10:15 +08:00
Harry Bomrah e791339c4e fix for frontend authorization 2014-12-01 22:00:42 +08:00
Harry Bomrah 79554de201 edit button 2014-12-01 21:40:15 +08:00
Harry Bomrah 59d491c199 change for edit url in frontend 2014-12-01 21:17:20 +08:00
Harry Bomrah 4712a1f4ff test 3 2014-12-01 19:41:53 +08:00
Harry Bomrah 8663cf3699 fix for update manager 2014-12-01 19:40:48 +08:00
Harry Bomrah d0f35af7d5 test 2 2014-12-01 19:39:08 +08:00
Harry Bomrah 4511b11d99 fix for update manager 2014-12-01 19:37:59 +08:00
Harry Bomrah a33022cb4f test for update manager 2014-12-01 19:35:12 +08:00
Harry Bomrah 0526b5f9e7 update manager fix 2014-12-01 19:32:09 +08:00
Harry Bomrah 4b13800007 some update for page settings 2014-12-01 19:11:40 +08:00
Harry Bomrah ed36c3a48f added category to page model 2014-12-01 18:07:23 +08:00
Harry Bomrah 5e789bd473 fix for multi language 2014-12-01 15:06:26 +08:00
Harry Bomrah ff17799e83 small fix 2014-12-01 14:48:39 +08:00
Harry Bomrah eeebed8d7b small fix 2014-11-27 18:28:37 +08:00
Harry Bomrah 179a14d717 fixed url target issue 2014-11-27 18:19:43 +08:00
Harry Bomrah 03822379b2 small fix for page render 2014-11-27 18:09:18 +08:00
Harry Bomrah 0623541d94 now only registered websites can update via update manager 2014-11-24 18:21:00 +08:00
rulingcom 466f08d4f6 second check 2014-11-24 18:00:13 +08:00
rulingcom a17a5aeb8b test commit for access check 2014-11-24 16:44:32 +08:00
Harry Bomrah 212f612e3e fixed uri parsing and also some page controller changes 2014-11-21 17:25:02 +08:00
Harry Bomrah d58090816e fix for language 2014-11-20 17:36:37 +08:00
Harry Bomrah 97b4ad95e0 fix for language while creating pages 2014-11-20 17:06:15 +08:00
Harry Bomrah a1df9c5af3 some changes for desktop 2014-11-18 19:08:17 +08:00
Harry Bomrah f3000d1947 added active and survey module templates 2014-11-17 18:20:10 +08:00
Harry Bomrah 1a3b7d43d1 optimization for authorization 2014-11-14 17:00:42 +08:00
Harry Bomrah 6192cff3a1 fixed authorizations 2014-11-14 17:00:42 +08:00
Harry Bomrah 46ec4be6a2 optimization for authorization 2014-11-13 21:50:08 +08:00
Harry Bomrah 58bea99430 fixed authorizations 2014-11-13 19:50:19 +08:00
nccu 639c398e41 update ipv4 & 6 block 2014-11-13 17:38:44 +08:00
Harry Bomrah dd4c9fc587 Merge branch 'master' into nccu 
Conflicts:
	.gitignore
 2014-11-13 16:48:09 +08:00
rulingcom b5233da7e8 removed script form html sdk 2014-11-13 16:35:29 +08:00
Harry Bomrah f13312ddb6 mod for ad_banner 2014-11-13 16:31:10 +08:00
nccu e1a716f81d alert for page not available in language 2014-11-13 16:24:30 +08:00
spen d836ded7f3 fix member frontend show fields 2014-11-13 11:56:50 +08:00
nccu 7dd20cafa0 update css 2014-11-13 11:22:08 +08:00
rulingcom 63b08335fa sdk changes 2014-11-12 19:00:18 +08:00
Harry Bomrah bbe44022c4 html_safe rendering 2014-11-12 16:17:08 +08:00
nccu 5d11d95ca9 update session time 2014-11-11 17:46:11 +08:00
nccu 731b55249d update template 2014-11-11 16:30:27 +08:00
nccu 018557ba41 update template 2014-11-11 15:48:55 +08:00
nccu a6ac7f9eeb fix orbit_helper widget_tags overrides page_tags 2014-11-11 13:50:48 +08:00
nccu 925001ca3f update tag 2014-11-11 10:55:21 +08:00
nccu 527648da0a update template 2014-11-10 16:42:09 +08:00
spen fa5ba42034 Add Active Event frontend index page 2014-11-10 10:40:35 +08:00
nccu 3eaf3914ca update template 2014-11-10 10:05:02 +08:00
nccu 57a40a47ad update template 2014-11-07 19:52:31 +08:00
nccu 9de2740b9f update template 2014-11-07 17:37:44 +08:00
nccu 50fdb0b350 fix vendor modules 2014-11-07 16:50:11 +08:00
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +08:00
Harry Bomrah 3a1fb9c72b fix for pagination and also added data-module in body 2014-11-05 17:25:28 +08:00
Harry Bomrah e73ebe9037 some update for announcement_widget_link template 2014-11-04 15:53:03 +08:00
Harry Bomrah 0e2bd7b71f a small fix for locales for ajax 2014-11-03 20:39:16 +08:00
Harry Bomrah 067f7b18e5 added some method in orbit helper and some mods 2014-11-03 20:00:59 +08:00
Harry Bomrah 2404e117d0 fixed template change script 2014-11-03 14:12:20 +08:00