saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,725 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

465 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 959b6aee12 fix for listing object error 2012-09-19 10:45:03 +08:00
Matthew K. Fu JuYuan 19db9d0037 basic function 2012-09-17 13:32:52 +08:00
OrbitServer ee51240102 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
unknown 42d50ae534 Plugins 2012-09-14 00:05:31 +08:00
Matthew K. Fu JuYuan 5fb94f644d break down Ray's HTML 2012-09-14 00:02:22 +08:00
Matthew K. Fu JuYuan 4818e3f444 first version for new member html 2012-09-14 00:02:21 +08:00
Christophe Vilayphiou 2e9af5d1a8 fix commit bugs 2012-09-13 15:53:36 +08:00
unknown a1560ebcf5 update archive 2012-08-30 15:17:39 +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
Harry Bomrah 263cf130e2 tp 2012-08-20 23:16:54 +08:00
Christophe Vilayphiou 96fd89cca3 Fix js for ie in list 2012-08-16 01:09:45 +08:00
Christophe Vilayphiou fb53ad524a Add time to announcement quick edit 
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
 2012-08-14 14:38:21 +08:00
Harry Bomrah 9ff60d2ba4 form validation again 2012-08-14 01:02:45 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Christophe Vilayphiou 33fc96ac7c Changes for NCCU after email 2012-08-11 18:19:30 +08:00
unknown d5c55c9697 widget & frontend field 2012-08-09 15:25:30 +08:00
Christophe Vilayphiou c8dcc9734d Change width for site map frontend, add link for more in announcement widget 2012-08-08 10:53:04 +08:00
Christophe Vilayphiou 292105bdf1 Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie 2012-08-08 10:53:04 +08:00
Christophe Vilayphiou ecc5c39840 Fix remote upload file for tinymce 2012-08-08 10:51:54 +08:00
Harry Bomrah 4660c26b7a fix for ie8,9 for tinymce 2012-08-07 20:55:18 +08:00
Christophe Vilayphiou 8ea7bf75cd Fix uploader, ie9 ok, not ie8 2012-08-07 17:32:15 +08:00
Christophe Vilayphiou df9a1e8057 Fix typo 2012-08-01 17:11:37 +08:00
Christophe Vilayphiou f917adcdf3 Fix typo 2012-08-01 17:09:00 +08:00
Christophe Vilayphiou 0d048de33f Fix link in sitemap 2012-08-01 17:08:07 +08:00
Christophe Vilayphiou 83acb78966 path instead of url 2012-08-01 17:05:34 +08:00
Christophe Vilayphiou 410dfe62e8 Fix typo 2012-08-01 17:03:39 +08:00
Christophe Vilayphiou 02ade108d0 Fix typo 2012-08-01 16:59:11 +08:00
Christophe Vilayphiou 4df4274629 Add links to frontend_sitemap 2012-08-01 16:38:07 +08:00
Christophe Vilayphiou ecb75fd085 Fix typo 2012-07-30 18:37:20 +08:00
Christophe Vilayphiou 39b63a970c Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
Christophe Vilayphiou 7440727acd Fix: "._type" to ".class" 2012-07-30 17:21:37 +08:00
Christophe Vilayphiou a8cc581279 Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou 934b515914 Sitemap with main 2012-07-27 19:13:39 +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
Christophe Vilayphiou 12f9f666eb Fix bugs after i18n_variable removal 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 53cae0a9ee Remove i18n_variable for views 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 87549d4e1f fix for nil value 2012-07-25 17:49:16 +08:00
Matthew K. Fu JuYuan 97b4eee798 full site search with google 2012-07-25 17:20:25 +08:00
unknown 10731dc211 demo widget 2012-07-18 18:07:45 +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 1f1868a75f cache privilege user list. 2012-05-29 17:17:26 +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 6f0cf0e92e cache privilege user list. 2012-05-29 15:23:50 +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 541aa5831e JS changes to load drag and drop 2012-05-22 17:37:15 +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
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 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
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 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 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
Harry Bomrah 617a683d00 image insertion completed.. 2012-05-16 16:22:50 +08:00
Harry Bomrah 30137b50b4 popup fix.. 2012-05-16 15:33:54 +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 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 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 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 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 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 076f5ad6ef Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +08:00
Christophe Vilayphiou 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +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
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
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 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 9d01f624da Merge branches 'nccu_0509' and 'design_team' into ldap 2012-05-09 14:21:24 +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 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 18c42a80a6 Put site_settings in the orbit_button 2012-05-08 20:06:56 +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
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 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
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 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 2762c24593 Fix wrong variable names in translations 2012-05-02 16:22:06 +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
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 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