6 Commits

Author	SHA1	Message	Date
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
Matthew K. Fu JuYuan	d047a3d62a	chris tags update	2013-04-26 11:26:10 +08:00
Matt K. Fu	c68c563fb0	fix qa problem	2013-04-25 20:37:13 +08:00
Spen	0734f73291	faq show fix	2013-04-17 14:25:05 +08:00
chris	3e96cfe514	Changes for FAQ to work with not latest but stable code	2013-03-28 15:05:52 +08:00
Spen	468555a037	faq app	2013-03-28 14:09:29 +08:00