orbit-basic/vendor/built_in_modules
iCross 7ba0977e16 stuff
Conflicts:

	vendor/built_in_modules/survey/app/views/panel/survey/front_end/surveys/show.html.erb
2013-06-06 18:38:22 +08:00
..
ad_banner Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
announcement add search to archive 2013-06-05 18:03:09 +08:00
archive add search to archive 2013-06-05 18:03:09 +08:00
calendar chris tags update 2013-04-26 11:26:10 +08:00
faq Changes for queries 2013-05-03 12:12:19 +08:00
gallery Changes for queries 2013-05-03 12:12:19 +08:00
location fix member sidebar 2013-02-06 17:44:38 +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 fix design index bug when start start from blank DB. 2013-05-23 12:07:43 +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 stuff 2013-06-06 18:38:22 +08:00
web_resource Changes for queries 2013-05-03 12:12:19 +08:00