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 |
|
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
|
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 |
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 |
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 |
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 |
|
saurabhbhatia
|
b20955579e
|
Cleaned Up ask module for master
|
2013-08-27 14:29:59 +08:00 |
|
saurabhbhatia
|
1ebda22f0e
|
Updated with loader
Conflicts:
vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_acknowledgements/index.html.erb
vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb
|
2013-08-27 14:29:53 +08:00 |
|
saurabhbhatia
|
c511aeb8de
|
Removed logging statements
|
2013-08-27 14:29:47 +08:00 |
|
saurabhbhatia
|
26d3a89d30
|
Updated ask module with custom acknowledgement working
|
2013-08-27 14:29:39 +08:00 |
|
saurabhbhatia
|
91f80a0952
|
Deleted ask
|
2013-08-27 14:29:28 +08:00 |
|
saurabhbhatia
|
f333fe9e21
|
Added custom acknowledgement to ask
|
2013-08-27 14:29:22 +08:00 |
|
saurabhbhatia
|
33f256bd16
|
Fix mailing redirect
Conflicts:
vendor/built_in_modules/ask/init.rb
vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb
vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb
vendor/built_in_modules/ask_new/config/routes.rb
|
2013-08-19 13:03:49 +08:00 |
|
saurabhbhatia
|
fde9fd7ffe
|
Deleted Unnecessary Old code in ask module and video
|
2013-08-15 12:12:38 +08:00 |
|
saurabhbhatia
|
d977b83d06
|
Updated captcha, mailing function working
|
2013-08-15 11:50:28 +08:00 |
|
saurabhbhatia
|
a1eae7543e
|
Updated ask module with a new captcha plugin
|
2013-08-15 11:50:21 +08:00 |
|
saurabhbhatia
|
19d33f78bd
|
Updated Video with frontend widget and backend widget working
|
2013-07-31 13:52:24 +08:00 |
|
saurabhbhatia
|
37c91664d3
|
Updated with video widget
|
2013-07-31 13:52:22 +08:00 |
|
saurabhbhatia
|
eb853f773d
|
Updated video cleaned up the ui
|
2013-07-31 13:52:19 +08:00 |
|
saurabhbhatia
|
d701d9d6ad
|
Updated videos module with widget initiation
|
2013-07-31 13:52:10 +08:00 |
|
saurabhbhatia
|
75eeec737c
|
Video and Channel Fetching now working
|
2013-07-31 13:52:07 +08:00 |
|
saurabhbhatia
|
36c3635bbb
|
add youtube videos module
|
2013-07-31 13:52:05 +08:00 |
|
Harry Bomrah
|
2c24e788b0
|
fixed frontend
|
2013-07-23 18:32:24 +08:00 |
|
chris
|
26a8be2f0f
|
Fix bulletins_controller.rb missing 'end'
|
2013-07-19 19:52:44 +08:00 |
|
Harry Bomrah
|
1357124f6f
|
backend theater for ie fixed
|
2013-07-19 18:40:19 +08:00 |
|
Harry Bomrah
|
8c3fb43bf5
|
theater view fixed in IE
|
2013-07-19 18:40:09 +08:00 |
|
chris
|
71e8b3c042
|
Change get_item
Add category and tags to default widget link to object
|
2013-07-19 18:39:13 +08:00 |
|
Matt K. Fu
|
8043573370
|
fix delay impressionist for tags and pages
|
2013-07-19 17:00:38 +08:00 |
|
Harry Bomrah
|
b1d8a87256
|
frontend gallery fix
|
2013-07-18 21:22:23 +08:00 |