Commit Graph

30 Commits

Author SHA1 Message Date
Manson Wang 764c557794 Fix Ad_Banner 2013-10-08 17:41:08 +08:00
Manson Wang 665c01c8b8 Fix Ad_Banner 2013-10-08 17:35:46 +08:00
Manson Wang a21c5c6d5c Ad_banner fixed 2013-10-02 15:51:22 +08:00
Manson Wang 27db216d0c Fix Ad_Banner Loading Problem (Not complete) 2013-10-01 09:29:59 +08:00
chris be00cec4d7 Fix link for ad_banner
Add missing helper for web_link_category
Show design's js in front-end
2013-01-07 00:36:48 +08:00
Matthew K. Fu JuYuan 194b42c1e4 fix widget from post method 2012-12-24 15:22:26 +08:00
chris e1a3201830 Fix multiple pop-ups in structure delete 2012-12-21 18:34:13 +08:00
Matt 962bae9a82 merge 2012-10-01 21:09:09 +08:00
Christophe Vilayphiou 2ea3193879 Fix for banner link 2012-08-13 11:03:11 +08:00
Matthew K. Fu JuYuan 9e1e33798c fix search for i.e. 2012-08-09 18:35:57 +08:00
Matthew K. Fu JuYuan 3f95fe4f13 tmp commit for search. start nccu0621 first 2012-06-22 11:34:10 +08:00
Matthew K. Fu JuYuan cb17fe0825 Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
Matthew K. Fu JuYuan 77deffb512 Nccu calendar and daily job. 2012-05-15 14:03:54 +08:00
Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap
Conflicts:
	config/environments/development.rb
2012-05-09 13:51:00 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +08:00
Christophe Vilayphiou ffcfda912e Patch from ldap: Calendar sync done,need Ray's JS change 2012-05-08 20:44:17 +08:00
Matthew K. Fu JuYuan f827e8429e Calendar sync done,need Ray's JS change 2012-05-08 16:08:41 +08:00
Matthew K. Fu JuYuan f427c3803f clean up useless flash msgs. add i18n vars for app auth and object auth 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan 05ded8de03 Fix for NCCU 0430 all functions ok with two submanagers but different behavors 2012-05-04 15:38:18 +08:00
Christophe Vilayphiou 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
Christophe Vilayphiou 6a30b0a1e4 Add RSS event 2012-02-28 18:29:13 +08:00
Christophe Vilayphiou 680b28023a Fix ad_banner loading 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou cf038183b9 Ika's changes in modules 2012-02-20 08:48:27 +08:00
Christophe Vilayphiou 9cd3cbc478 Modifications for design, pages, page_parts…
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +08:00
unknown 5da75161c4 announcemenet & web_resource widget 2012-02-16 17:52:49 +08:00
Christophe Vilayphiou 55ae7de01c Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
Matthew Kaito Juyuan Fu 8ef2d4b02e include ad_banner query code. cleaned up parser 2012-02-15 00:34:21 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +08:00
chris2tof e99affbddd Merge with Matt's code 2011-11-20 01:26:24 +08:00
Matthew Kaito Juyuan Fu 0a6efeb0a2 put dymanic loading related kernel code and query kernel code into public/static
put dymanic loading related kernel code and query kernel code into
public/static.
everything in JS need be loaded at frontend from ruling com should be
placed here.
2011-10-21 14:11:41 +08:00