Commit Graph

1117 Commits

Author SHA1 Message Date
iCross 8541033ba9 ask module: send mail on development 2013-06-07 13:04:00 +08:00
iCross 467c2e8a3c ask module: fix 2013-06-07 13:04:00 +08:00
iCross b0640f925b ask module: fix some 2013-06-07 13:04:00 +08:00
iCross 841fa10c55 ask module: add rescue ackknowledgement 2013-06-07 13:04:00 +08:00
iCross dcc5fc39a7 ask module: dropdown, icon, big5 encoding, redirect, admin, send mail 2013-06-07 13:03:59 +08:00
iCross 97df100c64 remove department 2013-06-07 13:03:59 +08:00
iCross ce180839f0 finish ask module 2013-06-07 13:03:59 +08:00
iCross b6c8a88b73 Merge branch 'lukas/picked_archive' into development 2013-06-06 22:27:08 +08:00
iCross 5b7ac1a22b archive module: add sort feature to achive files 2013-06-06 22:20:27 +08:00
Matt K. Fu d5109c837c Merge branch 'lukas/picked_ques' into development 2013-06-06 19:59:30 +08:00
iCross c63ac751ea archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb 2013-06-06 19:20:21 +08:00
iCross 8c1e65994a Merge branch 'clean_development' into lukas/picked_ques 2013-06-06 19:08:59 +08:00
iCross f9a148c901 survey module: move down/up i18n
Conflicts:

	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
2013-06-06 18:46:52 +08:00
iCross 5ea0c5bd5c survey module: result chart display only other
Conflicts:

	config/environments/production.rb
2013-06-06 18:45:29 +08:00
iCross ec173c4ce1 fix 2013-06-06 18:42:12 +08:00
iCross ba7d6558ee fix 2013-06-06 18:42:00 +08:00
iCross 88c57e0b0c fix 2013-06-06 18:41:48 +08:00
iCross d4962d20b3 fix 2013-06-06 18:41:36 +08:00
iCross 21bf3a0ccd standalone css and icon 2013-06-06 18:41:27 +08:00
iCross cf0d7cfc64 new export csv table
Conflicts:

	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb
2013-06-06 18:40:28 +08:00
iCross 15347f25dc fix 2013-06-06 18:38:59 +08:00
iCross 443d1c4fbe csv stats & required start 2013-06-06 18:38:47 +08:00
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
Lukas b659c7021d bug fix and add feature 2013-06-06 18:31:09 +08:00
Lukas 515185d87c ques: fix submit 2013-06-06 18:30:54 +08:00
Lukas adc15951bb questionnaire stuff
Conflicts:

	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
Lukas 32c259ac9e survey: remain stuff 2013-06-06 18:27:05 +08:00
Lukas 51640423a7 survey module initial 2013-06-06 18:26:41 +08:00
Matt K. Fu 7729161123 fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up. 2013-06-06 17:38:17 +08:00
chris 253cca06cc New widget for tag cloud 2013-06-06 17:17:45 +08:00
Matt K. Fu 30824d1620 add search to archive 2013-06-05 18:03:09 +08:00
Matt K. Fu 54a35b30be fix design index bug when start start from blank DB.
add delay impressionist.
add several i18n vars
2013-05-23 12:07:43 +08:00
Matt K. Fu 3d0a1cef56 1.fix for syntax error.
2.Making production console works.
3.Making blank site member no errors.
2013-05-22 16:25:12 +08:00
Spen 4a5256bf4f ntu dropdown fix member staff css 2013-05-14 14:19:56 +08:00
Spen 5b368235e8 ntu dropdown fix list sort 2013-05-14 14:19:55 +08:00
Spen b8da40b4ae ntu_dropdown_fix 2013-05-14 14:19:55 +08:00
chris c2331695cd Set order of page context to match the order of structure
Add some params to keep the sorting
2013-05-07 11:15:30 +08:00
chris 127ab3845c Changes for queries 2013-05-03 12:12:19 +08:00
chris 167a71272a queries need to be rethink 2013-05-03 12:12:19 +08:00
Matt K. Fu caf0426bd4 bulletin search 2013-05-01 12:16:28 +08:00
Matt K. Fu 64101109dd disable all sorted_tags 2013-04-26 18:07:59 +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 697944a029 user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
Harry Bomrah 11067ef34f english mandatory removed from albums 2013-04-23 11:09:43 +08:00
Spen 536f0d30af apps_translate_fix 2013-04-23 11:09:20 +08:00
Harry Bomrah 38d5a193e0 tiny scrollbar trigger fixed and devin branch merged 2013-04-17 14:31:09 +08:00
Spen c94a86c3a4 web_resource rake web_link_url:web_link_url_i18n 2013-04-17 14:29:04 +08:00
devin chen 055d758769 Page Loading Effect
tinyscrollbar has problem
2013-04-17 14:27:18 +08:00
Spen 0734f73291 faq show fix 2013-04-17 14:25:05 +08:00
Harry Bomrah d288972035 stupid commit 2013-04-17 14:19:32 +08:00
Harry Bomrah bc0477a5ed widget and gridster fixes 2013-04-17 14:16:24 +08:00
devin e7bffe4c0f devin's new branch 2013-04-17 14:14:24 +08:00
devin c8aa50ee87 Lots of Update
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-04-17 14:14:23 +08:00
Rueshyna 95805cfdee correct model method 2013-04-17 14:07:24 +08:00
Harry Bomrah 84afbfa86c section page fixed.. 2013-04-17 14:01:48 +08:00
Rueshyna 44fede2b71 fixed co author relation save button 2013-04-17 14:01:48 +08:00
Harry Bomrah 8dee211ab4 section page fixed.. 2013-04-17 14:01:14 +08:00
Rueshyna 27ad25ccca add pagination for every controller and view in personal plugin 2013-04-17 14:00:37 +08:00
Rueshyna df220397b2 make index of list can be hightline list when click cancel button 2013-04-17 12:22:04 +08:00
Rueshyna b5fd6c7a1a fixed author sample data generation and model method 2013-04-17 12:21:21 +08:00
Harry Bomrah 41643d1f61 tinyscrollbar pagination fixed 2013-04-17 12:11:33 +08:00
Rueshyna aad4119892 fixed bug 2013-04-17 12:07:11 +08:00
Harry Bomrah 6db9e70132 Major tinyscrollbar update 2013-04-17 12:04:22 +08:00
Harry Bomrah dabceec3ea all none for conf done 2013-04-17 11:23:03 +08:00
Harry Bomrah 52789fa032 all none fixed 2013-04-17 11:23:02 +08:00
Rueshyna dc68f40cb4 correct model method 2013-04-17 11:13:32 +08:00
Rueshyna 228dd1b767 fixed co author relation save button 2013-04-17 11:13:32 +08:00
Harry Bomrah dae3f069ff app manager changed plus some changes 2013-04-17 11:09:56 +08:00
Rueshyna 5f2c669568 fixed checkout and start in personal plugin 2013-04-17 11:08:58 +08:00
Rueshyna 1b12412596 correct factoried girl for journal 2013-04-17 11:08:58 +08:00
Harry Bomrah b1d7d5345e section page fixed.. 2013-04-17 11:08:58 +08:00
Fu Matthew 9815950083 now default options can be chosen by developer at init 2013-04-17 11:07:45 +08:00
Rueshyna 50449b55e8 one abstract one column for personal plugin 2013-04-17 11:07:20 +08:00
Rueshyna 00db66b8c4 add pagination for every controller and view in personal plugin 2013-04-17 11:07:20 +08:00
Harry Bomrah 401c75c0de Major tinyscrollbar update 2013-04-17 11:06:28 +08:00
Rueshyna 1ebae504dc modify translation for journal_co_author_relation button 2013-04-17 11:05:57 +08:00
Harry Bomrah 323fadc210 tinyscrollbar pagination fixed 2013-04-17 11:05:57 +08:00
Fu Matthew 69a49a69aa style for front end 2013-04-17 11:05:57 +08:00
Rueshyna 5178ce3bde modify nil of email string and sort 2013-04-17 11:04:52 +08:00
Rueshyna 95128a3465 remove redundant space of co_author sample data 2013-04-17 11:04:52 +08:00
Rueshyna 8783b8e5fe make index of list can be hightline list when click cancel button 2013-04-17 11:04:52 +08:00
Rueshyna a3de4cc2d4 fixed author sample data generation and model method 2013-04-17 11:04:52 +08:00
Rueshyna bdaef3af0f add author filter for journal and fix some bug 2013-04-17 11:04:52 +08:00
Rueshyna 625f2e9ad6 have done conference author filter, journal haven't been done, yet 2013-04-17 11:04:52 +08:00
Harry Bomrah db60a3bcfa insert and remove columns 2013-04-17 11:04:37 +08:00
Harry Bomrah a7667d586a Major tinyscrollbar update 2013-04-17 11:04:36 +08:00
Rueshyna e9ddb85734 add pagination for personal plugin 2013-04-17 10:56:49 +08:00
Harry Bomrah d840b82fa9 insert and remove columns 2013-04-17 10:56:15 +08:00
Fu Matthew 4a08a1992b 1.make module app forbid unearthed access except from admin
2.override sidebar link when it's object_auth or app_auth.
2013-04-17 10:56:15 +08:00
Rueshyna 15be80a35f fixed bug 2013-04-17 10:56:14 +08:00
Harry Bomrah 1d06bcaae7 Major tinyscrollbar update 2013-04-17 10:54:38 +08:00
Harry Bomrah 6cd97adf21 all none for conf done 2013-04-17 10:54:38 +08:00
Harry Bomrah 0189d1c2c0 all none fixed 2013-04-17 10:54:38 +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
chris da8a5123c2 Change in announcement init for query
Change in default widget query
2013-03-27 16:31:42 +08:00
chris ec1605358b Fix sorting for archive 2013-03-27 06:30:22 +08:00
chris 41311c74d0 Spen's changes in archive 2013-03-21 14:38:04 +08:00
chris 04d3e177d5 Fix typo in core lib
Change i18n for more link in announcement init
2013-03-20 17:45:08 +08:00