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

12 Commits

Author SHA1 Message Date
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 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
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
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