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

112 Commits

Author SHA1 Message Date
nccu 05c2465e48 add changed files on server 140.119.168.11 2015-03-06 11:53:00 +08:00
nccu 95da400843 help designer to push code 2015-02-25 11:41:53 +08:00
nccu f41f128154 fix by Designer 2015-02-24 14:19:36 +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 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 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
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 e21ad257ff some changes in sdk for ad_banner 2014-12-18 20:04:38 +08:00
Harry Bomrah 1da348f747 some mods for calendar 2014-12-16 19:34:29 +08:00
nccu 568b6d3a46 update index3 2014-12-09 15:08:45 +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
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
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 f3000d1947 added active and survey module templates 2014-11-17 18:20:10 +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
nccu 7dd20cafa0 update css 2014-11-13 11:22:08 +08:00
rulingcom 63b08335fa sdk changes 2014-11-12 19:00:18 +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 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 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 966b6ec919 added override method for widgets frontend 2014-10-31 13:41:16 +08:00
Harry Bomrah 1704232814 new json for announcement 2014-10-15 16:10:46 +08:00
spen 6af19a2fda Add Survey frontend index page 2014-10-08 09:55:51 +08:00
rulingcom a2398ed6d9 added new types for announcment module widgets 2014-09-29 21:26:19 +08:00
manson 29c3394873 fix template index page title 2014-09-10 10:17:08 +08:00
manson f4635502ef fix announcement template index page-title 2014-09-03 15:00:51 +08:00
manson a01d68e721 remove template orbit-classic 2014-08-26 16:30:42 +08:00
manson 37dae67cbe fix template announcement info.js 2014-08-12 15:39:04 +08:00
manson 9d4ed9a6ab Add new widget method for announcement 2014-08-12 11:39:20 +08:00
Harry Bomrah a1fb6ebd68 added template json for title key author 2014-08-11 16:02:58 +08:00