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

258 Commits

Author SHA1 Message Date
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +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
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 ceb110e030 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-07 16:13:19 +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 76397de5ef fix member list 2014-12-31 10:11:39 +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 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
JiangRu 2ae34f1cbc fix journal all author 2014-12-18 16:08:34 +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
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 934edc5f81 removes uninstalled modules and also attemp to bundle install fast 2014-12-08 18:11:10 +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 8663cf3699 fix for update manager 2014-12-01 19:40:48 +08:00
Harry Bomrah 4511b11d99 fix for update manager 2014-12-01 19:37:59 +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 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
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 1a3b7d43d1 optimization for authorization 2014-11-14 17:00:42 +08:00
Harry Bomrah 46ec4be6a2 optimization for authorization 2014-11-13 21:50:08 +08:00
Harry Bomrah dd4c9fc587 Merge branch 'master' into nccu 
Conflicts:
	.gitignore
 2014-11-13 16:48:09 +08:00
Harry Bomrah f13312ddb6 mod for ad_banner 2014-11-13 16:31:10 +08:00
spen d836ded7f3 fix member frontend show fields 2014-11-13 11:56:50 +08:00
nccu 5d11d95ca9 update session time 2014-11-11 17:46: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