Commit Graph

826 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 0cdf27450b Remove useless files 2012-04-25 11:43:24 +08:00
Matthew K. Fu JuYuan ddf7931123 Change ad_banner preview from using title to id 2012-04-25 11:38:45 +08:00
Matthew K. Fu JuYuan 8e444a88d0 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-25 10:56:42 +08:00
Matthew K. Fu JuYuan 3f2643bb66 fix useless notice at login 2012-04-25 10:55:49 +08:00
Christophe Vilayphiou dc07964bc3 Fix js bug after Matt's changes in 'approval' 2012-04-24 17:10:23 +08:00
Christophe Vilayphiou 3308744396 Fix side_bar after Matt's changes in translation 2012-04-24 17:00:33 +08:00
Christophe Vilayphiou a47ef5cfe8 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
2012-04-24 16:45:13 +08:00
Matthew K. Fu JuYuan db46803cda R4-Billingual 2012-04-24 16:43:45 +08:00
Christophe Vilayphiou c7d8e0b27b Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
2012-04-24 16:32:00 +08:00
Christophe Vilayphiou 9f6c9156c6 Spen patch for nccu 2012-04-24 16:25:30 +08:00
Christophe Vilayphiou 291d5e3a03 Ray's changes in css 2012-04-24 16:24:50 +08:00
Matthew K. Fu JuYuan d0ced39c74 R4-Billingual 2012-04-24 16:06:42 +08:00
Christophe Vilayphiou d247f05d2e Add missing translations in announcement and change announcement behavior for passed and rejected 2012-04-24 15:27:46 +08:00
Christophe Vilayphiou c0abaa643c Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-24 15:21:12 +08:00
Christophe Vilayphiou 45c194e870 Ray's changes in css 2012-04-24 15:15:36 +08:00
Christophe Vilayphiou 51ee9a4bfa Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-24 14:43:30 +08:00
Matthew K. Fu JuYuan 33640de184 Changes for Billingual 2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan bbcdaf00e7 Disable ad_banner_preview. Just show window 2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan e7bb9ea86b Fix ad image date selector 2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan c57ba305e9 Fix ad_banner 2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan 04688608f7 Changes for Billingual 2012-04-24 14:30:30 +08:00
Christophe Vilayphiou c856b4cdce Fix for upload image component in announcement 2012-04-24 12:41:28 +08:00
Christophe Vilayphiou 8bf55a184e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-24 12:20:14 +08:00
Christophe Vilayphiou 42aeaead93 Ray's changes, put the js for upload image component in a separate file 2012-04-24 12:15:32 +08:00
Christophe Vilayphiou 27bd26ff52 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-24 11:40:42 +08:00
Christophe Vilayphiou b80339d704 Ray's changes for image upload component and sign-in page 2012-04-24 11:35:50 +08:00
Christophe Vilayphiou f05b7db73a Fix for parser sub_menu
Add style to the sub_menu
2012-04-24 11:26:36 +08:00
Matthew K. Fu JuYuan 6e431b6137 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-24 11:26:13 +08:00
Christophe Vilayphiou 8041452be5 Fix for translation in sort headers for announcement 2012-04-24 11:05:01 +08:00
Christophe Vilayphiou 6831a3dbbb Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-24 02:44:39 +08:00
Christophe Vilayphiou 0c4328987a Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
Christophe Vilayphiou a748ccaac7 Patch from ldap for announcement translation 2012-04-24 02:33:35 +08:00
Christophe Vilayphiou a5b13e680f Add sub_menu in r_tags 2012-04-24 02:30:40 +08:00
Christophe Vilayphiou db1b84e962 Fix bug where an rejected announcement could still be edited by url 2012-04-24 00:58:56 +08:00
Christophe Vilayphiou 6130f8b1e4 Fix errors in status filter in announcement 2012-04-24 00:53:05 +08:00
Christophe Vilayphiou b502bedd0f Fix filter and sort for status in announcement 2012-04-24 00:46:34 +08:00
Matthew K. Fu JuYuan 0836583694 Disable ad_banner_preview. Just show window 2012-04-23 18:29:23 +08:00
Matthew K. Fu JuYuan a5db2382e7 Fix ad image date selector 2012-04-23 18:20:12 +08:00
Matthew K. Fu JuYuan 35452c039d Fix ad_banner 2012-04-23 17:03:55 +08:00
Christophe Vilayphiou 834cbe3a11 Fix side_bar for tags
Modules needs to use the fullpath for active or visible in tags
2012-04-23 16:12:07 +08:00
Christophe Vilayphiou 1ebf460f7e Fix 'loading fail' in front-end for announcement
The show action was returning an array instead of a bulletin
2012-04-23 14:47:33 +08:00
Christophe Vilayphiou 499930a680 Pull from github 2012-04-23 14:29:55 +08:00
Christophe Vilayphiou 09910ca4ae Rmove therubyraces from Gemfile.lock 2012-04-23 14:12:18 +08:00
Christophe Vilayphiou d71d0f7e89 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
	app/views/admin/ad_images/_form.html.erb
2012-04-23 14:08:23 +08:00
Matthew K. Fu JuYuan 67ba2389a2 fix js 2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan 8eedbc951e add i18n vars 2012-04-23 14:07:14 +08:00
Matthew K. Fu JuYuan 0c46b4da23 AdImage and AnBanner JS fixed 2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan 81b0046f42 Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image. 2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan e353afb5ac fix i18n vars in ad_banner 2012-04-23 14:07:13 +08:00
Matthew K. Fu JuYuan 1b70852ff7 realtime preview is working. but save to object when preview 2012-04-23 14:06:37 +08:00