Go to file

Christophe Vilayphiou 619ae7e260 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit Conflicts: Gemfile.lock vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb		2012-09-14 16:05:04 +08:00
app	calendar update	2012-09-14 15:57:44 +08:00
config	break down Ray's HTML	2012-09-14 00:02:22 +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	add data_migration for rename field for attribute_field. not yet tested	2012-09-14 00:02:22 +08:00
log	tmp commit for search. start nccu0621 first	2012-06-22 11:34:10 +08:00
public	event_calendar testing	2012-09-13 23:57:47 +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	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-14 16:05:04 +08:00
.gitignore	again minor shit update	2012-09-13 23:58:32 +08:00
.rspec	Change role structure	2011-12-10 18:12:39 +08:00
Gemfile	calendar fixed	2012-09-14 15:20:01 +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