Commit Graph

21 Commits

Author SHA1 Message Date
Harry Bomrah 78399d4f91 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-07-03 20:42:05 +08:00
rulingcom dd3b4f0384 sdk update for groups and orbit_bootstrap by joshua 2015-06-24 18:09:59 +08:00
rulingcom ed24126648 joshuas update for sdk and grou 2015-06-05 19:05:01 +08:00
rulingcom 98ec676197 joshua commit for groups and orbit bar again 2015-05-28 14:27:27 +08:00
Harry Bomrah 3772e350ba now can insert word to ckeditor directly and also fixed looping problem for freego software. 2015-05-15 21:33:11 +08:00
Harry Bomrah a4081d40b2 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-05-05 18:13:41 +08:00
Harry Bomrah 7654fc7f23 language in orbit bar fixed 2015-05-05 18:08:57 +08:00
nccu fcbb04ccc5 help designer IE8 fix 2015-03-23 16:12:26 +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 ceb110e030 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-07 16:13:19 +08:00
Harry Bomrah c8d395aca1 fixed tags and also some store commits 2014-12-28 14:43:34 +08:00
nccu e1a716f81d alert for page not available in language 2014-11-13 16:24:30 +08:00
nccu 7dd20cafa0 update css 2014-11-13 11:22:08 +08:00
Harry Bomrah 0095e41b46 changed orbit bar for backend ... added preview to layouts for widgets and index ... also fixed alot of bugs.. 2014-07-25 20:11:51 +08:00
manson 3c2260c158 Fix orbit-bar css 2014-05-29 17:21:55 +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
manson 1f9ab39a09 Update orbit-bar design by Ray 2014-05-26 14:23:12 +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 f220130f88 finished widget more and item links .. made method in orbit helper.. now the method finds best suitable page for the item in widget. 2014-05-24 19:35:06 +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