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

34 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 25eb95672a joshua mods for calendar accessbility 2015-06-03 18:17:58 +08:00
Harry Bomrah 2508d70883 calendar widget and frontend fix 2015-06-02 17:22:05 +08:00
rulingcom a3033c548b mods by joshua for groups and calendar and etc sdk 2015-06-01 16:15:07 +08:00
rulingcom 017be3eb3d joshua commit for groups, sdk and orbit_bar 2015-05-18 16:26:22 +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
rulingcom 804030751f big commit from joshua for orbit_bootstrap sdk and groups 2015-04-28 18:34:40 +08:00
rulingcom 5aac9b297d merged 2015-04-14 15:31:41 +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
rulingcom e1c8d61195 sdk precompile fixed 2015-03-23 17:39:58 +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 338824a509 addes bootstrap back 2015-03-12 19:06:42 +08:00
rulingcom 16dae228b1 sdk updates from joshua 2015-03-11 16:18:56 +08:00
rulingcom 7aa187497a sdk changes by joshua wq 2015-03-06 17:21:38 +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
rulingcom 1c65e90699 small fix 2015-01-06 15:46:39 +08:00
rulingcom f1acfa34ac template default modified 2015-01-06 15:23:29 +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 b9a6e6fe05 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2014-12-08 15:54:03 +08:00
rulingcom 5c33fa0ddb sdk changes 2014-12-08 14:54:40 +08:00
Harry Bomrah dd4c9fc587 Merge branch 'master' into nccu 
Conflicts:
	.gitignore
 2014-11-13 16:48:09 +08:00
rulingcom 63b08335fa sdk changes 2014-11-12 19:00:18 +08:00
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +08:00
Harry Bomrah 067f7b18e5 added some method in orbit helper and some mods 2014-11-03 20:00:59 +08:00
manson 766b1482b6 Update personal-plugin frontend 2014-08-01 19:51:41 +08:00
rulingcom 2e1680cbac Update template by Ray 2014-07-16 10:17:33 +08:00
rulingcom ba3219c704 Update orbit_bootstrap template 2014-07-07 16:20:31 +08:00
rulingcom 14402d44fa Update design by Ray 2014-06-30 17:06:22 +08:00
rulingcom def05eb1fb commit for ray ... modified lot of template and stuff. 2014-06-04 16:57:52 +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 a72d5fbb48 change in parser and new template for 4.5 
Conflicts:
	app/controllers/admin/dashboards_controller.rb
	config/application.rb
 2014-05-02 18:26:21 +08:00