Commit Graph

756 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan cb25cf60a9 AdBanner app_auth 2012-05-10 15:37:07 +08:00
Matthew K. Fu JuYuan 4f1e47bb82 Don't display admin in any premission select. Fix not necessary header for UT data 2012-05-10 14:43:05 +08:00
Christophe Vilayphiou 5eba2638ce Merge branch 'design_team' into ldap 2012-05-10 14:17:38 +08:00
Matthew K. Fu JuYuan b6aad17681 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 14:16:37 +08:00
Matthew K. Fu JuYuan 87ebcc48e7 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 11:51:44 +08:00
Christophe Vilayphiou 87449ec6a8 Merge branch 'design_team' into ldap 2012-05-10 10:34:28 +08:00
Christophe Vilayphiou a43877323e Add tinymce to page_part edit for text 2012-05-10 10:34:13 +08:00
Christophe Vilayphiou de739d7d20 Merge branch 'design_team' into ldap
Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
Christophe Vilayphiou bc5e975fab Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-10 00:29:22 +08:00
Christophe Vilayphiou 9161dc73b5 Translation for "or" 2012-05-10 00:27:12 +08:00
Christophe Vilayphiou 13587306bc Add list widgets for announcement, news and links with categories and tags 2012-05-10 00:25:30 +08:00
Christophe Vilayphiou ecd21338bc Matt's changes for side_bar 2012-05-10 00:23:42 +08:00
Christophe Vilayphiou dc9af65524 Merge branch 'design_team' into ldap 2012-05-09 15:25:16 +08:00
Christophe Vilayphiou 038378be9a Ray's changes for inccu in orbit_bar 2012-05-09 15:20:09 +08:00
Christophe Vilayphiou 1785da51a2 Merge branch 'design_team' into ldap 2012-05-09 15:04:06 +08:00
Christophe Vilayphiou 50edfdd02f Changes for tag key in side_bar announcement and news, fix ad_banner css for dot 2012-05-09 14:59:06 +08:00
Christophe Vilayphiou 9d01f624da Merge branches 'nccu_0509' and 'design_team' into ldap 2012-05-09 14:21:24 +08:00
Matthew K. Fu JuYuan 6c9944918a Fix i18 variable 2012-05-09 14:18:52 +08:00
Matthew K. Fu JuYuan 47bca643af hidding new ad_banner 2012-05-09 14:17:20 +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 f9f7ddc8ee Hide some links in side_bar for site_settings 2012-05-09 12:53:42 +08:00
Christophe Vilayphiou 44a485611a Site_info and site_setting i18n 2012-05-09 12:29:46 +08:00
Christophe Vilayphiou 9216f29bc9 Ray's changes for mail settings 2012-05-09 12:19:32 +08:00
Christophe Vilayphiou 41c0c26330 Add mail_settings 2012-05-09 11:38:29 +08:00
Christophe Vilayphiou b3be210ff7 Small adjustment for dashboard 2012-05-09 05:55:47 +08:00
Christophe Vilayphiou 2b03263fb7 Dashboard partial implementation 2012-05-09 05:53:07 +08:00
Christophe Vilayphiou 909ca19456 Fix bugs in sub_menu 2012-05-09 04:31:04 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +08:00
Christophe Vilayphiou 8d70d87120 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-09 04:13:14 +08:00
Christophe Vilayphiou 26a50cc862 Add sub_menu to children 2012-05-09 04:15:45 +08:00
Christophe Vilayphiou a186ae08d8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 21:47:03 +08:00
Christophe Vilayphiou 0cc94c65a8 Patch from ldap: Test version for DB sync schedule job 2012-05-08 21:14:57 +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 7af17f19ac God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 20:26:36 +08:00
Matthew K. Fu JuYuan dbac219c18 now jobs is working 2012-05-08 20:25:11 +08:00
Matthew K. Fu JuYuan f3b58ea36d starting Resque 2012-05-08 20:24:37 +08:00
Matthew K. Fu JuYuan f949523bbb God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan 69f2f6a716 now jobs is working 2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan c28d7d59b6 starting Resque 2012-05-08 20:21:28 +08:00
Christophe Vilayphiou 18c42a80a6 Put site_settings in the orbit_button 2012-05-08 20:06:56 +08:00
Matthew K. Fu JuYuan 083963af65 Test version for DB sync schedule job 2012-05-08 19:20:53 +08:00
Christophe Vilayphiou 55bfaea43e Can show announcement and news list by tag's key 2012-05-08 17:27:42 +08:00
Christophe Vilayphiou 5c7cf1aef2 Add sub_menu to site_info 2012-05-08 17:27:02 +08:00
Christophe Vilayphiou d2e07f537a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 17:24:40 +08:00
Christophe Vilayphiou a3868cb785 Ray's changes for front-end banner 2012-05-08 17:21:26 +08:00
Matthew K. Fu JuYuan f827e8429e Calendar sync done,need Ray's JS change 2012-05-08 16:08:41 +08:00
Christophe Vilayphiou caba8ce7a4 Add nccu icon
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
Matthew K. Fu JuYuan b22a275360 Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap 2012-05-08 11:55:21 +08:00
Christophe Vilayphiou 65a0998080 Merge branch 'jobs_and_mail' into ldap
Conflicts:
	config/environments/development.rb
	config/routes.rb
2012-05-08 11:45:34 +08:00
Matthew K. Fu JuYuan d7194dc805 God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync. 2012-05-08 11:41:58 +08:00
Matthew K. Fu JuYuan 5b604037f8 now jobs is working 2012-05-08 11:41:58 +08:00
Matthew K. Fu JuYuan 7339d1ee4a starting Resque 2012-05-08 11:41:58 +08:00
Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap
Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
Christophe Vilayphiou ba4385e3fd Add module authorization for news
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
Christophe Vilayphiou 469f5c8267 Add always_display checkbox for title in site_info independent of i18n 2012-05-07 16:29:32 +08:00
Christophe Vilayphiou 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	app/views/admin/sites/site_info.html.erb
2012-05-07 16:08:05 +08:00
Christophe Vilayphiou f534e6ca7b Ray's changes for site_info 2012-05-07 15:55:45 +08:00
Christophe Vilayphiou 8a3f0b9bdc Add menu_enabled_for: the page can be shown even if there's no link in the menu 2012-05-07 15:47:14 +08:00
Christophe Vilayphiou 8b61314cc4 Add i18n for site_info.
Add always display site title.
Changes for menu in front-end
2012-05-07 15:11:43 +08:00
Christophe Vilayphiou 0246341aef Add footer to site_info 2012-05-07 11:25:33 +08:00
Christophe Vilayphiou 1fb6c20b86 Add site_info 2012-05-07 00:54:18 +08:00
Christophe Vilayphiou 48f8fbde7f Fix site_locale_default_head and active for current locale 2012-05-07 00:53:52 +08:00
Christophe Vilayphiou 51f87e7212 Add missing translation for enabled_for 2012-05-06 03:36:01 +08:00
Christophe Vilayphiou ce1fecaf93 Add position ordering and hiding page for i18n 2012-05-06 00:35:13 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Christophe Vilayphiou b48099d752 Fix bug in is_admin?
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
Christophe Vilayphiou 555aa088d9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:23:45 +08:00
Christophe Vilayphiou 3ef81c520e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-04 19:16:57 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Christophe Vilayphiou 15bc4d4268 Fix merge error 2012-05-04 16:12:28 +08:00
Christophe Vilayphiou 8f1ce78ab4 Fix bug when homepage 2012-05-04 15:51:51 +08:00
Matthew K. Fu JuYuan 453cb21066 Announcement preivew 2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan f6307abfbf fix broken ad_banner 2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan bff3cefbc7 Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager. 2012-05-04 15:40:43 +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 45e21f9569 Fix filter category in news 2012-05-02 17:55:02 +08:00
Christophe Vilayphiou b8cd7097b0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-02 16:27:09 +08:00
Christophe Vilayphiou 2762c24593 Fix wrong variable names in translations 2012-05-02 16:22:06 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
Christophe Vilayphiou fe54c6ae71 Fix bug when id or single object 2012-04-30 14:23:41 +08:00
Christophe Vilayphiou a9ab016d52 Merge branch 'design_team' into ldap 2012-04-30 08:33:21 +08:00
Christophe Vilayphiou bda21baed2 Add missing js 2012-04-30 08:32:54 +08:00
Christophe Vilayphiou 767e4a3fe9 Merge branch 'design_team' into ldap 2012-04-30 08:16:17 +08:00
Christophe Vilayphiou 496b8de58a Side bar translation 2012-04-30 08:15:45 +08:00
Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap
Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
Christophe Vilayphiou b8f52fa1ec Separate announcement and news 2012-04-30 06:31:46 +08:00
Christophe Vilayphiou 63ee8eaca9 Remove url from sorting
Add sorting_options to params in filters
2012-04-30 06:30:52 +08:00
Christophe Vilayphiou 32faef0c70 DRY code for sorting 2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan a46a8898d7 Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen 2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan 6b151b1fb6 403 for unauth apps 2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan c4db7e2157 Fix approval setting ajax problem 2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan 94d61abf83 A modal view for approval user 2012-04-30 00:24:10 +08:00
Matthew K. Fu JuYuan 9d97b7c008 Change for the notice msg at login page 2012-04-30 00:24:10 +08:00
Christophe Vilayphiou 851dc72f42 Ray's changes in css and html 2012-04-30 00:17:18 +08:00
Christophe Vilayphiou 2362e1cfdd Merge branch 'design_team' into ldap 2012-04-27 15:28:32 +08:00
Christophe Vilayphiou 799fd1e3ac Fix css bugs (opacity=) and changes in sign_in page 2012-04-27 15:27:59 +08:00
Christophe Vilayphiou feb2156fd3 Fix error in side_bar for web_links 2012-04-27 14:15:36 +08:00
Christophe Vilayphiou 3beb035101 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-27 11:11:56 +08:00
Christophe Vilayphiou 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
Christophe Vilayphiou 7d6b82d9dd Merge branch 'ad_banner' into ldap 2012-04-26 17:15:44 +08:00
Matthew K. Fu JuYuan 4af2068c1f Fix ad_banner sec and msec 2012-04-26 17:11:06 +08:00
Matthew K. Fu JuYuan faace9893a dehumanize ad banner 2012-04-26 17:11:05 +08:00
Matthew K. Fu JuYuan 9a5ce5f512 Remove unless sidebar links. 2012-04-26 17:11:05 +08:00
Christophe Vilayphiou 3d293f6419 Fix for quick edit file and link in announcement
Change submit_button into ajax_for_submit
2012-04-26 16:42:28 +08:00
Christophe Vilayphiou 6bf4c60d45 Changes for js and ccs load for site's pages 2012-04-26 01:49:02 +08:00
Christophe Vilayphiou 6f1eb97ace Fix for structure js and css 2012-04-25 18:41:38 +08:00
Christophe Vilayphiou 58d52c60d3 Fix for structure: restore js and change manifests 2012-04-25 18:17:58 +08:00
Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap
Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
Christophe Vilayphiou 876036dd20 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
2012-04-25 16:39:26 +08:00
Christophe Vilayphiou 44ded537b3 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-25 16:28:34 +08:00
Christophe Vilayphiou 65a6f9c416 Ray's css fix for quick edit 2012-04-25 16:26:27 +08:00
Matthew K. Fu JuYuan a3a109fb8b Remove JS debug msg. 2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan 7f285f4719 Change ad_banner preview from using title to id 2012-04-25 16:10:11 +08:00
Matthew K. Fu JuYuan 72921d6dfd fix useless notice at login 2012-04-25 16:10:11 +08:00
Christophe Vilayphiou abf75ffedd Merge branch 'design_team' into ldap 2012-04-25 15:45:16 +08:00
Christophe Vilayphiou 573c19ff4b Remove .erb when including css 2012-04-25 15:44:44 +08:00
Christophe Vilayphiou 8adb9c6878 Merge branch 'design_team' into ldap 2012-04-25 15:10:50 +08:00
Christophe Vilayphiou 3ec8bb7be6 Fix assets bug: when having a '.' in the name, the extension must be specified 2012-04-25 15:10:28 +08:00
Christophe Vilayphiou 8f242e2d39 Merge branch 'design_team' into ldap 2012-04-24 17:00:51 +08:00
Christophe Vilayphiou 3308744396 Fix side_bar after Matt's changes in translation 2012-04-24 17:00:33 +08:00
Christophe Vilayphiou 0c4f1d91f7 Merge branch 'ad_banner' into ldap 2012-04-24 16:46:04 +08:00
Matthew K. Fu JuYuan db46803cda R4-Billingual 2012-04-24 16:43:45 +08:00
Christophe Vilayphiou d1f687e43e Merge branch 'design_team' into ldap 2012-04-24 16:32:30 +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 291d5e3a03 Ray's changes in css 2012-04-24 16:24:50 +08:00
Christophe Vilayphiou 70f6c7b540 Merge branch 'design_team' into ldap
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +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 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 b80339d704 Ray's changes for image upload component and sign-in page 2012-04-24 11:35:50 +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 308cfc7cf2 Merge branch 'design_team' into ldap
Conflicts:
	app/views/devise/sessions/new.html.erb
2012-04-24 02:46:06 +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 d4aea664e2 Merge branch 'design_team' into ldap
Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
Christophe Vilayphiou a5b13e680f Add sub_menu in r_tags 2012-04-24 02:30:40 +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 5a423178e3 Merge branch 'design_team' into ldap
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css
2012-04-23 15:16:50 +08:00
Christophe Vilayphiou 499930a680 Pull from github 2012-04-23 14:29:55 +08:00
Christophe Vilayphiou 2eeb530422 Merge branch 'master' into ldap
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
2012-04-23 14:13:37 +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
Matthew K. Fu JuYuan 8cc0611c4a Ray's fix for ad_banner 2012-04-23 14:06:36 +08:00
Matthew K. Fu JuYuan 30edc317b2 text area for ad_image 2012-04-23 14:06:36 +08:00
Matthew K. Fu JuYuan ff472714de AdBanner i18n vars patch 2012-04-23 14:05:18 +08:00
Christophe Vilayphiou 2f279c53ff Apply patch from ldap 2012-04-23 14:04:55 +08:00
Matthew K. Fu JuYuan 868118116b Merge commit 'b6f64cd8a5b48ad84703e3824ef4d968ed71779d' into ldap 2012-04-23 13:58:56 +08:00
Matthew K. Fu JuYuan 6a4203b850 Ray's css fix with widget css 2012-04-23 11:53:36 +08:00
Matt b6f64cd8a5 Announcement i18n vars 2012-04-23 11:29:00 +08:00
nccu fe9032787c NCCU ldap debug 2012-04-23 10:13:44 +08:00
Matthew K. Fu JuYuan 7e355b77c2 Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:31:05 +08:00
Matthew K. Fu JuYuan ba0677a001 Merge commit '72efdbd742d4f3ac8a910bd5c817cf5c74570ba5' into ldap 2012-04-19 14:09:37 +08:00
Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
Christophe Vilayphiou 72efdbd742 changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
Matthew K. Fu JuYuan 170c12bcdd fix js 2012-04-18 16:24:17 +08:00
Matthew K. Fu JuYuan 0ddb66a3c9 add i18n vars 2012-04-18 15:33:11 +08:00
Matthew K. Fu JuYuan 8d776fd30d AdImage and AnBanner JS fixed 2012-04-18 15:26:59 +08:00
Matthew K. Fu JuYuan 51190a79cb 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-17 16:03:48 +08:00
Matthew K. Fu JuYuan a9a4ca6ede fix i18n vars in ad_banner 2012-04-17 15:21:43 +08:00
Matthew K. Fu JuYuan 06a3128be5 realtime preview is working. but save to object when preview 2012-04-17 11:34:25 +08:00
Matthew K. Fu JuYuan 6cdebb440d Ray's fix for ad_banner 2012-04-13 18:02:36 +08:00
Christophe Vilayphiou 92e898a656 Merge branch 'master' into ldap 2012-04-13 17:52:15 +08:00
Matthew K. Fu JuYuan 7cf00d1d93 text area for ad_image 2012-04-13 17:51:19 +08:00
Matthew K. Fu JuYuan d81ca40f90 AdBanner i18n vars patch 2012-04-13 17:24:30 +08:00
Matthew K. Fu JuYuan 430b0fd9ae Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
Conflicts:
	app/views/admin/ad_banners/_ad_image_update.html.erb
2012-04-13 16:52:14 +08:00
Matthew K. Fu JuYuan 4af73ecf6f fix preview window size. 2012-04-13 16:46:16 +08:00
Matthew K. Fu JuYuan 0fe5baf93f fix for letting ad_banner display even when file in not uploaded 2012-04-13 16:14:43 +08:00
Christophe Vilayphiou a2e35f3626 Merge branch 'master' into ldap 2012-04-13 16:03:57 +08:00
Christophe Vilayphiou ca0fc4c767 Comment out code that bugged upload image in ad_banner 2012-04-13 15:53:25 +08:00
Christophe Vilayphiou d1feb102d0 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-04-13 15:27:10 +08:00
Matthew K. Fu JuYuan d646a9dff1 fix new ad_image data selector bug 2012-04-13 15:24:59 +08:00
Matthew K. Fu JuYuan de035cb89a fix date selector value fill back problem 2012-04-13 13:52:01 +08:00
Matthew K. Fu JuYuan 1e43349eb8 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-13 12:48:57 +08:00
Matthew K. Fu JuYuan fe59446c16 fix date selector value fill back problem 2012-04-13 12:47:57 +08:00
Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
Christophe Vilayphiou f8873267a2 Ray's fix for announcement list 2012-04-12 18:41:14 +08:00
Christophe Vilayphiou 6728c35023 Fix side_bar.
In the case of tags, take the uri instead of controller name
2012-04-12 18:14:00 +08:00
Christophe Vilayphiou 015c0cb452 Delete useless code in items 2012-04-12 18:13:10 +08:00
Christophe Vilayphiou 93ac99d235 Add missing css in "inc" 2012-04-12 18:12:46 +08:00
Matthew K. Fu JuYuan b54578ce1e ad banner preview 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 83b4443910 add pic and js for permission checkbox and filter 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan 57402b8602 add permission-checkbox js 2012-04-12 07:14:06 +08:00
Matthew K. Fu JuYuan e4c41ab54c A filter UI for permission select. with Harry's JS 2012-04-12 07:14:06 +08:00
Christophe Vilayphiou 5417c6fec0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
2012-04-12 07:13:13 +08:00
Christophe Vilayphiou 7bca339a5b Ray's fix for columns width in bulletins 2012-04-12 07:01:34 +08:00
Christophe Vilayphiou 486845460c Filter and delete for bulletins 2012-04-12 06:50:36 +08:00
Matthew K. Fu JuYuan d2e77d6bf8 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-09 12:45:27 +08:00
Matthew K. Fu JuYuan d2a3a4d26e ad banner preview 2012-04-09 12:44:08 +08:00
Matthew K. Fu JuYuan 0eab9ca8fa add pic and js for permission checkbox and filter 2012-04-09 12:43:51 +08:00
Matthew K. Fu JuYuan c7c3af91dd add permission-checkbox js 2012-04-09 12:43:10 +08:00
Christophe Vilayphiou 963a0cb604 Change filter to js with history for bulletins 2012-04-07 00:20:52 +08:00
Christophe Vilayphiou 253f4bcb54 Ray's changes for orbit bar 2012-04-06 18:06:57 +08:00
Matthew K. Fu JuYuan fa441814f3 A filter UI for permission select. with Harry's JS 2012-04-06 17:46:50 +08:00
Christophe Vilayphiou 6f9363ef54 Fix bugs in upload design and missing menu 2012-04-06 17:37:45 +08:00
Christophe Vilayphiou ad740b0daf Missing end tag in side_bar 2012-04-05 18:13:52 +08:00
Christophe Vilayphiou 894f8764d8 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
	app/views/layouts/_side_bar.html.erb
2012-04-05 17:42:55 +08:00
Matthew K. Fu JuYuan 01bda515a6 fact_check with Ray's permission check.
needs Ray's new css
2012-04-05 17:41:43 +08:00
Christophe Vilayphiou ef8eb0450b Changes in tinymce bar 2012-04-05 17:28:21 +08:00
unknown d45725cf3b fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
Matthew K. Fu JuYuan ef88c2dbc2 fact_check with Ray's permission check.
needs Ray's new css
2012-04-05 15:06:01 +08:00
Christophe Vilayphiou 1259d62249 Fix mainTablePosition in js -> remove the notable class 2012-04-05 14:55:41 +08:00
Christophe Vilayphiou cedd782e7f Sidebar fix for ad_banner 2012-04-05 13:55:03 +08:00
Matthew K. Fu JuYuan d8b20ae993 fix ad_banner sidebar 2012-04-05 11:11:48 +08:00
Matthew K. Fu JuYuan a9988a0d5c Change for interface,form. 2012-04-02 11:00:51 +08:00
Matthew K. Fu JuYuan 8f28d45379 The new AdBanner. 2012-04-02 03:04:38 +08:00
Matthew K. Fu JuYuan b17cd7570f changing to new admin_layout 2012-04-02 02:58:02 +08:00
Matthew K. Fu JuYuan 928c642840 change layout from old admin to new_admin. not complete code 2012-04-02 02:58:01 +08:00
Christophe Vilayphiou 503f71e554 Ray's changes in tags, css and js 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 6c50aa5243 Add pagination to bulletin index and remove ajax to make it simple 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 32519f308f Fix several bus when there is no design 2012-04-02 02:41:42 +08:00
Christophe Vilayphiou 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +08:00
Christophe Vilayphiou d6e4da6dad Ray's fix for margin-top 2012-03-28 11:31:07 +08:00
Christophe Vilayphiou cf297fc424 Changed inherited controller in module_apps to OrbitBackendController 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou d02bbdbaa5 Nokogiri in parsers 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou 55d12e50f2 Ray's changes in announcenment back-end 2012-03-27 18:58:03 +08:00
Matt Fu 3ba89ecbcf Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00
Christophe Vilayphiou f5fd3dec7a Trying nokogiri 2012-03-27 18:42:22 +08:00
Christophe Vilayphiou f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
unknown e8d1352890 fix announcement 2012-03-27 14:29:11 +08:00
unknown a30bc499c7 fix announcement & links 2012-03-27 14:19:58 +08:00
unknown 42519d9f78 fix announcement & links 2012-03-23 18:04:11 +08:00
Christophe Vilayphiou 61698f3f2c Remove quick_edit on bulletin index load 2012-03-23 17:32:59 +08:00
Christophe Vilayphiou a126935d2c Clean the parsers and introduce the metas 2012-03-21 18:30:12 +08:00
Christophe Vilayphiou 472744fc87 Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
Christophe Vilayphiou 2c6208db3c Merge branch 'master' into ldap 2012-03-21 12:44:22 +08:00
Christophe Vilayphiou 3aa7c5120d Put tinymce in its own js file.
To use on a text area just add the class "tinymce_textarea".
2012-03-21 12:41:32 +08:00
nccu a1034f90ba close alpha on nccu 2012-03-20 14:38:01 +08:00
Christophe Vilayphiou 5fcd3cd783 Merge branch 'master' into ldap 2012-03-20 14:27:04 +08:00
Christophe Vilayphiou e953344965 Fix before_filter order for object_auth 2012-03-20 14:17:28 +08:00
Christophe Vilayphiou 49ece7be6a Merge branch 'master' into ldap 2012-03-19 15:50:53 +08:00
Christophe Vilayphiou 7cc075e124 Change the monkey picture 2012-03-19 15:49:40 +08:00
Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-03-19 14:27:15 +08:00
unknown a755eb184b fix announcement links & files 2012-03-16 16:49:25 +08:00
unknown 7d553acaec fix announcement link & files 2012-03-16 15:53:57 +08:00
Christophe Vilayphiou 07edf44643 Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team 2012-03-16 15:13:06 +08:00