Bernie Chiu 1f4502185c Merge ...

Conflicts:

	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb

2013-11-04 10:15:50 +08:00

..

ad_banner

Changes in I18n (except personal_conference and personal_journal)

2013-03-12 18:13:48 +08:00

announcement

announcement init sorting fix

2013-10-11 17:40:20 +08:00

archive

Changes for NTU General Affairs

2013-09-13 15:10:27 +08:00

ask_new

Add departments links for deployed server

2013-10-18 16:31:20 +08:00

calendar

fixed updated method of events.. was having week error when updating events

2013-06-26 12:27:23 +08:00

faq

Fixed untracked files

2013-09-13 15:43:13 +08:00

gallery

fixed frontend

2013-07-23 18:32:24 +08:00

location

Fixed Locale settings for location navigation

2013-09-13 12:44:13 +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

Changes for NTU General Affairs

2013-09-13 15:10:27 +08:00

personal_book

queries need to be rethink

2013-05-03 12:12:19 +08:00

personal_conference

Changes for queries

2013-05-03 12:12:19 +08:00

personal_diploma

Changes for queries

2013-05-03 12:12:19 +08:00

personal_experience

Changes for queries

2013-05-03 12:12:19 +08:00

personal_honor

Changes for queries

2013-05-03 12:12:19 +08:00

personal_journal

questionnaire stuff

2013-06-06 18:29:58 +08:00

personal_lab

Changes for queries

2013-05-03 12:12:19 +08:00

personal_patent

Changes for queries

2013-05-03 12:12:19 +08:00

personal_project

Changes for queries

2013-05-03 12:12:19 +08:00

personal_research

Changes for queries

2013-05-03 12:12:19 +08:00

survey

Merge

2013-11-04 10:15:50 +08:00

survey_b

fix survey_b result and export value ( float )

2013-10-15 11:43:08 +08:00

video

Updated Video with frontend widget and backend widget working

2013-07-31 13:52:24 +08:00

web_resource

Change get_item

2013-07-19 18:39:13 +08:00