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

83 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
Harry Bomrah 3dc625e34f modified dob for member profile 2015-06-24 01:38:12 +08:00
rulingcom ed24126648 joshuas update for sdk and grou 2015-06-05 19:05:01 +08:00
rulingcom 25eb95672a joshua mods for calendar accessbility 2015-06-03 18:17:58 +08:00
rulingcom a3033c548b mods by joshua for groups and calendar and etc sdk 2015-06-01 16:15:07 +08:00
rulingcom 822a6932cd joshuas update for groups 2015-05-28 21:19:58 +08:00
rulingcom 98ec676197 joshua commit for groups and orbit bar again 2015-05-28 14:27:27 +08:00
rulingcom 8099a79918 joshua update for groups and orbit bar 2015-05-26 14:13:38 +08:00
Harry Bomrah 8dac8273f7 group mods.. 2015-05-20 14:17:00 +08:00
rulingcom 017be3eb3d joshua commit for groups, sdk and orbit_bar 2015-05-18 16:26:22 +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
Harry Bomrah 95704ed56e Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-30 14:40:03 +08:00
Harry Bomrah 927b08edeb fix main forms css and a user profile bug 2015-04-30 14:38:36 +08:00
rulingcom 804030751f big commit from joshua for orbit_bootstrap sdk and groups 2015-04-28 18:34:40 +08:00
Harry Bomrah 7210f46f35 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-23 17:21:10 +08:00
Harry Bomrah 0122f5aa23 small fix for member fields display 2015-04-23 17:20:08 +08:00
Harry Bomrah 0380972e5b small fix for member fields display 2015-04-23 17:19:10 +08:00
Harry Bomrah 4b6c27de75 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 22:53:52 +08:00
Harry Bomrah 97912d2d3a now can add or delete fields for the member 2015-04-22 22:53:04 +08:00
Harry Bomrah 997a3afd93 now can add or delete fields for the member 2015-04-22 22:51:30 +08:00
rulingcom 5aac9b297d merged 2015-04-14 15:31:41 +08:00
rulingcom 60bb2cac1e group mods by joshua 2015-03-31 15:51:44 +08:00
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 b290d3653f groups commit 2015-03-25 15:46:11 +08:00
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
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
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
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 f3dd0b8295 modified select scss.. 2014-10-08 17:11:02 +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 856b590e1b fixed delete and update user issue and also the language switch 2014-09-11 18:19:48 +08:00
manson 04272588d3 hide html element with class name "ui-helper-hidden-accessible" 2014-08-12 12:18:22 +08:00
Harry Bomrah e320fa848d authorization completed .. select all button for member select is left 2014-08-05 21:51:05 +08:00