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

306 Commits

Author SHA1 Message Date
devin 89e25fe7a2 view update 2012-12-07 04:21:26 +08:00
chris 6f1748d2b3 - template list/show is loaded from central server 
- buy a template downloads and creates it in DB
- changes in designs index
 2012-12-06 23:20:27 +08:00
OrbitServer b1f2749000 Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
devin 5d76600154 view update 2012-12-06 07:59:44 +08:00
devin 756bfa563b view update 2012-12-06 07:59:44 +08:00
devin 22c0eabca5 view update 2012-12-06 07:59:44 +08:00
devin 59c0cdd761 view update 
not finish all required pages yet
 2012-12-06 07:59:43 +08:00
devin d413f705a4 view update 2012-12-06 07:59:43 +08:00
devin 363ccdde4d view update 2012-12-06 07:59:43 +08:00
devin 936101358c journal update 2012-12-06 07:59:43 +08:00
devin d03f5dc1ff view update 2012-12-06 07:59:43 +08:00
chris e68c52bc00 Changes for store back-end 2012-12-05 13:46:10 +08:00
chris 9c6c622a49 Add missing icons and css for icons in layout 2012-12-03 22:31:00 +08:00
chris 036d7bbb0e Module store 2012-11-29 02:02:37 +08:00
chris 06335f9bd1 Joshua's html 2012-11-29 00:59:46 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
Harry Bomrah 9cc518b456 autocomplete done 2012-11-27 15:55:32 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan a85e5fcc0d address field. js and style is broken 2012-11-20 09:53:36 +08:00
chris b40d4702d5 Merge branch 'master' into various_bugs 
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
 2012-11-06 11:44:00 +08:00
Matthew K. Fu JuYuan beb843f75b add new member with role interface. add more not usable. 
role management new attribute is ok. delete is ok.
 2012-11-04 20:42:58 +08:00
chris cc5e238576 Fix after merge from NCCU, the translations still need to be cleaned 2012-10-30 11:08:26 +08:00
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	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/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
 2012-10-29 16:10:07 +08:00
Matthew K. Fu JuYuan bd0d975014 for user new interface, member role is working. 2012-10-26 11:27:37 +08:00
chris d7fd61ce55 Edit uploaded package 2012-10-26 11:19:57 +08:00
Matthew K. Fu JuYuan 0a1a9d2c2e member for THU 2012-10-26 11:19:56 +08:00
chris cbfa659928 Changes for side_bar 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 8b9cffd4f2 new code for attribute fields and values for new member interface 2012-10-26 11:19:55 +08:00
Harry Bomrah a5722af315 Calendar updates for day view 2012-10-26 11:15:37 +08:00
OrbitServer 9e2bc7e1c1 Ray's changes in css and js 2012-10-09 07:48:05 +08:00
Matthew K. Fu JuYuan 9f825de288 user new interface 70% 2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan 5ac04ea07d devin's css for tinymce 2012-09-28 09:58:28 +08:00
Matthew K. Fu JuYuan cfc80340b8 add setting for tinymce config 2012-09-28 09:45:50 +08:00
devin af19f11668 calendar update 
- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality)
 2012-09-14 15:57:44 +08:00
OrbitServer ee51240102 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
Christophe Vilayphiou 194773f064 Fix bugs after merge 2012-09-14 02:27:49 +08:00
Harry Bomrah 17f3104c8d Merge branch 'gallery_orbit' into desktop_devin 2012-09-12 16:18:13 +08:00
devin e96ebefe9c calendar update 2012-09-12 16:16:01 +08:00
OrbitServer 905541aa38 Ray's tp CSS changes 2012-09-12 03:50:20 +08:00
Harry Bomrah 04877b9945 design update 2012-09-12 01:58:23 +08:00
Matt 9d21a86f53 Ray's CSS changes for NCCU email 2012-09-07 18:16:34 +08:00
Harry Bomrah 94ee16ae01 design update 2012-08-23 01:36:55 +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
Christophe Vilayphiou 53c5f6a3b9 New css and images for rss 2012-08-15 18:00:55 +08:00
Christophe Vilayphiou 0d330edfa3 New css and images for rss 2012-08-15 17:42:45 +08:00
Christophe Vilayphiou a19a5415c1 Ray's changes for list.css 2012-08-15 12:13:58 +08:00
Harry Bomrah 9ff60d2ba4 form validation again 2012-08-14 01:02:45 +08:00
Christophe Vilayphiou 2bd132cef9 Pass category and tag to search to redirect to the right page 
Ray's change for mouseover (take out the black background)
 2012-08-09 19:16:26 +08:00
Matt 1aea8d91f4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-08 18:16:38 +08:00
Christophe Vilayphiou 0645f04240 Ray's change in css 2012-08-08 18:11:18 +08:00
Matt 62ba8c9f18 Fix bugs on 172:180 2012-08-08 17:56:00 +08:00
OrbitServer fbb53cca36 Ray's changes for sitemap backend 2012-08-08 11:51:20 +08:00
Matthew K. Fu JuYuan 1c62c1a799 first version of fb_share 2012-08-06 16:12:49 +08:00
Christophe Vilayphiou 934b515914 Sitemap with main 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou db9c4c0e10 Partial sitemap 2012-07-27 19:13:39 +08:00
OrbitServer f223e4bb1e Ika's changes for orbit bar 2012-07-20 15:41:27 +08:00
devin 58d162d225 publication adjustment 2012-07-09 10:44:01 +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
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 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 4aa155a44d timeline updates major ones.. 2012-06-26 21:09:33 +08:00
Harry Bomrah 555ec86403 Timeline commit 2012-06-26 15:59:28 +08:00
Harry Bomrah 7488341836 Commit for app window.. 2012-05-25 15:41:07 +08:00
Christophe Vilayphiou c062b43069 Merge branch 'design_team' into ldap 2012-05-23 12:11:38 +08:00
Christophe Vilayphiou 006b84f6a1 Ray's fix for ie 2012-05-23 12:06:09 +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 874a89d99b Ray's fix for structure side_bar 2012-05-22 16:48:57 +08:00
Christophe Vilayphiou 5e9836f371 Changes for structure 2012-05-22 14:45:49 +08:00
devin 6fedf7232a app update 2012-05-21 15:45:15 +08:00
devin a78b72ebfc app update 2012-05-21 15:25:18 +08:00
devin ab7ae6dcee app 2012-05-21 14:55:51 +08:00
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +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 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 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
Christophe Vilayphiou ef2d416c70 Ray's changes for page_edit 2012-05-13 19:36:04 +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 fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +08:00
devin 97b60c48b2 update 2012-05-10 17:41:56 +08:00
devin ada56a7a63 some update 2012-05-10 10:54:43 +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 d88d4e58dc Merge branch 'design_team' into ldap 
Conflicts:
	config/environments/development.rb
 2012-05-09 13:51:00 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +08:00
Christophe Vilayphiou a3868cb785 Ray's changes for front-end banner 2012-05-08 17:21:26 +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 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 f534e6ca7b Ray's changes for site_info 2012-05-07 15:55:45 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
devin aeaf2f05d1 Start Add Page - no function 2012-05-03 17:59:07 +08:00
devin b87cf0e2ff list page 2012-05-03 14:39:22 +08:00
devin 887bda1491 lots of change 2012-05-02 17:04:16 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
devin bfc4507696 Connection page design 2012-05-01 18:05:17 +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
devin b6fceadff4 column group experiment 2012-04-30 06:41:05 +08:00
Christophe Vilayphiou 851dc72f42 Ray's changes in css and html 2012-04-30 00:17:18 +08:00
devin 03f19b80b4 small change 2012-04-28 01:49:48 +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
devin 2ebba577eb journal start 2012-04-27 14:04:11 +08:00
Christophe Vilayphiou 5aca3db95f Ray's changes for structure and web_links 2012-04-27 11:02:56 +08:00
devin 682880c5bf skip it 2012-04-26 23:18:52 +08:00
Christophe Vilayphiou 7d6b82d9dd Merge branch 'ad_banner' into ldap 2012-04-26 17:15:44 +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 65a6f9c416 Ray's css fix for quick edit 2012-04-25 16:26:27 +08:00
Christophe Vilayphiou d1f687e43e Merge branch 'design_team' into ldap 2012-04-24 16:32:30 +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 45c194e870 Ray's changes in css 2012-04-24 15:15:36 +08:00
Christophe Vilayphiou b80339d704 Ray's changes for image upload component and sign-in page 2012-04-24 11:35:50 +08:00
Christophe Vilayphiou 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 0c4328987a Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +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 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 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
nccu fe9032787c NCCU ldap debug 2012-04-23 10:13:44 +08:00
devin 2ebed9e44a javascript update 2012-04-20 09:45:40 +08:00
devin 19750d69e0 some update 2012-04-20 05:38:53 +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
Harry Bomrah 6b35cf821e some updates 2012-04-18 18:15:02 +08:00
devin 8cd4844689 html change 2012-04-17 16:32:11 +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 f54dba8b0b Merge branch 'master' into desktop_harry 2012-04-13 13:39:00 +08:00
Harry Bomrah 6b43e70f53 Merge branch 'desktop_harry' into desktop_devin 2012-04-12 22:21:05 +08:00
Harry Bomrah 193cee2df7 new icons and widgets 2012-04-12 22:18:58 +08:00
devin eabbba76fc css change 2012-04-12 18:14:26 +08:00
Christophe Vilayphiou 93ac99d235 Add missing css in "inc" 2012-04-12 18:12:46 +08:00
devin 67d1f7ad08 lots of change 2012-04-12 14:19:53 +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 7bca339a5b Ray's fix for columns width in bulletins 2012-04-12 07:01:34 +08:00
devin 0219c3df28 various update 2012-04-11 15:04:00 +08:00