developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,148 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

3148 Commits

Author SHA1 Message Date
Spen 70673f19f0 fix ntue new member default non-administrator and announcement image size & file name cannot be null 2013-10-16 15:08:33 +08:00
Manson Wang 9849b5c7dd Ad_Banner fix for FGU 
Conflicts:

	app/views/front/show_banner.html.erb
	public/static/kernel.js
 2013-10-16 09:56:00 +08:00
rulingcom 3999308bb4 Changes in mobile 2013-10-11 15:15:09 +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
Spen f8c7e8f17a fix ntue sub menu link target 2013-10-04 17:40:20 +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
chris 8aa1e2dae0 Changes for mobile contact, one line 2013-10-01 15:44:44 +08:00
chris dd0d2368c8 Changes for mobile based on footer 2013-10-01 15:40:29 +08:00
Manson Wang 9c41282fdb Fix Ad_Banner Loading Problem (Not complete) 2013-09-30 21:10:49 +08:00
saurabhbhatia fac578f251 Merge branch '0913_ntue' of https://github.com/Rulingcom/orbit into 0913_ntue 2013-09-30 16:36:33 +08:00
Manson Wang 3b4e4e1098 Fix path of jquery.cycle.all.latest.js 2013-09-30 16:35:22 +08:00
Harry Bomrah 8c68c54a57 ad_banner banner load fixed for test site 
Conflicts:

	app/views/front/show_banner.html.erb
 2013-09-30 16:35:22 +08:00
Manson Wang 2d8754f0aa NTUE Logo 2013-09-30 16:35:22 +08:00
chris 19633a05d8 Fix parser_front_end.rb for page content 2013-09-30 16:35:21 +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
Harry Bomrah ce3842d3ad fixed external links opening in different window 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
chris ecc3581106 Domain absolute url for tinymce files 2013-09-30 15:25:06 +08:00
Manson Wang e56e91cc93 Fix path of jquery.cycle.all.latest.js 2013-09-30 15:17:53 +08:00
Harry Bomrah 4b7703f4af ad_banner banner load fixed for test site 
Conflicts:

	app/views/front/show_banner.html.erb
 2013-09-30 14:16:29 +08:00
Harry Bomrah 2ec3d77600 widget code rewritten for gallery master branch 2013-09-30 14:15:53 +08:00
Manson Wang 5e1d6663a1 NTUE Logo 2013-09-30 14:15:31 +08:00
chris 19801eb10f Fix parser_front_end.rb for page content 2013-09-30 14:15:02 +08:00
Spen 4abe4f5c16 ntue email_ers fix and announcement widget filed fix 2013-09-27 18:58:58 +08:00
chris 52356d3316 Fix params name for rss 2013-09-27 16:52:50 +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