Commit Graph

456 Commits

Author SHA1 Message Date
Christophe Vilayphiou 816b542ca6 Change side bar to use key instead of title for ModuleApps 2012-09-12 03:07:25 +08:00
Harry Bomrah 8dd69a140f frontend commits 2012-09-12 02:12:15 +08:00
Harry Bomrah 3749e919cb front ends updates 2012-09-12 02:12:15 +08:00
Harry Bomrah 7ae1dcd8e0 Calendar Module 2012-09-12 02:06:22 +08:00
Harry Bomrah 04877b9945 design update 2012-09-12 01:58:23 +08:00
Fu Matthew 6044857fea complete preview for both new and announcement 2012-09-07 17:55:59 +08:00
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
chris 68aed18956 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
	app/views/layouts/_side_bar.html.erb
	config/mongoid.yml
	vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
2012-08-20 23:24:41 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +08:00
Harry Bomrah 1ba87982ba Multi language and side bar update 2012-08-20 23:14:11 +08:00
Harry Bomrah 5fd367a8d9 fixed db error 2012-08-20 23:14:10 +08:00
Joshua 22c43e7f7d database fixing 2012-08-20 23:14:10 +08:00
Harry Bomrah 207d360d1e fixed db error 2012-08-20 23:11:32 +08:00
Christophe Vilayphiou ab1c457a51 Add i18n for message in editor pop-up 2012-08-14 01:20:45 +08:00
Christophe Vilayphiou 9196deb997 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-14 01:00:25 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Matthew K. Fu JuYuan 6cc470ede9 nccu fix 2012-08-13 18:35:47 +08:00
Matthew K. Fu JuYuan f1b4d9e204 Add authorization for rescue interface
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
unknown 9333503545 demo_site widget edit 2012-08-10 15:33:28 +08:00
unknown d5c55c9697 widget & frontend field 2012-08-09 15:25:30 +08:00
Harry Bomrah 2f4b93db59 Page added for desktop 2012-08-08 21:35:51 +08:00
Matt 62ba8c9f18 Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
Matthew K. Fu JuYuan e8317e0a4b 1.Remove category column when category is specified
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Christophe Vilayphiou 4bed925e0f Try fb from override and generated page 2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan 85a556a4a2 first version of fb_share 2012-08-08 11:04:19 +08:00
Matthew K. Fu JuYuan 06919e76ed fix approval at news and announcement for abnormal flags that causing search result fault. 2012-08-08 11:01:50 +08:00
Matthew K. Fu JuYuan 1cdc0e24bd First version of Solr search. 2012-08-08 10:59:55 +08:00
Harry Bomrah b0ef2b6957 Multi language and side bar update 2012-08-01 20:07:54 +08:00
Christophe Vilayphiou 0078c97b19 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 14:27:44 +08:00
Christophe Vilayphiou 9f859b903d Add custom validator and fix .html_safe with rescue 2012-07-31 14:25:46 +08:00
Matthew K. Fu JuYuan 7e3b59c09a finished tag clouds 2012-07-31 11:57:32 +08:00
Matthew K. Fu JuYuan 4dea025c8a fix for
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
Christophe Vilayphiou a8cc581279 Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou 38804bd118 Add disable for main title 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou db9c4c0e10 Partial sitemap 2012-07-27 19:13:39 +08:00
unknown c0cac812c5 demo site widget 2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan cc60ff8b4c fix for redis search limit 10 items 2012-07-26 12:09:28 +08:00
Matthew K. Fu JuYuan 4768da3c7a fix announcement loading failed caused by impression. disable pinyin search. 2012-07-25 18:26:05 +08:00
Matthew K. Fu JuYuan 97b4eee798 full site search with google 2012-07-25 17:20:25 +08:00
Matthew K. Fu JuYuan 25f4e292e6 add not found for no result 2012-07-25 13:58:09 +08:00
Matthew K. Fu JuYuan f9bdb4a327 New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
Harry Bomrah ded9326d1f db fixed 2012-07-16 20:27:34 +08:00
Harry Bomrah 9f0c0bee71 fixed db error 2012-07-16 20:26:32 +08:00
Joshua b51e656909 database fixing 2012-07-16 13:25:35 +01:00
Harry Bomrah 833c08eafc fixed db error 2012-07-16 17:29:46 +08:00
Matthew K. Fu JuYuan 4daf36908c working cache 2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan 0e65e379b0 cache first commit 2012-07-12 11:47:24 +08:00
Matthew K. Fu JuYuan 98b274d9dd add slave_ok: true to nccu172 2012-07-09 17:03:26 +08:00
unknown 1d8e386bde demo website widget 2012-07-09 16:28:03 +08:00
Matthew K. Fu JuYuan 09d46f2f75 NCCU 上傳版本 0709
Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
2012-07-09 16:02:59 +08:00
Matthew K. Fu JuYuan 9b86e8f24e fix mid site connection 2012-07-06 18:24:25 +08:00
Matthew K. Fu JuYuan 56caf4b34e category disable for backend 2012-07-06 18:11:55 +08:00
Harry Bomrah 830eb8eb62 Timeline design and timescale update 2012-07-06 16:11:03 +08:00
Matthew K. Fu JuYuan c5fdff764e orbit disable object for categories 2012-07-05 16:00:45 +08:00
Harry Bomrah 6923b82284 Added seminar section 2012-07-04 19:12:02 +08:00
Harry Bomrah f635f642fc Merge for new timeline updates and font updates 2012-07-04 18:49:10 +08:00
Joshua Milton 6b9926539d Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb
2012-07-04 18:31:00 +08:00
Joshua Milton 3f42a22094 Books section added 2012-07-04 17:55:30 +08:00
Harry Bomrah f20f36383e Timeline ajax load fixed… a bit change in structure.. 2012-07-03 19:45:47 +08:00
Matthew K. Fu JuYuan 4014f8ee47 fix over queue at resque 2012-07-03 10:51:26 +08:00
Harry Bomrah bacb1f1e63 Timeline ajax loading 2012-07-02 21:06:36 +08:00
Matthew K. Fu JuYuan 1278581a82 add rescue job . can work with init script 2012-06-29 17:42:36 +08:00
Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
Harry Bomrah 3542e58869 Merge branch 'desktop_devin' into desktop_joshua 2012-06-28 17:33:32 +08:00
Harry Bomrah 7151102a86 new page add and timeline changes 2012-06-28 17:31:48 +08:00
Harry Bomrah 32d1f8840c Merge branch 'desktop_harry' into desktop_joshua 2012-06-26 21:11:19 +08:00
Harry Bomrah 4aa155a44d timeline updates major ones.. 2012-06-26 21:09:33 +08:00
Matthew K. Fu JuYuan 818c58c1ee fix for 新聞與公告QA
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位
2012-06-26 17:46:02 +08:00
Harry Bomrah e8c3a1b904 Joshua branch update 2012-06-26 17:04:50 +08:00
Joshua Milton 8c7a0fdf0a test 2012-06-26 16:59:29 +08:00
Harry Bomrah 555ec86403 Timeline commit 2012-06-26 15:59:28 +08:00
Matthew K. Fu JuYuan ffd95ee1fd fix
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion.   may need to run:
 AppManager.all.collect{|am|  am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
Matthew K. Fu JuYuan 86a4a6cbe2 put ldap setting into config file. should load be rails env. Also make god config more friendly. 2012-06-22 14:32:28 +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
Harry Bomrah 7f0267aedd have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables 2012-06-04 18:00:06 +08:00
Matthew K. Fu JuYuan 8dd1ab32c1 Add this toolbar, and nccu calendar fix 2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan 3480fa2545 Fix login and label. Check sync jobs and update info function. 2012-05-24 17:01:00 +08:00
Christophe Vilayphiou c062b43069 Merge branch 'design_team' into ldap 2012-05-23 12:11:38 +08:00
Christophe Vilayphiou 7c44e94285 Order list by created_at desc
Add best image size in news new
2012-05-23 11:46:19 +08:00
Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap
Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
Christophe Vilayphiou d0b030c47d Put inc/ajax_setting in new_admin
Fix callback for link on save
2012-05-22 16:11:00 +08:00
Christophe Vilayphiou e1bd5d8c8d Put back db prototype_r4_development 2012-05-18 16:46:47 +08:00
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Matthew K. Fu JuYuan 5f6696a358 fix view for different_user for ad_banner. add field 'best size' for ad_banner within form 2012-05-18 14:19:13 +08:00
Christophe Vilayphiou 7c6b807170 Change impression count to exclude when :referrer is nil 2012-05-18 14:13:11 +08:00
Christophe Vilayphiou d9c12ea5a4 Proof authed_users for case when no category 2012-05-18 10:50:51 +08:00
Christophe Vilayphiou eba4671733 Merge branch 'design_team' into ldap 2012-05-17 06:46:29 +08:00
Matthew K. Fu JuYuan 0f354b8ccc fix ad_image size hints. fix orbit backend controller error when changing language. 2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan a3acd865d7 AdBanner reopen new banner and delete. Rename title with content editable tag. 2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan 03387d3c07 Object auth for ad_banner 2012-05-17 06:42:33 +08:00
Matthew K. Fu JuYuan f663985a40 starting ad_banner auth 2012-05-17 06:42:33 +08:00
Christophe Vilayphiou 6b9c8eb15d Merge branch 'design_team' into ldap 2012-05-17 06:31:57 +08:00
Christophe Vilayphiou 26292f0dcc Asset upload 2012-05-17 06:28:29 +08:00
Christophe Vilayphiou 9129835f23 Add tags to assets 2012-05-16 18:19:41 +08:00
Christophe Vilayphiou 0b0916179f Change assets 2012-05-16 11:07:11 +08:00
Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap
Conflicts:
	Gemfile
	app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
Christophe Vilayphiou e54f4409fb Add impressionist 2012-05-15 21:26:09 +08:00
Matthew K. Fu JuYuan 77deffb512 Nccu calendar and daily job. 2012-05-15 14:03:54 +08:00
Matthew K. Fu JuYuan 848d935d23 Remove unless config file 2012-05-15 11:37:45 +08:00
Matthew K. Fu JuYuan 551e1ef740 Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly. 2012-05-15 11:28:24 +08:00
Christophe Vilayphiou 59b55d1574 Merge branch 'design_team' into ldap 2012-05-14 12:42:06 +08:00
Matthew K. Fu JuYuan 9ba4c2cf2f Change to apply page to had object_auth 2012-05-14 12:40:50 +08:00
Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap
Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
Matthew K. Fu JuYuan dfd2d82efb Restart job 2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan 7a6d30ad62 Remove unless files and change routes. 2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan 0119ab1a74 New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
Christophe Vilayphiou 62e9a772f6 Fix titles for widgets
Add translations
2012-05-13 23:09:48 +08:00
Harry Bomrah 2c3637e9b4 very important update for widgets management.. 2012-05-11 15:27:16 +08:00
Christophe Vilayphiou fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +08:00
Christophe Vilayphiou 87449ec6a8 Merge branch 'design_team' into ldap 2012-05-10 10:34:28 +08:00
Matthew K. Fu JuYuan 07815eee8f fix display for announcement and remove ut field 2012-05-10 10:29:18 +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 3a38992f29 Ray's changes for mail_setting i18n 2012-05-09 12:45:27 +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 2b03263fb7 Dashboard partial implementation 2012-05-09 05:53:07 +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
Matthew K. Fu JuYuan 083963af65 Test version for DB sync schedule job 2012-05-08 19:20:53 +08:00
Christophe Vilayphiou 5c7cf1aef2 Add sub_menu to site_info 2012-05-08 17:27:02 +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 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
Harry Bomrah 2083e0bf4f widget structure improvised… 2012-05-07 19:00:50 +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 1fb6c20b86 Add site_info 2012-05-07 00:54:18 +08:00
Christophe Vilayphiou 51f87e7212 Add missing translation for enabled_for 2012-05-06 03:36:01 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Harry Bomrah fcc875bb5d app store page added… and few other changes.. 2012-05-04 20:28:12 +08:00
Matthew K. Fu JuYuan f6307abfbf fix broken ad_banner 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
Harry Bomrah a3a1e4b92e controller change, views working and db for paper and journals 2012-05-03 21:30:12 +08:00
Harry Bomrah d6cbbff9de connection page working now.. 2012-05-03 14:40:54 +08:00
Christophe Vilayphiou 088cd54b1d Merge branch 'design_team' into ldap
Conflicts:
	config/locales/zh_tw.yml
2012-04-30 08:26:07 +08:00
Christophe Vilayphiou 8a99086802 News translation 2012-04-30 08:24:58 +08:00
Christophe Vilayphiou 0f203274a7 Merge branch 'design_team' into ldap
Conflicts:
	config/locales/zh_tw.yml
2012-04-30 08:11:40 +08:00
Christophe Vilayphiou 39410267e8 Add missing translation for news 2012-04-30 08:10:26 +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
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
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 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
Harry Bomrah c158375d02 with connection and some save settings… 2012-04-26 21:30:13 +08:00
Harry Bomrah c2ac682787 updates for connections 2012-04-26 17:23:47 +08:00
Harry Bomrah 64be61d61b with gmail widget.. 2012-04-26 14:47:49 +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
Matthew K. Fu JuYuan 7f285f4719 Change ad_banner preview from using title to id 2012-04-25 16:10:11 +08:00
Christophe Vilayphiou 0c4f1d91f7 Merge branch 'ad_banner' into ldap 2012-04-24 16:46:04 +08:00
Harry Bomrah a298cbd5f6 Publication started 2012-04-24 16:45:26 +08:00
Matthew K. Fu JuYuan db46803cda R4-Billingual 2012-04-24 16:43:45 +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
Matthew K. Fu JuYuan 33640de184 Changes for Billingual 2012-04-24 14:37:06 +08:00
Matthew K. Fu JuYuan c57ba305e9 Fix ad_banner 2012-04-24 14:37:06 +08:00
Christophe Vilayphiou c856b4cdce Fix for upload image component in announcement 2012-04-24 12:41:28 +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
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 8eedbc951e add i18n vars 2012-04-23 14:07:14 +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 ff472714de AdBanner i18n vars patch 2012-04-23 14:05:18 +08:00
Harry Bomrah 02c6933d0b Tiles position saved in db and also change them from section manager 2012-04-17 16:33:41 +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
Harry Bomrah 48323ac1af lot of changes in fetching 2012-04-12 14:44:08 +08:00
Harry Bomrah 25ca29403c section page added 2012-04-11 17:58:52 +08:00
Harry Bomrah 5a6541a592 Setting page update 2012-04-11 17:26:25 +08:00
Harry Bomrah 4875b339f8 Fetching desktop from db 2012-04-11 15:31:10 +08:00
Harry Bomrah 35567c2139 Widgets Loading dynamically and semi structured 2012-04-06 23:48:03 +08:00
Harry Bomrah 7309d9c446 Dock change and getting values from db 2012-04-06 17:49:22 +08:00
Harry Bomrah ddf6a606a2 with notifications and other changes 2012-04-06 17:47:03 +08:00
Harry Bomrah 6158799a47 Stupid theme 2012-04-06 17:47:03 +08:00
Harry Bomrah 77b2919d8c Desktop Commit 2012-04-06 17:47:02 +08:00
Matthew K. Fu JuYuan 1a6242edbd fix ad_banner sidebar 2012-04-05 17:41:43 +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
Christophe Vilayphiou 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +08:00
nccu a1034f90ba close alpha on nccu 2012-03-20 14:38:01 +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
Christophe Vilayphiou b58db48d26 Changes in Gemfile 2012-03-19 14:04:28 +08:00
Christophe Vilayphiou f4fda08e86 Replace PrototypeR4 by Orbit.
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
Matt Fu d5a2de5476 LDAP with sync rake task 2012-03-06 16:41:06 +08:00
Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
	config/environments/development.rb
2012-03-01 10:13:49 +08:00
Matthew Kaito Juyuan Fu 2e58c63ff7 fix bugs with token 2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu cc550c5745 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00