Commit Graph

1015 Commits

Author SHA1 Message Date
Christophe Vilayphiou 804695749d Fix bugs after removal of i18n_variable 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 53cae0a9ee Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 49dd3a1770 Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou e2ebd48b22 Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan de831f1f96 disable homepage cache for english page 2012-07-27 05:08:24 +08:00
unknown c0cac812c5 demo site widget 2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan 87549d4e1f fix for nil value 2012-07-25 17:49:16 +08:00
Matthew K. Fu JuYuan 13ec25ed10 fix for orbit bar broken 2012-07-25 17:44:50 +08:00
Matthew K. Fu JuYuan 97b4eee798 full site search with google 2012-07-25 17:20:25 +08:00
Matthew K. Fu JuYuan f9bdb4a327 New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
OrbitServer f223e4bb1e Ika's changes for orbit bar 2012-07-20 15:41:27 +08:00
unknown 10731dc211 demo widget 2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan 2ae6b54a45 fix for not working cache 2012-07-13 18:32:17 +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 773371e885 fix from messy search 2012-07-09 16:48:23 +08:00
Christophe Vilayphiou e48735a4ac Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin 2012-07-09 16:39:58 +08:00
unknown 1d8e386bde demo website widget 2012-07-09 16:28:03 +08:00
devin 68fd726ce1 little 2012-07-09 16:25:41 +08:00
devin b6266284b4 dump 2012-07-09 16:21:02 +08:00
Harry Bomrah 222c0b9564 Merge branch 'desktop_harry' into desktop_devin 2012-07-09 16:12:45 +08:00
Harry Bomrah 4796de882f Scroll down fixes 2012-07-09 16:11:31 +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
devin bfedf207c9 some changes 2012-07-09 15:37:47 +08:00
Matthew K. Fu JuYuan 49862e70f9 hide category at front end 2012-07-09 12:05:21 +08:00
devin 58d162d225 publication adjustment 2012-07-09 10:44:01 +08:00
Matthew K. Fu JuYuan 56caf4b34e category disable for backend 2012-07-06 18:11:55 +08:00
Harry Bomrah 2e94c19019 Merge branch 'desktop_devin' into desktop_harry 2012-07-06 16:12:01 +08:00
Harry Bomrah 830eb8eb62 Timeline design and timescale update 2012-07-06 16:11:03 +08:00
devin 8948ccca25 little changes 2012-07-06 16:09:26 +08:00
devin bfaed4deb4 timeline change 2012-07-05 16:49:03 +08:00
Harry Bomrah 312e63f242 New Timeline with books and seminar pages 2012-07-05 16:42:00 +08:00
Joshua Milton bb75383ef0 Seminar Pages modified 2012-07-05 16:27:59 +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 441929eb74 Latest code by joshua 2012-07-04 18:39:28 +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
Matthew K. Fu JuYuan ae2cbb728e archive for announcement 2012-07-04 17:36:51 +08:00
devin e133673736 some change 2012-07-04 13:38:18 +08:00
Harry Bomrah a0c09046a8 Timeline merge plus font update 2012-07-03 19:53:34 +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 f7107936d0 fix for checking @rulingcom.com 2012-07-03 18:21:48 +08:00
Matthew K. Fu JuYuan 9607b5bbfd rulingcom帳號不透過LDAP認證 2012-07-03 18:12:44 +08:00
Matthew K. Fu JuYuan d0632b2e4c change name format 2012-07-03 16:05:19 +08:00
Matthew K. Fu JuYuan 56ecf9c69b remove remember for nccu 2012-07-03 15:59:25 +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
devin f34cb47618 font aweosme change 2012-07-02 16:23:14 +08:00
devin 08fd07b6aa timeline and font update 2012-07-02 16:22:51 +08:00
devin 6533abf214 font awesome update 2012-07-02 11:10:01 +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 7151102a86 new page add and timeline changes 2012-06-28 17:31:48 +08:00
Matthew K. Fu JuYuan 04a23db745 fix invalid invalid byte sequence in US-ASCII for js files 2012-06-27 14:27:27 +08:00
Matthew K. Fu JuYuan 55449efb35 fix 新聞與公告QA
1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
	2.優先處理-編輯中的檔案列表,無法刪除
	3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除
2012-06-27 14:21:06 +08:00
Christophe Vilayphiou 4c4929c20a Fix js for news quick_edit and edit for files 2012-06-27 11:36:18 +08:00
Matthew K. Fu JuYuan 6a4abc6c43 fix news error 2012-06-27 09:59:32 +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 555ec86403 Timeline commit 2012-06-26 15:59:28 +08:00
Matthew K. Fu JuYuan 56b1bd9eaa add translation 2012-06-26 10:57:51 +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 a36f73bafc fix 0621 Trello:"171 頁面管理不能使用" 2012-06-22 18:19:40 +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 8dd1ab32c1 Add this toolbar, and nccu calendar fix 2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan 11247ce84c Clean up code , cache other auths. Fix sidebar 2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan 4d288fb9d1 add script for cache user 2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan 1f1868a75f cache privilege user list. 2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan 2f500ff460 For non-login user,show no drop down menu and return to home after press orbit button. 2012-05-29 16:33:38 +08:00
Matthew K. Fu JuYuan 4f484599b7 Clean up code , cache other auths. Fix sidebar 2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan ff620b41aa add script for cache user 2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan 6f0cf0e92e cache privilege user list. 2012-05-29 15:23:50 +08:00
Harry Bomrah 7488341836 Commit for app window.. 2012-05-25 15:41:07 +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 71d4241a2f Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-23 12:11:26 +08:00
Christophe Vilayphiou 006b84f6a1 Ray's fix for ie 2012-05-23 12:06:09 +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 eab82269c1 Remove seconds from date display 2012-05-22 20:19:04 +08:00
Christophe Vilayphiou d6b92fc604 Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
Christophe Vilayphiou 11a371cbb9 Fix destroy in structure
Fix sorting
2012-05-22 17:55:45 +08:00
Christophe Vilayphiou 541aa5831e JS changes to load drag and drop 2012-05-22 17:37:15 +08:00
Christophe Vilayphiou 874a89d99b Ray's fix for structure side_bar 2012-05-22 16:48:57 +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
Matthew K. Fu JuYuan 99bcdf6e1e clean up unless code 2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan 79f67208fa js for preventing user do stupid things durning ajax 2012-05-22 14:59:54 +08:00
Christophe Vilayphiou 5e9836f371 Changes for structure 2012-05-22 14:45:49 +08:00
Christophe Vilayphiou aa114568c4 Move design to site_settings side_bar 2012-05-21 18:20:39 +08:00
Christophe Vilayphiou c4d7079059 Fix's Matt code for not showing bulletins in index 2012-05-21 18:10:03 +08:00
devin 6fedf7232a app update 2012-05-21 15:45:15 +08:00
Harry Bomrah 81ff0f2c1c Merge branch 'desktop_harry' into desktop_devin 2012-05-21 15:26:38 +08:00
devin a78b72ebfc app update 2012-05-21 15:25:18 +08:00
Harry Bomrah dfe7ccf166 general commit 2012-05-21 15:24:47 +08:00
devin ab7ae6dcee app 2012-05-21 14:55:51 +08:00
Christophe Vilayphiou 815e6a8361 Fix matt's code and add it to filters 2012-05-19 03:19:55 +08:00
Christophe Vilayphiou db410b9c50 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-18 19:44:18 +08:00
Christophe Vilayphiou 4d33c7a56d Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
2012-05-18 19:42:36 +08:00
Matthew K. Fu JuYuan 661fcafe70 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan 6ce6577e83 fix news approve and preview 2012-05-18 18:47:18 +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 a4afd5c1d3 Merge branch 'design_team' into ldap 2012-05-18 10:36:32 +08:00
Christophe Vilayphiou 8ad7f70822 Proof i18n_variable for categories 2012-05-18 10:28:28 +08:00
Christophe Vilayphiou 17b6a70506 Merge branch 'design_team' into ldap 2012-05-17 23:36:24 +08:00
Matthew K. Fu JuYuan 16ada34585 fix ad_banner. new ad_image with best size from ad_banner. content editable at tab 2012-05-17 23:35:46 +08:00
Christophe Vilayphiou 5d5e798b1a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 23:35:14 +08:00
Christophe Vilayphiou a0ad1f59b6 Comment out filename in FIleAssetUploader 2012-05-17 23:34:15 +08:00
Harry Bomrah 1b1c2c0032 image title and description callback fixed… 2012-05-17 20:19:31 +08:00
Christophe Vilayphiou 60988f97fb Merge branch 'design_team' into ldap 2012-05-17 19:41:24 +08:00
Christophe Vilayphiou 2f7d561310 Put back I18n for file_upload 2012-05-17 19:40:30 +08:00
Christophe Vilayphiou 25de941df7 Merge branch 'design_team' into ldap 2012-05-17 19:10:22 +08:00
Christophe Vilayphiou 606050627e Remove I18n for file_upload html 2012-05-17 19:09:52 +08:00
Christophe Vilayphiou 698c750cd7 Merge branch 'design_team' into ldap 2012-05-17 18:37:56 +08:00
Christophe Vilayphiou 27fd2d0714 Hide assets links from side_bar 2012-05-17 18:37:46 +08:00
Christophe Vilayphiou 79f484300e Merge branch 'design_team' into ldap 2012-05-17 18:32:06 +08:00
Christophe Vilayphiou c9cbec4239 Asset changes, add description 2012-05-17 18:31:40 +08:00
Christophe Vilayphiou 5e93fe51a9 Merge branch 'design_team' into ldap 2012-05-17 16:41:11 +08:00
Christophe Vilayphiou 29c54e6480 Add mandatory fields to assets 2012-05-17 16:40:09 +08:00
Christophe Vilayphiou 1e2b146c21 Merge branch 'design_team' into ldap 2012-05-17 10:00:07 +08:00
Christophe Vilayphiou 4467bc5e48 Change Date to DateTime
Fix filename error
2012-05-17 09:59:49 +08:00
Christophe Vilayphiou bfad553cc3 Merge branch 'design_team' into ldap 2012-05-17 09:31:02 +08:00
Christophe Vilayphiou 84dac1d250 Create FileAssetUploader 2012-05-17 09:30:21 +08:00
Christophe Vilayphiou eba4671733 Merge branch 'design_team' into ldap 2012-05-17 06:46:29 +08:00
Christophe Vilayphiou cd1640482a Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
	app/views/layouts/_side_bar.html.erb
2012-05-17 06:45:30 +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 7f2564a81e Fix sidebar and hide some links by roles 2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan 82d78acbad First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued 2012-05-17 06:43:39 +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 b05836835a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:28:49 +08:00
Christophe Vilayphiou 26292f0dcc Asset upload 2012-05-17 06:28:29 +08:00
Harry Bomrah 27a0984da1 tinymce loading fixed… 2012-05-16 18:51:37 +08:00
Christophe Vilayphiou 9129835f23 Add tags to assets 2012-05-16 18:19:41 +08:00
Matthew K. Fu JuYuan 0647698012 fix ad_image size hints. fix orbit backend controller error when changing language. 2012-05-16 17:16:48 +08:00
Matthew K. Fu JuYuan befd3bcdec AdBanner reopen new banner and delete. Rename title with content editable tag. 2012-05-16 16:42:43 +08:00
Harry Bomrah 617a683d00 image insertion completed.. 2012-05-16 16:22:50 +08:00
Harry Bomrah c380c4cad0 popup fixed 2012-05-16 15:34:23 +08:00
Harry Bomrah 30137b50b4 popup fix.. 2012-05-16 15:33:54 +08:00
Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb
2012-05-16 12:13:07 +08:00
Matthew K. Fu JuYuan 88a26cc6a1 Fix sidebar and hide some links by roles 2012-05-16 12:10:16 +08:00
Harry Bomrah 75cbae049b few experiments… 2012-05-16 11:18:54 +08:00
Christophe Vilayphiou 0b0916179f Change assets 2012-05-16 11:07:11 +08:00
Christophe Vilayphiou b31846f424 Delete duplicate side_bar code 2012-05-16 04:35:19 +08:00
Christophe Vilayphiou ad9ac5f3f7 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-05-16 01:31:16 +08:00
unknown cc02ea511c archive checkbox 2012-05-16 01:13:39 +08:00
unknown cf5e6c1a96 new archive 2012-05-16 01:09:21 +08:00
unknown 4e9bb1b583 new archive 2012-05-16 01:06:26 +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 80e84c10ba Remove link from dashboard 2012-05-15 23:01:00 +08:00
Christophe Vilayphiou e54f4409fb Add impressionist 2012-05-15 21:26:09 +08:00
Christophe Vilayphiou 53a0fbddf0 Fix commit error 2012-05-15 21:25:51 +08:00
Matthew K. Fu JuYuan 3f744dab05 First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued 2012-05-15 18:55:16 +08:00
Matthew K. Fu JuYuan b23b5e8ec5 Object auth for ad_banner 2012-05-15 16:39:23 +08:00
Matthew K. Fu JuYuan 77deffb512 Nccu calendar and daily job. 2012-05-15 14:03:54 +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
Matthew K. Fu JuYuan 0a9f0bcc45 starting ad_banner auth 2012-05-15 09:57:05 +08:00
Christophe Vilayphiou 8fcb8ef8de Change the way links are displayed in menus in front-end 2012-05-14 21:43:10 +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
Matthew K. Fu JuYuan 2cd67356a5 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
	config/locales/zh_tw.yml
2012-05-14 12:36:09 +08:00
Matthew K. Fu JuYuan e1450ec748 Change to apply page to had object_auth 2012-05-14 12:34:15 +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
Matthew K. Fu JuYuan a184f96ce7 AdBanner app_auth 2012-05-14 00:49:22 +08:00
Matthew K. Fu JuYuan 8b42c595b3 Don't display admin in any premission select. Fix not necessary header for UT data 2012-05-14 00:49:22 +08:00
Christophe Vilayphiou cf8d20dc84 Add category and tag to pages 2012-05-14 00:33:52 +08:00
Christophe Vilayphiou e40c76bf5f Fix new page form
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
Christophe Vilayphiou 01d0c002f5 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	app/views/admin/pages/_edit.html.erb
	app/views/admin/pages/_form.html.erb
	lib/parsers/parser_back_end.rb
2012-05-13 23:14:13 +08:00
Christophe Vilayphiou 62e9a772f6 Fix titles for widgets
Add translations
2012-05-13 23:09:48 +08:00
Christophe Vilayphiou 4ae8299949 Add custom title to widgets
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou 281cfa6518 Changes for widgets 2012-05-13 21:55:39 +08:00
Christophe Vilayphiou 4685952bd6 Changes in page_edit 2012-05-13 20:13:26 +08:00
Christophe Vilayphiou ef2d416c70 Ray's changes for page_edit 2012-05-13 19:36:04 +08:00
Christophe Vilayphiou 82fa85def8 Clean the parsers code 2012-05-13 19:32:05 +08:00
Christophe Vilayphiou 803253ebcf Put nestedSortable in page_edit.js.erb 2012-05-12 22:12:17 +08:00
Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	app/helpers/admin/item_helper.rb
2012-05-11 18:09:34 +08:00
Christophe Vilayphiou 17b486f9e9 Fix bugs for shift_to and change items.rake for the missing position in db 2012-05-11 17:56:26 +08:00
Christophe Vilayphiou 076f5ad6ef Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +08:00
Matthew K. Fu JuYuan 82d1d3fed8 Restart job 2012-05-11 16:56:32 +08:00
Matthew K. Fu JuYuan 0a34f0277e Remove unless files and change routes. 2012-05-11 16:46:36 +08:00
Matthew K. Fu JuYuan 20a1a6e30f New Interface for App Auth and Object Auth 2012-05-11 16:44:40 +08:00
Christophe Vilayphiou 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +08:00
Harry Bomrah 1a9fa8f505 Merge branch 'desktop_harry' into desktop_devin 2012-05-11 15:28:05 +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 63f904d3b0 Fix tinymce js load
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
devin 97b60c48b2 update 2012-05-10 17:41:56 +08:00
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