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

3128 Commits

Author SHA1 Message Date
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
chris 663bb7776b Modification in rss feed for announcement: 
- subtitle instead of text
	- add rss link in the json for categories
 2013-09-17 23:11:23 +08:00
ruling dfcb383e0f Fix link frontend and gallery json 2013-09-17 20:55:03 +08:00
chris c4ca7f450a Do not show announcement in json and rss if no title in I18n.locale (fix 2) 2013-09-17 20:52:02 +08:00
chris e851395f79 Revert "Do not show announcement in json and rss if no title in I18n.locale (fix)" 
This reverts commit f72697ae76.
 2013-09-17 20:51:29 +08:00
chris f72697ae76 Do not show announcement in json and rss if no title in I18n.locale (fix) 2013-09-17 20:47:27 +08:00
chris 2040081679 Revert "Do not show announcement in json and rss if no title in I18n.locale" 
This reverts commit 03189092d3.
 2013-09-17 20:47:03 +08:00
chris 03189092d3 Do not show announcement in json and rss if no title in I18n.locale 2013-09-17 20:44:00 +08:00
chris 2d714dfa4b Changes to have both json and rss, add categories 2013-09-17 20:00:55 +08:00
Harry Bomrah 64d07a0c95 link widget for ntue updated 2013-09-17 19:47:12 +08:00
Harry Bomrah b970103e90 fixed external links opening in different window 2013-09-17 16:01:56 +08:00
Harry Bomrah 141b708392 widget code rewritten for gallery master branch 2013-09-16 11:22:56 +08:00
chris 842f072e1a Fix scope error 2013-09-16 03:16:23 +08:00
chris 9da9284a7f First version of new feed for announcement 2013-09-16 02:53:16 +08:00
Spen 88861985c6 ntue emailer approval fix and announcement widget add unit field 2013-09-13 15:09:50 +08:00
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