orbit-basic/vendor/built_in_modules/calendar_new
saurabhbhatia 7e3993b67f removed old calendar and updated new calendar event category
Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
	vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
	vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb
2013-07-23 12:13:02 +08:00
..
app removed old calendar and updated new calendar event category 2013-07-23 12:13:02 +08:00
config updated with fullcalendar.css, added front end page 2013-07-23 12:12:34 +08:00
lib new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
script new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
test new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
.gitignore new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
Gemfile new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
MIT-LICENSE new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
README.rdoc new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
Rakefile new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
calendar_new.gemspec new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
calendar_new.json new ui for calendar fixed. 2013-07-23 12:12:25 +08:00
init.rb Fixed the sidebar order in calendar module 2013-07-23 12:12:55 +08:00

README.rdoc

= Calendar

This project rocks and uses MIT-LICENSE.