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

241 Commits

Author SHA1 Message Date
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
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 9da0c9f380 small member fix 2014-10-29 21:27:53 +08:00
Harry Bomrah 9eebd2ff51 store for module store 2014-10-28 19:18:59 +08:00
Harry Bomrah 9d42b6fcda store url fix 2014-10-28 17:59:41 +08:00
Harry Bomrah 75d8c46576 module store 2014-10-28 16:46:11 +08:00
Harry Bomrah 12b38691b0 url change for store 2014-10-27 19:10:42 +08:00
Harry Bomrah 5766c6355f orbit store integration 2014-10-27 19:07:01 +08:00
Harry Bomrah 50582cdbd8 back to in use locales for pages and links 2014-10-24 15:15:13 +08:00
Harry Bomrah a81f7576b6 trying to restart the server after language change 2014-10-24 14:49:23 +08:00
Harry Bomrah 97e8aaea2b fix for no modules and added gotcha for ask module 2014-10-23 17:07:01 +08:00
Harry Bomrah 24b24ad760 fix for member import save.. removed validation 2014-10-22 15:20:43 +08:00
Harry Bomrah 0cff91594c member update modified and h2 tag in orbit bar 2014-10-22 14:51:14 +08:00
Harry Bomrah 9c19a4a2fd added non approved users can view profile and not rest of system 2014-10-20 18:50:36 +08:00
Harry Bomrah e27192295d user save bug fixed 2014-10-16 15:14:37 +08:00
Harry Bomrah 1f088692aa new member password restriction removed 2014-10-15 17:13:32 +08:00
Harry Bomrah d0781dea4a imported announcements are now by default approved 2014-10-14 17:08:06 +08:00