Bernie Chiu
|
1edc134691
|
Add back mongoid yml
|
2013-09-17 12:07:41 +08:00 |
Bernie Chiu
|
e89615a6f3
|
Fix naming error
|
2013-09-17 12:02:35 +08:00 |
thomaschen
|
0c29701f9b
|
test
|
2013-09-16 15:07:50 +08:00 |
thomaschen
|
580be0b34b
|
fix frontend ask_category error
|
2013-09-16 15:05:08 +08:00 |
Manson Wang
|
cb0f126aad
|
Fixed bugs and some modification in module "survey_b"
|
2013-09-13 15:43:34 +08:00 |
chris
|
ae79694b44
|
Survey b
|
2013-09-13 15:43:34 +08:00 |
Bernie Chiu
|
c361a7a201
|
Fix check box selections appearance
Conflicts:
vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb
|
2013-09-13 15:43:14 +08:00 |
thomaschen
|
b7bf180df2
|
fix frontend ask_category error
|
2013-09-13 15:43:14 +08:00 |
Bernie Chiu
|
71dad22b04
|
Add dynamic checkboxes
Conflicts:
vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb
|
2013-09-13 15:43:14 +08:00 |
thomaschen
|
883496ede1
|
add multi deliver request
|
2013-09-13 15:43:14 +08:00 |
Bernie Chiu
|
0a1ebf18e3
|
Add check box array
|
2013-09-13 15:43:13 +08:00 |
thomaschen
|
3f9cdec426
|
add option for dep_dns
|
2013-09-13 15:43:13 +08:00 |
thomaschen
|
24b9f4015b
|
add checkboxes for 11 dep in edit view
|
2013-09-13 15:43:13 +08:00 |
thomaschen
|
1237a111ca
|
add transfered_category if not exist. change transfered reply's status to 待處理(轉). showing request code if error.
|
2013-09-13 15:43:13 +08:00 |
Bernie Chiu
|
64e14d42e2
|
Allow ask_question transter
|
2013-09-13 15:43:13 +08:00 |
thomaschen
|
cc7a4ffb6d
|
add response(temp)
|
2013-09-13 15:43:13 +08:00 |
Bernie Chiu
|
da40c2b669
|
Allow sending request and getting response
|
2013-09-13 15:43:13 +08:00 |
thomaschen
|
bf5416095e
|
add auth_request route and controller
|
2013-09-13 15:43:13 +08:00 |
Bernie Chiu
|
8cd27e26e2
|
Fixed untracked files
Conflicts:
config/mongoid.yml
|
2013-09-13 15:43:13 +08:00 |
thomaschen
|
d98d008806
|
add sending post request function
|
2013-09-13 15:43:13 +08:00 |
chris
|
cd26b880fb
|
Change the logo and favicon
|
2013-09-13 15:42:52 +08:00 |
chris
|
7c398ce4fe
|
Changes for NTU General Affairs
|
2013-09-13 15:10:27 +08:00 |
chris
|
d766eea9f4
|
Changes for NTU common
Conflicts:
lib/tasks/migrate.rake
Conflicts:
lib/tasks/migrate.rake
Conflicts:
config/resque_schedule.yml
lib/tasks/migrate.rake
|
2013-09-13 15:10:10 +08:00 |
chris
|
d5dc3ef793
|
Fix for user and role relationship (from role and sub-role side)
|
2013-09-13 15:02:31 +08:00 |
Spen
|
b3366b48a1
|
announcement add new widget bulletins_and_links
|
2013-09-13 13:39:39 +08:00 |
saurabhbhatia
|
36e7e3d3e8
|
Fixed Locale settings for location navigation
|
2013-09-13 12:44:13 +08:00 |
saurabhbhatia
|
06c2240d34
|
Categories working tested and added link to sidebar
Conflicts:
Gemfile
config/mongoid.yml
|
2013-09-13 12:43:42 +08:00 |
Harry Bomrah
|
c4e8ed96a9
|
location category
|
2013-09-13 12:40:18 +08:00 |
chris
|
8ad015af7f
|
Remove before filter in user.rb in addition to the previous fix (Fix for user and role relationship)
|
2013-09-13 11:56:57 +08:00 |
chris
|
1857ad428c
|
Fix for user and role relationship
Conflicts:
lib/tasks/migrate.rake
|
2013-09-12 15:35:53 +08:00 |
Matt K. Fu
|
134b639465
|
fix announcement language
|
2013-09-09 17:35:22 +08:00 |
Matt K. Fu
|
45136f915d
|
fix news default widget shows un-checked bulletins.
|
2013-09-09 11:14:31 +08:00 |
Matt K. Fu
|
2c3924d92c
|
fix kaminari
|
2013-09-04 16:38:52 +08:00 |
Matt K. Fu
|
41b562d3f7
|
fix zip by limit version number
|
2013-09-04 15:20:55 +08:00 |
Matt K. Fu
|
4074ac677d
|
fix rake zip
|
2013-09-04 10:36:16 +08:00 |
Matthew K. Fu JuYuan
|
e1c57c6843
|
fixed default widget for tags
|
2013-09-03 16:17:45 +08:00 |
Matthew K. Fu JuYuan
|
915ea066d6
|
fixing bulletin default widget
|
2013-09-02 17:24:28 +08:00 |
Matt K. Fu
|
e7aa7ea1fa
|
added sorting DSL
|
2013-09-02 16:33:50 +08:00 |
Matt K. Fu
|
1ccfd6e48c
|
fix sorting for default widget
|
2013-08-30 16:52:46 +08:00 |
Matt K. Fu
|
23516277f3
|
fix default widget query
|
2013-08-30 10:15:18 +08:00 |
Matt K. Fu
|
87bc2852b3
|
fix variable
|
2013-08-29 18:08:33 +08:00 |
Matt K. Fu
|
27b86b078a
|
fix counter for recording request.
|
2013-08-28 17:56:03 +08:00 |
Matt K. Fu
|
8f393e1079
|
fix template for solar error. gitingore
|
2013-08-28 10:37:19 +08:00 |
Matt K. Fu
|
353039dcd0
|
fix script
|
2013-08-27 18:37:09 +08:00 |
Matt K. Fu
|
d8dd68b4df
|
fixing setting template and site init scripts
|
2013-08-27 17:28:33 +08:00 |
Matt K. Fu
|
aa8523c8cf
|
fix counter eval
|
2013-08-27 16:07:58 +08:00 |
Matt K. Fu
|
69ef8fa747
|
fix dash broad counter
|
2013-08-27 15:59:17 +08:00 |
Matt K. Fu
|
473baa9b95
|
add backup job
|
2013-08-27 15:59:17 +08:00 |
Matt K. Fu
|
1592aaff89
|
add option to logrotate for conversional policy.
|
2013-08-27 15:59:17 +08:00 |
Matt K. Fu
|
030d994180
|
make rake task more easier for service team
|
2013-08-27 15:59:17 +08:00 |