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

26 Commits

Author SHA1 Message Date
Harry Bomrah 3362601b1f Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	lib/orbit_model/impression.rb
 2015-03-30 15:22:03 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +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
rulingcom 16dae228b1 sdk updates from joshua 2015-03-11 16:18:56 +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
Harry Bomrah ed3308abbb google oauth added and also preferences 2015-03-04 18:31:36 +08:00
nccu 95da400843 help designer to push code 2015-02-25 11:41:53 +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 54fd95163b lot of fixes and experience enhancement 2014-12-10 18:14:45 +08:00
Harry Bomrah 4415093ce2 lot of fixes and experience enhancement 2014-12-10 18:09:50 +08:00
nccu e1a716f81d alert for page not available in language 2014-11-13 16:24:30 +08:00
Harry Bomrah 0cff91594c member update modified and h2 tag in orbit bar 2014-10-22 14:51:14 +08:00
Harry Bomrah 384cc4d6f4 fix for chinese simplified and also new user added 2014-10-21 15:27:43 +08:00
Harry Bomrah 051b165298 fixed orbit bar lanugage and menu 2014-10-20 19:50:16 +08:00
manson ef55afceae update site search setting 2014-09-11 19:08:39 +08:00
Harry Bomrah 856b590e1b fixed delete and update user issue and also the language switch 2014-09-11 18:19:48 +08:00
manson 3435a7bfd3 update login redirect to referer url and fix check_user_can_use method 2014-08-15 10:29:17 +08:00
manson 5f50d59333 fix switch_language 2014-08-08 11:46:21 +08:00
manson a8f2112e39 Add edit_password button and member_profile button for frontend orbit bar 2014-07-22 09:58:41 +08:00
manson 1492e6e9e8 Add zh_cn, working but it's hard code 2014-07-09 10:05:02 +08:00
Harry Bomrah 23aef52422 now names saved in all locales while signup. added orbit site logo and also now favicon is rendered and orbit bar logo rendered. 2014-05-27 18:18:23 +08:00
Harry Bomrah 5773a826e4 changed name method of member profile and also changed name in orbit bar 2014-05-26 16:48:06 +08:00
manson 1f9ab39a09 Update orbit-bar design by Ray 2014-05-26 14:23:12 +08:00
manson f6adbaa4e0 Update sit initialize 2014-05-26 12:57:47 +08:00
manson 4830a9a7b8 Orbit bar search done, fix site language seting for new checkbox js, fix orbit-boostrap template memu, translations 2014-05-25 20:47:44 +08:00
Harry Bomrah 6eabe36cb3 added orbit bar in frontend .. orbit bar for frontend completely working for frontend except search 2014-05-24 17:12:19 +08:00