Commit Graph

460 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 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