saurabhbhatia
|
c7cf7e1ce4
|
removed category_customizable
|
2013-07-23 12:27:01 +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 |
|
saurabhbhatia
|
8924d4f047
|
Fixed the sidebar order in calendar module
Conflicts:
vendor/built_in_modules/calendar_new/init.rb
|
2013-07-23 12:12:55 +08:00 |
|
saurabhbhatia
|
3d3d5ed144
|
updated with fullcalendar.css, added front end page
Conflicts:
vendor/built_in_modules/calendar_new/init.rb
|
2013-07-23 12:12:34 +08:00 |
 Harry Bomrah
|
4ff5724379
|
new ui for calendar fixed.
|
2013-07-23 12:12:25 +08:00 |