Commit Graph

33 Commits

Author SHA1 Message Date
chris 189fa553c5 Changes for helpers, not including all by default 2012-10-09 14:47:16 +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 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 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 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
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
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 32b7d95669 Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +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 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
	config/environments/development.rb
2012-03-01 10:13:49 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00
Matt Fu 678f1eabef LDAP connection and modified Devise 2012-02-22 14:43:24 +08:00
Christophe Vilayphiou e0accbecaa Changes into page_part edition.
Can choose between 'text', 'public_r_tag' and 'widget'
2012-02-16 13:09:09 +08:00
Christophe Vilayphiou a0f58b543b Remove ckeditor 2012-02-15 01:05:24 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +08:00
Matthew Kaito Juyuan Fu cb07a35cc9 Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD 2011-10-20 10:06:06 +08:00
Matthew Kaito Juyuan Fu ff82391b7d Revert "Merge with new_blog"
This reverts commit 64c68fcdeb.
2011-10-20 10:01:39 +08:00
chris2tof 64c68fcdeb Merge with new_blog 2011-10-18 11:36:01 +08:00
chris2tof 090b1fdd7f rails 3.1.rc4 -> rails 3.1.rc6 2011-08-23 19:04:45 +08:00
chris2tof 86443661e9 Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
Kaito a272b871e2 complete del and destroy funciton for desgin 2011-07-22 15:54:38 +08:00
Matthew Fu f387139ae1 rails 3.1 and designs (with bug) 2011-07-12 16:00:57 +08:00
chris2tof 0969f6b6cc CKEditor.
The error came from some script in Application.js
2011-05-26 13:48:09 +08:00
chris2tof 964440fa86 Remove CKEditor due to conflicts with the jQuery library 2011-05-26 11:23:46 +08:00
chris2tof a8c4e17c56 CKEditor.
Edition of page part for single language.
2011-05-25 16:27:17 +08:00
chris2tof d9ba76ebd5 - No more Home object
- Sitemap on the left side and view of the current page in the main block
2011-05-09 18:49:57 +08:00
chris 6db9727829 revert to mongoid 2.0.0 and remove reroute_middleware 2011-04-13 18:29:33 +08:00
chris 106db069fd update radius, modify routes to handle modules, add blog module 2011-04-13 18:28:24 +08:00
ihower 19a7d51e60 Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
Wen-Tien Chang 29ee4585b2 upgrade to rails3, but grip is broken 2010-03-08 16:04:05 +08:00