chris
|
1a9a4d0112
|
Changes for ntue (mail app)
|
2013-09-13 15:09:50 +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 |
|
Matt K. Fu
|
a88ad35641
|
add log rotate into site build procedure.
|
2013-08-27 15:59:17 +08:00 |
|
Matthew K. Fu JuYuan
|
a63193dc65
|
logrotate template
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
452bddb587
|
let site builder can enter rescue's worker
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
371485e420
|
add handily task for service team
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
69b3625861
|
add production pid log folder in case sold error
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
72d1427854
|
fix erb for pass argument and paths
|
2013-08-27 15:59:16 +08:00 |
|
Matthew K. Fu JuYuan
|
079b9145c3
|
move all *.god to *.erb so the God init won't go wrong
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
3102a46219
|
remove useless setting for solar
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
653a098ab6
|
fix solr setting
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
426edea485
|
add god to watch solr service
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
2e5b2555c6
|
from now on the rescue namespace will be decided by site object field: resque_namespace
|
2013-08-27 15:59:16 +08:00 |
|
Matt K. Fu
|
2593707d8c
|
fix rescue scheduler space error
|
2013-08-27 15:59:15 +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 |