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
This commit is contained in:
saurabhbhatia committed 2013-07-23 12:13:02 +08:00
1 parent 8924d4f047
commit 7e3993b67f
89 files changed
+33 -3656

No files matched your search

@@ -0,0 +1 @@
$("#form > form").replaceWith("<%= j render "form" %>");
@@ -0,0 +1 @@
$("#form > form").replaceWith("<%= j render "form" %>");
@@ -0,0 +1 @@
$("#form > form").replaceWith("<%= j render "form" %>");
@@ -0,0 +1 @@
$("#form > form").replaceWith("<%= j render "form" %>");