Commit Graph

3 Commits

Author SHA1 Message Date
Harry Bomrah 39fe8162b1 new categories for calendar with colors inside.. plus changed the working of calendar. it has now categories like all other modules 2013-11-04 14:44:20 +08:00
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
Harry Bomrah 4ff5724379 new ui for calendar fixed. 2013-07-23 12:12:25 +08:00