Spen
|
17d40d3e08
|
fix announcement image info and mail subject
|
2013-11-05 16:05:16 +08:00 |
|
Spen
|
048f67c6da
|
fix ntue new member default non-administrator and announcement image size & file name cannot be null
|
2013-10-16 17:01:38 +08:00 |
saurabhbhatia
|
ee2adf2121
|
Updated Locations controller with id in json api
|
2013-10-09 09:19:05 +00:00 |
|
saurabhbhatia
|
363ea53861
|
Removed pagination from video api
|
2013-10-05 16:38:10 +08:00 |
|
saurabhbhatia
|
b7ea756789
|
Updated channel videos liks to 3gp format
|
2013-10-04 20:04:44 +08:00 |
|
saurabhbhatia
|
839743779b
|
Updated channel json with number of videos
|
2013-10-04 18:04:47 +08:00 |
|
saurabhbhatia
|
9f779f1f71
|
Updated visibility for get channels in api
|
2013-10-04 11:30:06 +08:00 |
|
saurabhbhatia
|
95310619c0
|
Fix the URL for video in channel video api
|
2013-10-04 11:28:28 +08:00 |
|
saurabhbhatia
|
55207da76a
|
Updated to 2 steps for android app, channel id and channel related videos
|
2013-10-04 11:27:00 +08:00 |
|
saurabhbhatia
|
795d881626
|
Added video json api
|
2013-10-04 10:17:13 +08:00 |
|
saurabhbhatia
|
4cd455441f
|
Updated location json visibility
|
2013-10-03 18:20:16 +08:00 |
|
saurabhbhatia
|
fea0540ec3
|
updated json format for location and locaiton categories
|
2013-10-03 17:59:12 +08:00 |
|
saurabhbhatia
|
44f5a98a69
|
Updated Location and loction categories to pass ids
|
2013-10-03 17:30:05 +08:00 |
|
saurabhbhatia
|
746bcbed96
|
added get_categorywise_locations
|
2013-10-03 15:52:46 +08:00 |
|
saurabhbhatia
|
ec6ef5a871
|
NTUE localtion categories as json for Android App
|
2013-10-03 15:06:59 +08:00 |
|
Spen
|
051adbf167
|
ntue email_ers fix and announcement widget filed fix
|
2013-09-30 16:35:21 +08:00 |
chris
|
d386307745
|
Fix params name for rss
|
2013-09-30 16:35:21 +08:00 |
|
chris
|
5c0d16c22e
|
Modification in rss feed for announcement:
- subtitle instead of text
- add rss link in the json for categories
|
2013-09-30 16:35:21 +08:00 |
ruling
|
93424e1972
|
Fix link frontend and gallery json
|
2013-09-30 16:35:21 +08:00 |
|
chris
|
3c49a6eeae
|
Do not show announcement in json and rss if no title in I18n.locale (fix 2)
|
2013-09-30 16:35:21 +08:00 |
|
chris
|
f76ead6ea5
|
Revert "Do not show announcement in json and rss if no title in I18n.locale (fix)"
This reverts commit f72697ae76.
|
2013-09-30 16:35:21 +08:00 |
|
chris
|
e8a8e92f5c
|
Do not show announcement in json and rss if no title in I18n.locale (fix)
|
2013-09-30 16:35:21 +08:00 |
|
chris
|
5b60e389ec
|
Revert "Do not show announcement in json and rss if no title in I18n.locale"
This reverts commit 03189092d3.
|
2013-09-30 16:35:20 +08:00 |
|
chris
|
faabedad55
|
Do not show announcement in json and rss if no title in I18n.locale
|
2013-09-30 16:35:20 +08:00 |
|
chris
|
d95b050e57
|
Changes to have both json and rss, add categories
|
2013-09-30 16:35:20 +08:00 |
 Harry Bomrah
|
afe6972dfa
|
link widget for ntue updated
|
2013-09-30 16:35:20 +08:00 |
|
chris
|
9fbf9e940e
|
Fix scope error
|
2013-09-30 16:35:20 +08:00 |
|
chris
|
0f2c13e7ac
|
First version of new feed for announcement
|
2013-09-30 16:35:20 +08:00 |
|
Spen
|
f42d25c46b
|
ntue emailer approval fix and announcement widget add unit field
|
2013-09-30 16:35:20 +08:00 |
|
chris
|
dda603c27c
|
Changes for ntue (mail app)
|
2013-09-30 16:35:19 +08:00 |
Matthew K. Fu JuYuan
|
6d4d3ccfd4
|
for some reason can_display has been remove from announcement init. add it back.
|
2013-09-23 16:29:22 +08:00 |
|
Harry Bomrah
|
141b708392
|
widget code rewritten for gallery master branch
|
2013-09-16 11:22:56 +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 |