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

2018 Commits

Author SHA1 Message Date
Christophe Vilayphiou bfd55277d7 Embed attribute_fields and sub_roles 2012-01-24 11:57:27 +08:00
chris2tof 1bbb197fba Forgot to remove ":remote => true" for asset new 2012-01-24 11:56:08 +08:00
chris2tof b04d845a5a New rss.js from Harry and fix html form for assets 2012-01-24 11:56:08 +08:00
unknown 4cfae9c107 announcement widget query 2012-01-18 21:34:26 +08:00
Christophe Vilayphiou 3e912b6262 Merge branches 'master' and 'exception_notification' into new_announcement_dev 2012-01-16 07:57:40 +08:00
chris2tof 4be97f6ea6 Merge branch 'fix_it' 
Conflicts:
	app/assets/javascripts/page_edit.js
	app/assets/javascripts/rss.js
	app/assets/stylesheets/admin.css.erb
	app/assets/stylesheets/admin_back_end.css.erb
	app/controllers/admin/app_auths_controller.rb
	app/controllers/admin/module_apps_controller.rb
	app/controllers/admin/users_controller.rb
	app/controllers/application_controller.rb
	app/models/app_auth.rb
	app/models/user/user.rb
	app/views/admin/app_auths/index.html.erb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_new.html.erb
	app/views/admin/designs/new.html.erb
	app/views/admin/infos/_form.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/module_apps/index.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/roles/_form.html.erb
	app/views/admin/roles/_sub_role.html.erb
	app/views/admin/users/_form.html.erb
	app/views/admin/users/_show_sub_role.html.erb
	app/views/admin/users/_sub_role.html.erb
	app/views/admin/users/edit.html.erb
	app/views/admin/users/index.html.erb
	app/views/admin/users/new.html.erb
	app/views/admin/users/show.html.erb
	app/views/layouts/admin.html.erb
	lib/fraisier/layout.html
	lib/parsers/parser_back_end.rb
	lib/parsers/parser_layout.rb
	lib/tasks/dev.rake
	spec/models/app_auth_basic.rb
	vendor/built_in_modules/NewBlog/.gitignore
	vendor/built_in_modules/NewBlog/Gemfile
	vendor/built_in_modules/NewBlog/Gemfile.lock
	vendor/built_in_modules/NewBlog/MIT-LICENSE
	vendor/built_in_modules/NewBlog/NewBlog.gemspec
	vendor/built_in_modules/NewBlog/README.rdoc
	vendor/built_in_modules/NewBlog/Rakefile
	vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
	vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
	vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
	vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
	vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
	vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
	vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
	vendor/built_in_modules/NewBlog/app/models/.gitkeep
	vendor/built_in_modules/NewBlog/app/models/comment.rb
	vendor/built_in_modules/NewBlog/app/models/post.rb
	vendor/built_in_modules/NewBlog/app/views/.gitkeep
	vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
	vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
	vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
	vendor/built_in_modules/NewBlog/config/locales/en.yml
	vendor/built_in_modules/NewBlog/lib/NewBlog.rb
	vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
	vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
	vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
	vendor/built_in_modules/NewBlog/script/rails
	vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
	vendor/built_in_modules/NewBlog/test/dummy/Rakefile
	vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
	vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
	vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
	vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
	vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
	vendor/built_in_modules/NewBlog/test/dummy/config.ru
	vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
	vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/public/404.html
	vendor/built_in_modules/NewBlog/test/dummy/public/422.html
	vendor/built_in_modules/NewBlog/test/dummy/public/500.html
	vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
	vendor/built_in_modules/NewBlog/test/dummy/script/rails
	vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
	vendor/built_in_modules/NewBlog/test/test_helper.rb
	vendor/built_in_modules/blog/app/controllers/application_controller.rb
	vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
	vendor/built_in_modules/blog/app/helpers/application_helper.rb
	vendor/built_in_modules/blog/app/models/comment.rb
	vendor/built_in_modules/blog/app/models/post.rb
	vendor/built_in_modules/blog/app/views/layouts/application.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
	vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/blog/config/initializers/inflections.rb
	vendor/built_in_modules/blog/config/initializers/mime_types.rb
	vendor/built_in_modules/blog/public/404.html
	vendor/built_in_modules/blog/public/422.html
	vendor/built_in_modules/blog/public/500.html
	vendor/built_in_modules/blog/public/favicon.ico
	vendor/built_in_modules/blog/public/stylesheets/.gitkeep
	vendor/built_in_modules/blog/script/rails
	vendor/built_in_modules/blog/vendor/plugins/.gitkeep
	vendor/built_in_modules/new_blog/.gitignore
	vendor/built_in_modules/new_blog/Gemfile
	vendor/built_in_modules/new_blog/Gemfile.lock
	vendor/built_in_modules/new_blog/MIT-LICENSE
	vendor/built_in_modules/new_blog/README.rdoc
	vendor/built_in_modules/new_blog/Rakefile
	vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
	vendor/built_in_modules/new_blog/app/controllers/.gitkeep
	vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
	vendor/built_in_modules/new_blog/app/helpers/.gitkeep
	vendor/built_in_modules/new_blog/app/mailers/.gitkeep
	vendor/built_in_modules/new_blog/app/models/.gitkeep
	vendor/built_in_modules/new_blog/app/models/comment.rb
	vendor/built_in_modules/new_blog/app/models/post.rb
	vendor/built_in_modules/new_blog/app/views/.gitkeep
	vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
	vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
	vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
	vendor/built_in_modules/new_blog/config/locales/en.yml
	vendor/built_in_modules/new_blog/lib/new_blog/version.rb
	vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
	vendor/built_in_modules/new_blog/new_blog.gemspec
	vendor/built_in_modules/new_blog/script/rails
	vendor/built_in_modules/new_blog/test/NewBlog_test.rb
	vendor/built_in_modules/new_blog/test/dummy/Rakefile
	vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
	vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
	vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
	vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
	vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
	vendor/built_in_modules/new_blog/test/dummy/config.ru
	vendor/built_in_modules/new_blog/test/dummy/config/application.rb
	vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
	vendor/built_in_modules/new_blog/test/dummy/config/database.yml
	vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
	vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
	vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
	vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/public/404.html
	vendor/built_in_modules/new_blog/test/dummy/public/422.html
	vendor/built_in_modules/new_blog/test/dummy/public/500.html
	vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
	vendor/built_in_modules/new_blog/test/dummy/script/rails
	vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
	vendor/built_in_modules/new_blog/test/test_helper.rb
	vendor/plugins/NewBlog/.gitignore
	vendor/plugins/NewBlog/Gemfile
	vendor/plugins/NewBlog/Gemfile.lock
	vendor/plugins/NewBlog/MIT-LICENSE
	vendor/plugins/NewBlog/NewBlog.gemspec
	vendor/plugins/NewBlog/README.rdoc
	vendor/plugins/NewBlog/Rakefile
	vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
	vendor/plugins/NewBlog/app/controllers/.gitkeep
	vendor/plugins/NewBlog/app/helpers/.gitkeep
	vendor/plugins/NewBlog/app/mailers/.gitkeep
	vendor/plugins/NewBlog/app/models/.gitkeep
	vendor/plugins/NewBlog/app/views/.gitkeep
	vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
	vendor/plugins/NewBlog/app/views/layouts/production.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
	vendor/plugins/NewBlog/config/locales/en.yml
	vendor/plugins/NewBlog/lib/NewBlog/version.rb
	vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
	vendor/plugins/NewBlog/script/rails
	vendor/plugins/NewBlog/test/NewBlog_test.rb
	vendor/plugins/NewBlog/test/dummy/Rakefile
	vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
	vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
	vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
	vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
	vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
	vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
	vendor/plugins/NewBlog/test/dummy/config.ru
	vendor/plugins/NewBlog/test/dummy/config/application.rb
	vendor/plugins/NewBlog/test/dummy/config/boot.rb
	vendor/plugins/NewBlog/test/dummy/config/database.yml
	vendor/plugins/NewBlog/test/dummy/config/environment.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
	vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
	vendor/plugins/NewBlog/test/dummy/config/routes.rb
	vendor/plugins/NewBlog/test/integration/navigation_test.rb
	vendor/plugins/NewBlog/test/test_helper.rb
 2012-01-12 18:15:43 +08:00
Matthew Fu c0efb5d1bc Listing for Module-apps 2012-01-12 14:13:41 +08:00
unknown ec235bcaa3 merge with master 2012-01-11 20:31:52 +08:00
Matthew Fu cae3daa9c4 Change NewBlog to new_blog 2012-01-10 18:29:11 +08:00
Matthew Fu 79f778ad8c creating for disabling widgets and frontend 2012-01-05 16:21:33 +08:00
Matthew Fu 7b40706aed fixing for app_auth 2012-01-05 16:20:51 +08:00
chris2tof 7ebfe3a7f9 Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug 2011-12-29 18:08:08 +08:00
chris2tof d85f29e65c Fix missing modification for "panel_main" to "back_main" 2011-12-29 17:49:48 +08:00
chris2tof c1238a7043 Prefix ids with "back_" in back-end layout to avoid conflict with site's ids 2011-12-29 15:35:13 +08:00
chris2tof ea19f11fe2 Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
chris2tof b002c411ce Merge branch 'design_team' 2011-12-28 21:03:35 +08:00
Christophe Vilayphiou 75c9851dbc Ray's back-end modifications for sub-roles 2011-12-28 20:57:18 +08:00
chris2tof 090493fd51 Re-commit 2011-12-28 20:51:52 +08:00
chris2tof 245def9cb6 Integration of pop-up and generic js.erb 2011-12-28 20:49:53 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +08:00
Christophe Vilayphiou fc591ee308 Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
Matthew Fu d3ca1647be fix page form bugs 2011-12-23 13:54:28 +08:00
chris2tof a9f06b9517 Divide parser into sub-parsers 2011-12-22 16:23:48 +08:00
chris2tof d465febca7 merge with november_presentation 2011-12-22 15:43:38 +08:00
chris2tof e7c9816139 Move NewBlog to built_in_modules and delete "vendor/templates" 2011-12-22 01:38:27 +08:00
chris2tof a09f8e4551 merge with november_presentation 2011-12-20 16:47:17 +08:00
chris2tof afbffe37d5 Users can now be saved with sub_roles 2011-12-20 14:35:28 +08:00
chris2tof 4108ebf06d Fix mongoid deeply nested polimorphic 
Got the commit from github. The roles and sub_roles save.
 2011-12-19 21:22:26 +08:00
chris2tof d27d7a623c Changes for sub_roles 
Issues: update doesn't create new i18n_variables, role form has bugs
 2011-12-18 10:07:42 +08:00
chris2tof d23cf152da Merge 'standardization' and 'role structure modification' 2011-12-10 18:21:59 +08:00
chris2tof b7ac5478b4 Change role structure 
Still needs to: change the views and create sub_roles in the dev.rake
 2011-12-10 18:12:39 +08:00
Christophe Vilayphiou f774084e9a Back-end standardization 2011-12-10 18:03:32 +08:00
chris2tof e0cdedfa2e Remove useless controller and view 
user_attributes_controller and user_attributes views
 2011-12-06 18:12:12 +08:00
chris2tof b77282c643 Test redmine service-hook 2011-12-05 19:28:06 +08:00
chris2tof 69a8fce64a Fix double loading bug 
On an html load, the page was reload by the js "popstate"
 2011-12-05 11:22:32 +08:00
chris2tof 26b49dcf02 Remove js from html 2011-12-05 10:36:25 +08:00
chris2tof 962bf03af2 Remove snippet 2011-12-05 10:27:22 +08:00
chris2tof f3f405c1b4 Remove useless files in items 2011-12-05 09:56:26 +08:00
chris2tof 75a3c4d5b1 Modify assets 
Each layout has a manifest for css and js
 2011-12-05 09:54:41 +08:00
chris2tof a0ec38ca99 Merge with branch november_presentation 2011-12-01 13:50:49 +08:00
chris2tof b68f5e11e5 Final modifications for the presentation 2011-11-22 18:54:10 +08:00
chris2tof 66bc0ce560 Modified dev.rake 2011-11-20 03:16:35 +08:00
chris2tof a03e9bada8 Add missing translations 2011-11-20 02:14:51 +08:00
chris2tof ad9f9bbf5c Final Ray's modifications 2011-11-19 21:47:18 +08:00
chris2tof dac6348402 Integration of module_app workflow 2011-11-19 14:33:26 +08:00
chris2tof 65349796d0 Ray's modifications 2011-11-18 16:43:14 +08:00
chris2tof 861237d65b Integration of Ray' modifications 2011-11-17 20:02:58 +08:00
chris2tof c4810274ec Rescue nil values for attribute_values in User 2011-11-16 18:41:09 +08:00
chris2tof bcf487f264 Merge branch 'november_presentation' of github.com:Rulingcom/orbit into november_presentation 2011-11-16 18:37:29 +08:00
chris2tof 0556dc9297 ika's modification to the backend 2011-11-16 18:34:54 +08:00
Matthew Fu 5c3ae104f0 Add log info for asking restart after app module installed 2011-11-16 17:01:44 +08:00
Matthew Fu 84ebc8306b APP zip package placed in lib now can be unzip into vendor 
APP zip package placed in lib now can be unzip into vendor,however
server can not restart
 2011-11-16 15:21:31 +08:00
chris2tof c1d77fa6d6 Changes for purchases - handle different type of purchases 2011-11-14 10:22:31 +08:00
chris2tof d9d7099da6 Fix bug: users can now be saved 2011-11-12 17:54:45 +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 2e86d8081f Modifications for images in html code 2011-10-18 11:21:24 +08:00
chris2tof 0ca354cfd0 Clean code and new image uploader 2011-09-14 15:11:50 +08:00
chris2tof f2e3cb00db Fix bug when editing a page, the theme wasn't including blank 2011-09-13 14:03:03 +08:00
chris2tof 4db88282a1 Modification in Design structure_css -> default_css 2011-09-13 11:57:20 +08:00
chris2tof 07ccacb7d7 Modifications of the JS in Design 2011-09-09 15:40:13 +08:00
chris2tof 77b8fcdd1d Fix previous workaround for the uploaded Design 2011-09-09 13:44:43 +08:00
chris2tof a571d1dcff Clean code and workaround mongoid embedded with carrierwave 2011-09-08 18:12:04 +08:00
chris2tof a1391493a3 Revert change in layout/admin.html.erb 2011-09-07 14:03:53 +08:00
chris2tof 0956e9784a Fix bug in layout, parser and change lib/fraisier 2011-09-07 11:53:16 +08:00
chris2tof 22c9ca4c74 Handle "reset.css" and add link in the generated menu 2011-09-05 16:06:17 +08:00
chris2tof 151f005815 structure.css -> default.css 
Themes are optional, a theme overrides style in default.css
 2011-09-05 15:18:36 +08:00
chris2tof f4b1d1e182 Modifications in Layout 
In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch)
 2011-09-05 01:14:49 +08:00
chris2tof b2c0047d0f Modification in parse_urls in both layout.rb and theme.rb 2011-09-02 19:19:34 +08:00
chris2tof 25355e9c7f Force encoding and stip filename in Theme::parse_urls 2011-09-01 19:14:34 +08:00
chris2tof 9101a2921e Modifications for image urls 
Find and replace the urls by the file urls in DB, in the theme files and
layout.html file. Save a copy of those files under "file_orig".
 2011-09-01 19:08:45 +08:00
chris2tof f78400c274 Clean code 
Moved the unzip_design method as protected
 2011-09-01 19:06:49 +08:00
chris2tof 492f691469 Modifications for menu in Design 2011-09-01 09:12:49 +08:00
chris2tof 294e06d630 Change "RulingSite" into "Orbit" 2011-08-25 17:59:49 +08:00
chris2tof 983c86e653 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 16:04:47 +08:00
chris2tof 8b576cac48 Fix bug when selecting theme 2011-08-25 15:44:52 +08:00
chris2tof 230842d26a Ika fix bug 2011-08-25 15:44:51 +08:00
chris2tof 32849f1d1b Set default design to first design 2011-08-25 15:08:42 +08:00
chris2tof c248b729db CSS problem for page 2011-08-25 15:08:23 +08:00
chris2tof f898a29fdf Add site link in menu 2011-08-25 08:56:01 +08:00
chris2tof 2afe961416 Modify check if site is up-to-date 2011-08-25 08:30:18 +08:00
chris2tof 4540f23a3f Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 08:18:22 +08:00
chris2tof c427e2af14 Page form with drop down. Modifications for Designs 2011-08-25 08:13:38 +08:00
chris2tof c678545160 Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1 2011-08-25 08:08:09 +08:00
chris2tof 4cd9854706 Ika's changes 2011-08-25 08:07:18 +08:00
chris2tof 27d47215e9 Modify edit page. Still need to handle "form" with drop down lists 2011-08-24 02:34:24 +08:00
chris2tof 1d214bedec Revert "Revert "Clean code and add 'name' in theme.rb"" 
This reverts commit 00813c9060.
 2011-08-24 02:06:27 +08:00
chris2tof 00813c9060 Revert "Clean code and add 'name' in theme.rb" 
This reverts commit 608180646b.
 2011-08-24 02:04:54 +08:00
chris2tof 608180646b Clean code and add 'name' in theme.rb 2011-08-24 01:39:28 +08:00
chris2tof 118455aa81 Check if site is up-to-date 2011-08-23 19:40:49 +08:00
chris2tof e0e14ddfac Modify purchases list 2011-08-23 16:33:01 +08:00
chris2tof 09cdb9a852 CSS modifications for design team 2011-08-23 15:59:07 +08:00
chris2tof 2842001a3b Update source: pull from git 2011-08-23 15:01:22 +08:00
chris2tof 4f38074932 content.css -> content.css.erb 2011-08-23 10:05:16 +08:00
chris2tof 2cdb5a756d Set store_ip in config.yml 2011-08-22 14:01:51 +08:00
chris2tof 7a4ad240a8 Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +08:00
chris2tof e74f2931b1 Modifications asset pipeline 2011-08-20 22:54:07 +08:00
chris2tof 20afb23a5f Embed layout_parts in layout and correct typo 2011-08-18 16:27:04 +08:00
chris2tof 86443661e9 Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
Kaito d2c2e174ac uploading is ok,checking parsing result is needed 2011-08-16 17:10:16 +08:00
Kaito d75dd4f936 completing the code with segment fault 2011-08-16 12:14:01 +08:00
Kaito 8895b9fe20 automate get files with anyname 2011-08-15 18:47:02 +08:00
Kaito 16001fb2c9 fix segment fault 2011-08-12 18:11:51 +08:00
Kaito f6ae58cef4 Trying to create Design from upload package 2011-08-12 17:47:03 +08:00
Kaito e0811c14db adding upload package for design. bugs in 2011-08-11 18:20:16 +08:00
Kaito 34d0b8fac1 complete new parser for layout_part 2011-08-10 17:28:10 +08:00
chris2tof 278938a52d Fixed: layout.file is saved when the design is created 2011-08-08 17:51:37 +08:00
Kaito 9cea77430f dealing with layout file bug 2011-08-08 17:23:20 +08:00
Kaito 37633ac23d put layout object as embeded obj in design. have bug with solving uploading file 2011-08-08 12:29:32 +08:00
Kaito 706ec745c3 modified V,C,M related with layout and have bug between layout and design 2011-08-08 09:30:44 +08:00
Kaito c8d58e30aa make design work with layout and testing with package andreas05 within r tag 2011-08-01 18:17:28 +08:00
Kaito b6db304579 add nokogiri into Gemfile and fixing dup bug again... 2011-07-29 17:49:10 +08:00
Kaito c9e4d0f345 in design,after online editing,return json url,callback not finish 2011-07-28 18:54:31 +08:00
Kaito 1839269581 finishing saving edited file online and redo dev.rake modification 2011-07-28 18:08:16 +08:00
Kaito 9eb80d7424 Made r_editor into class style add functions 2011-07-27 17:23:01 +08:00
Kaito dabd6dd5b5 Fixing upload bug 2011-07-26 18:22:17 +08:00
Kaito 1ac10e70a2 redo lost code.... 2011-07-22 16:28:41 +08:00
Kaito a272b871e2 complete del and destroy funciton for desgin 2011-07-22 15:54:38 +08:00
Kaito 6903dc3037 adding modified design.rb for sloving dup prob 2011-07-22 11:10:14 +08:00
chris2tof 9898bd9df7 Modification in JS to upload more than 2 files 2011-07-21 11:22:31 +08:00
Matthew Fu f8d1a1315b fixing duplicate when updating design 2011-07-20 17:05:28 +08:00
Matthew Fu e3a50ccf69 move design file field to partial 2011-07-20 14:04:16 +08:00
Matthew Fu 612ed629bc fix design upload 2011-07-20 09:58:24 +08:00
Matthew Fu c48a11d9f5 Add some JS for design uploading 2011-07-19 18:31:53 +08:00
chris2tof c3ada90365 CarrierWave workaround: the files have to be saved manually 2011-07-14 08:48:42 +08:00
Matthew Fu f73f09ffcf adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
Matthew Fu f387139ae1 rails 3.1 and designs (with bug) 2011-07-12 16:00:57 +08:00
chris2tof 96a43f023e Edit code (HTML response) 2011-06-10 15:02:34 +08:00
chris2tof a695b9ad29 Items UI changes 2011-06-10 13:57:42 +08:00
chris2tof 247b8ec4dc HTML code can be modify (paser: update) 2011-06-10 10:31:50 +08:00
chris2tof dda4b30d67 Set editable parts 2011-06-01 15:49:55 +08:00
chris2tof 7b5ea870a0 Delete page. 2011-06-01 12:00:41 +08:00
chris2tof ddc7c74436 Create page. 2011-06-01 10:24:14 +08:00
chris2tof 2522cde2f5 Edition of page part for multiple languages. 2011-05-27 11:27:54 +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 d971a8ecbe Uniformized: @page and @ link in @item 
Change parser for page edition.
 2011-05-25 14:50:56 +08:00
chris2tof 3d97c5bfda Modification of the page model 2011-05-18 10:00:00 +08:00
chris2tof 4399804e19 Delete link handle JavaScript disabled 2011-05-13 09:59:29 +08:00
chris2tof 24ae7ed5e3 Links edition 2011-05-13 09:08:42 +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
chris2tof 2e632f1596 #request_uri is deprecated. 2011-05-02 13:28:38 +08:00
chris2tof 43d87ecf98 Destroy user_attributes and attribute_values when a user is destroyed 2011-05-02 13:23:39 +08:00
chris2tof 83bbd77d96 Built-in user_attribute_models 2011-05-02 12:07:31 +08:00
chris2tof 509c106b3e Modifications of the user model 2011-04-28 22:47:34 +08:00
chris2tof 1909edbe2a Simplification of the 'link_back' code 2011-04-19 15:05:48 +08:00
ihower 8a4cffae8f Remove files which should be deleted in previous commit 2011-04-13 18:53:47 +08:00
chris 0067ac48a5 include Mongoid::Timestamps 2011-04-13 18:22:52 +08:00
chris fa81b04eee fix bug: quotes in html tags 2011-04-13 18:22:52 +08:00
chris 25752b7065 tags: image and css - show ID in assets/index 2011-04-13 18:22:52 +08:00
chris 5151449bc9 radius parser for multilingual - dev.rake 2011-04-13 18:22:51 +08:00
chris fc98757772 base layout on id instead of name 2011-04-13 18:22:51 +08:00
chris 8b8eff6920 replace Liquid by Radius 2011-04-13 18:22:51 +08:00
chris 4b4cdbfd31 admin status change 2011-04-13 18:22:50 +08:00
chris e62df90117 user can't delete self and flash_messages 2011-04-13 18:22:50 +08:00
chris 318c264cae add user_info 2011-04-13 18:22:50 +08:00
chris a06aa15721 add files 2011-04-13 18:22:50 +08:00
chris 2ccc2c9b39 add user_info 2011-04-13 18:22:50 +08:00
chris 73b75ec0b6 rescue [] user.active_attributes when nil 2011-04-13 18:22:50 +08:00
chris 27bdbadf08 404 for pages and asset column error 2011-04-13 18:22:49 +08:00
rulingcom d28a71f5bf remove .empty? which shouldn't be here 2011-04-13 18:22:49 +08:00
rulingcom c44b86f284 fix bugs for i18n_variable in page and home 2011-04-13 18:22:49 +08:00
chris bda67684bd mongoid rc_6 & fix bugs 2011-04-13 18:22:49 +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 554aa0a95d Support i18n and select options user attributes, but admin edit is broken 2010-03-18 17:57:26 +08:00
Wen-Tien Chang bebc51e8bb Admin can new/edit user_attributes 2010-03-15 17:35:01 +08:00
Wen-Tien Chang 263da6aa9f Let admin can choose user attributes checkbox 2010-03-15 16:13:26 +08:00
Wen-Tien Chang a40b117fbe add rough user attributes API 2010-03-08 17:14:59 +08:00
Wen-Tien Chang 29ee4585b2 upgrade to rails3, but grip is broken 2010-03-08 16:04:05 +08:00
Wen-Tien Chang 9f1de1b543 Add UserAttribute model, suppose it will store user model want to use which attribute group 2010-03-04 17:11:18 +08:00
Wen-Tien Chang 13065aa85a Add devise gem and panel/users controller 2010-03-04 16:33:26 +08:00
Wen-Tien Chang e87b3c1d61 upgrade to mongo_mapper 0.7.0 2010-03-01 16:18:28 +08:00
Wen-Tien Chang bd46cb1b12 remove component link 2010-02-22 17:10:08 +08:00
Wen-Tien Chang 496d73487b Fixed Item#parent_name again 2010-02-22 17:09:39 +08:00
Wen-Tien Chang 93169b1098 Add Item list interface, but acts_as_list can not used 2010-02-22 16:10:13 +08:00
Wen-Tien Chang f9b1618ac7 Fixed Item#parent_name 2010-02-22 15:27:11 +08:00
Wen-Tien Chang 9fa03db2c0 Let nested route works 2010-02-11 16:46:20 +08:00
Wen-Tien Chang 66a462faa8 Add nested route url 2010-02-05 17:18:57 +08:00
Wen-Tien Chang e11dc5dd83 check uniqueness for item, layout and snippet 2010-02-05 17:04:07 +08:00
Wen-Tien Chang 3d6446041b handle destroy layout 2010-02-05 16:59:41 +08:00
Wen-Tien Chang 11991320d2 fix foreign key should be ObjectID 2010-02-05 16:53:52 +08:00
Wen-Tien Chang 8f5c6d1a56 destroy static file after destroy asset 2010-02-05 16:18:07 +08:00
Wen-Tien Chang 0f7dce8aa6 save asset static file 2010-02-05 16:15:16 +08:00
Wen-Tien Chang a19e0dba6c Add asset model and controller 2010-02-01 17:24:28 +08:00
Wen-Tien Chang 8da5323fd0 Let page edit from can select layout 2010-01-28 17:42:55 +08:00
Wen-Tien Chang 12de9d2514 Add validation for item.name, only allow [a-zA-z-_] 2010-01-28 17:30:35 +08:00
Wen-Tien Chang aab1199aee Add rake dev:build for pages 2010-01-18 16:23:33 +08:00
Wen-Tien Chang 32e8bd108f Add Item#ancestors 2010-01-18 15:52:52 +08:00
Wen-Tien Chang e1440a79d8 Add Item, Page, Component, Link inheritanced models 2010-01-14 18:30:53 +08:00
Wen-Tien Chang cd21cadfe7 Add panel namespace 2010-01-11 17:53:44 +08:00
Wen-Tien Chang 314f6d5219 Add reroute middleware hack 2010-01-11 17:09:50 +08:00
Wen-Tien Chang 9f1ba2ae66 1.fix parent page 2.add page title 2010-01-08 18:36:36 +08:00
Wen-Tien Chang 38e365e4b5 remove blueprint, use easyframework 2010-01-08 16:05:58 +08:00
Wen-Tien Chang e6d083acda Add zh_tw locale file 2010-01-08 15:45:13 +08:00
Wen-Tien Chang 5ab32baf88 Add MongoMapper key_i18n support 2010-01-08 15:32:44 +08:00
Wen-Tien Chang a674e46c91 clean up useless code 2010-01-04 17:49:55 +08:00
Wen-Tien Chang 9aeeed140f let admin/announcement works 2010-01-04 17:37:55 +08:00
Wen-Tien Chang b17ebfb9b7 Change to MongoDB 2010-01-04 15:52:30 +08:00
Wen-Tien Chang 691d514fa1 fixes announcements i18n 2009-07-06 16:36:41 +08:00
Wen-Tien Chang ff2dffaeb4 add i18n for layout and snippet 2009-07-06 16:23:34 +08:00
Wen-Tien Chang 28612514e3 Add CouchFoo.property_i18n method 2009-06-26 21:16:37 +08:00
Wen-Tien Chang c895469d34 add toggle for edit english content 2009-06-22 16:04:06 +08:00
Wen-Tien Chang db8d2bfa8f let page model support i18n 2009-06-19 17:31:10 +08:00
Wen-Tien Chang bd9ef6d286 rename home page to root page 2009-06-01 14:52:37 +08:00
Wen-Tien Chang 5570a2dfbf Add announcement admin and view template 2009-06-01 14:20:15 +08:00
Wen-Tien Chang 4807066c68 Add announcement model 2009-06-01 10:54:16 +08:00
Wen-Tien Chang 62602940ed Add root menu snippet 2009-05-22 15:16:22 +08:00
Wen-Tien Chang 32fdf99833 Add Page external_link 2009-05-22 14:51:32 +08:00
Wen-Tien Chang a4c900af4d Add Page position and parent_page_id 2009-05-22 14:43:52 +08:00
Wen-Tien Chang 96f186a71b Add blueprint button style 2009-05-15 14:37:03 +08:00
Wen-Tien Chang 68622bb23c Add blueprint style and install jRails plugin 2009-05-15 14:02:28 +08:00
Wen-Tien Chang 438c508ea1 Add snippet support and unpack liquid plugin 2009-05-08 02:13:27 +08:00
Wen-Tien Chang 8dcde174cf Add page layout support 2009-05-08 01:54:33 +08:00
Wen-Tien Chang 78e8c32969 Add liquid template render 2009-05-08 01:32:49 +08:00
Wen-Tien Chang 66604d00f4 Add admin/pages scaffold and basic page render 2009-05-08 01:18:16 +08:00
Wen-Tien Chang 40831c1314 init rails 2.3.2 2009-05-08 00:53:18 +08:00