orbit-basic/vendor/built_in_modules
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
..
ad_banner New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
announcement Fix tooltip in form 2013-07-22 20:54:40 +08:00
archive Fix tooltip in form 2013-07-22 20:54:40 +08:00
ask ask module change mail view: <p>此為系統自動發信,請勿直接回覆</p> 2013-06-07 13:04:00 +08:00
asset New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
authorization New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
calendar_new removed old calendar and updated new calendar event category 2013-07-23 12:13:02 +08:00
faq removed old calendar and updated new calendar event category 2013-07-23 12:13:02 +08:00
gallery Removed the category reference for now 2013-07-19 17:38:43 +08:00
location Updated zh_tw translation for sidebar labels 2013-07-22 12:17:31 +08:00
member Changes for queries 2013-05-03 12:12:19 +08:00
member_staff ntu dropdown fix member staff css 2013-05-14 14:19:56 +08:00
miss_module/config/locales member plugin init edit 2013-02-21 17:53:08 +08:00
page_content New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_book New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_conference New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_diploma New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_experience New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_honor New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_journal New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_lab New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_patent New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_project New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
personal_research New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
survey survey module: ensure the commit 2013-06-14 15:25:58 +08:00
tag New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
web_resource archive and web_resouce for new ui 2013-07-22 18:14:33 +08:00