developers/orbit-basic

0 Fork 0

T

chris 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back

Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb

2013-01-14 17:46:27 +08:00

Merge branch 'back' of github.com:Rulingcom/orbit into back

2013-01-14 17:46:27 +08:00

Add mobile but remove news in it

2013-01-14 17:38:44 +08:00

fixed empty db bug

2012-12-07 04:21:27 +08:00

init rails 2.3.2

2009-05-08 00:53:18 +08:00

add ad_banner inner page,pic title.

2013-01-09 16:54:33 +08:00

merge

2012-10-01 21:09:09 +08:00

Put impressionist delayed job in a patch

2013-01-08 12:45:15 +08:00

Fix link for ad_banner

2013-01-07 00:36:48 +08:00

remove useless script

2011-04-13 19:18:40 +08:00

First version of Solr search.

2012-08-08 10:59:55 +08:00

fixed empty db bug

2012-12-07 04:21:27 +08:00

New and Announcement search. Disabled impression.

2012-07-20 15:47:40 +08:00

Fix the tooltips

2013-01-11 12:13:16 +08:00

.gitignore

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

.rspec

Merge with sub_roles

2011-12-23 18:34:21 +08:00

config.ru

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

dump.rdb

New and Announcement search. Disabled impression.

2012-07-20 15:47:40 +08:00

Gemfile

member roles edit

2013-01-14 17:02:51 +08:00

Guardfile

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

2012-10-30 10:11:51 +08:00

Rakefile

God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.

2012-05-08 11:41:58 +08:00

README.md

Update README

2011-04-13 19:06:09 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4