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

122 Commits

Author SHA1 Message Date
nccu fcbb04ccc5 help designer IE8 fix 2015-03-23 16:12:26 +08:00
Harry Bomrah 25bf24745c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-18 18:01:00 +08:00
Harry Bomrah 2432a587d5 css mods for archive 2015-03-18 17:59:36 +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
rulingcom e045025bc6 precompile fixes for orbit mobile template 2015-03-06 17:59:30 +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
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +08:00
Harry Bomrah ed3308abbb google oauth added and also preferences 2015-03-04 18:31:36 +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
Ray eb21f6535c store css 2015-02-26 15:11:38 +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
JiangRu 487d84c1d1 help designer's to push code 2014-12-31 15:16:24 +08:00
Ray 380e2cd4f9 License Denied. 2014-12-30 20:40:45 +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
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 e21ad257ff some changes in sdk for ad_banner 2014-12-18 20:04:38 +08:00
Harry Bomrah 4b86270725 some category disable improvements 2014-12-10 18:13:51 +08:00
Harry Bomrah e521e1ea26 some category disable improvements 2014-12-09 21:25:51 +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 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
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
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +08:00
Harry Bomrah 9eebd2ff51 store for module store 2014-10-28 19:18:59 +08:00
Harry Bomrah 99305b19ca small fix store 2014-10-28 18:18:06 +08:00
Harry Bomrah eb6a48bc84 small fix 2014-10-28 18:15:10 +08:00
Harry Bomrah 59731acccf UX enhancement for module store 2014-10-28 18:08:23 +08:00
Harry Bomrah d65df694a5 fixed js for email resend button 2014-10-28 17:56:58 +08:00
Harry Bomrah 75d8c46576 module store 2014-10-28 16:46:11 +08:00
Harry Bomrah 5766c6355f orbit store integration 2014-10-27 19:07:01 +08:00
Harry Bomrah 24a07a5780 widget title and page title fixed for page 2014-10-13 18:04:51 +08:00
Harry Bomrah f3dd0b8295 modified select scss.. 2014-10-08 17:11:02 +08:00
Harry Bomrah 1467eb039d fixed filemanager.js for urls 2014-10-06 18:43:44 +08:00
Harry Bomrah c2fe693ceb date formating made easy for designers and also sitemap style changed 2014-10-01 16:12:38 +08:00
Harry Bomrah 23bead2b5d fixed problem of sitemap sorting and also import modules dont go back after importing. also added sitemap for google crawler. 2014-09-26 17:10:17 +08:00
Harry Bomrah e558b916fe fixed widget text image insert problem with chinese and also page import is changed to per page 2014-09-17 17:25:47 +08:00
Harry Bomrah b94f3ca2a1 fixed insert image problem in text for widget 2014-09-16 22:28:48 +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 39cb82e83d fix site structure main-enable checkboxes 2014-08-15 12:08:43 +08:00
manson 04272588d3 hide html element with class name "ui-helper-hidden-accessible" 2014-08-12 12:18:22 +08:00
Harry Bomrah bbc171fc7c desktop mods with new layout stuff 2014-08-08 18:08:26 +08:00
Ray df934ae584 desktop mods 
Conflicts:
	config/routes.rb
 2014-08-08 18:08:26 +08:00
Harry Bomrah a52239b135 a small link click bug fixed 2014-08-06 18:37:02 +08:00
Harry Bomrah 56e18cd040 fixed authorization bug and also added select and deselect for member selection 2014-08-06 18:27:54 +08:00