Go to file

Christophe Vilayphiou e88b09cf72 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit Conflicts: app/controllers/pages_controller.rb app/views/layouts/_side_bar.html.erb lib/parsers/parser_common.rb vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendor/built_in_modules/gallery/config/locales/en.yml vendor/built_in_modules/gallery/config/locales/zh_tw.yml		2012-09-12 02:21:18 +08:00
app	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-12 02:21:18 +08:00
config	frontend commits	2012-09-12 02:12:15 +08:00
db	upgrade to rails3, but grip is broken	2010-03-08 16:04:05 +08:00
doc	init rails 2.3.2	2009-05-08 00:53:18 +08:00
lib	front ends updates	2012-09-12 02:12:15 +08:00
log	tmp commit for search. start nccu0621 first	2012-06-22 11:34:10 +08:00
public	Merge branch 'nccu_master' into demo_site	2012-08-22 18:07:49 +08:00
script	remove useless script	2011-04-13 19:18:40 +08:00
solr/conf	First version of Solr search.	2012-08-08 10:59:55 +08:00
spec	fixing for app_auth	2012-01-05 16:20:51 +08:00
tmp	New and Announcement search. Disabled impression.	2012-07-20 15:47:40 +08:00
vendor	minor fix for sidebar	2012-09-12 02:14:50 +08:00
.gitignore	Merge branch 'nccu_master' into demo_site	2012-08-22 18:07:49 +08:00
.rspec	Merge with sub_roles	2011-12-23 18:34:21 +08:00
Gemfile	Merge branch 'nccu_master' into demo_site	2012-08-22 18:07:49 +08:00
Gemfile.lock	Merge branch 'nccu_master' into demo_site	2012-08-22 18:07:49 +08:00
README.md	Update README	2011-04-13 19:06:09 +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
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

README.md

Ruling Orbit

RulingSite-s Version 4