Commit Graph

223 Commits

Author SHA1 Message Date
Matt Fu 13b6892f87 code for new fact check 2012-03-16 11:09:44 +08:00
Christophe Vilayphiou 3e22c6e61b Add bootstrap-orbit.css in front-end 2012-03-07 18:16:59 +08:00
Christophe Vilayphiou 4dd9b7ffa4 Fix announcement pagination in front-end 2012-03-07 18:16:59 +08:00
Matt Fu d5a2de5476 LDAP with sync rake task 2012-03-06 16:41:06 +08:00
Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
Conflicts:
	config/environments/development.rb
2012-03-01 10:13:49 +08:00
Matt Fu cceb785a8d change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
Matthew Kaito Juyuan Fu 2e58c63ff7 fix bugs with token 2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu cc550c5745 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00
Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
Christophe Vilayphiou 6a30b0a1e4 Add RSS event 2012-02-28 18:29:13 +08:00
Christophe Vilayphiou fdf4cfad2d Add category for announcement widget 2012-02-28 14:08:57 +08:00
Christophe Vilayphiou 680b28023a Fix ad_banner loading 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Matt Fu 3209f9aa27 Complete for 229 check. 2012-02-24 19:07:47 +08:00
Christophe Vilayphiou 8f531a6fe5 Fix bus for pages and page content 2012-02-24 15:14:23 +08:00
Christophe Vilayphiou 63d7810b35 Add isotope, categories for announcement page, sort for announcement 2012-02-23 15:52:58 +08:00
unknown 20c320961f edit page_content 2012-02-23 15:13:36 +08:00
Christophe Vilayphiou 44a346ffe9 Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
Christophe Vilayphiou 9cd3cbc478 Modifications for design, pages, page_parts…
Move orbit_bar out of kernel.js
2012-02-17 02:09:32 +08:00
Christophe Vilayphiou e61aa6b210 Modify dev.rake to create the ModuleApp object for web_recsource 2012-02-16 13:28:51 +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
Matthew Kaito Juyuan Fu 8ef2d4b02e include ad_banner query code. cleaned up parser 2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu 436f039c1b build interface to work with object auth. Go to panel/new_blog/back_end/posts/ ,click New Auth link 2012-02-15 00:34:21 +08:00
Matthew Kaito Juyuan Fu e20739e32b Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as
1.Object.authed_for_user(user,title_of_object_auth).  title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) .  title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity.
2012-02-15 00:34:21 +08:00
Christophe Vilayphiou 8f885e8bb7 Use key not title for module_app in parser.
Modify announcement routes.
2012-02-06 16:58:19 +08:00
Matthew Kaito Juyuan Fu 0af37c0688 Add rake task for ad_banner. Will have ad_banner at dev:build 2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu 394099c388 Ad banner close complete,need validation 2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu 68cea1ea49 AdBanner is now working 2012-02-04 09:37:23 +08:00
Matthew Kaito Juyuan Fu f530eb7112 Revert "mistake commit"
This reverts commit 2608b72d65.
2012-02-03 14:39:15 +08:00
Matthew Kaito Juyuan Fu 2608b72d65 mistake commit 2012-02-03 14:28:08 +08:00
Christophe Vilayphiou ccbde122df Fix bugs in design.
The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly.
2012-01-31 16:38:25 +08:00
Christophe Vilayphiou 762c2f5e8a Add key in module_app.rb to use instead of title for authorization 2012-01-30 18:12:18 +08:00
Christophe Vilayphiou 7f999f20ab Modify rake.dev for new design structure 2012-01-30 15:45:55 +08:00
Christophe Vilayphiou 783eae4597 Change "NewBlog" folders into "new_blog" in assets
Modify routes and pages handling for clean front-end urls
2012-01-24 18:16:58 +08:00
Matthew Fu 25cbe0c2a5 update app package for previous commit 2012-01-24 12:28:32 +08:00
Matthew Fu 4df8ab6cc3 Add methods to work with manager role,add task to build user test data 2012-01-24 12:28:32 +08:00
Christophe Vilayphiou 9fcf8280fa Change "_filename" to "_identifier" for carrierwave 2012-01-24 11:57:27 +08:00
Christophe Vilayphiou 5518ae362d Ray's modification before redesign 2012-01-24 11:57:27 +08:00
unknown 4cfae9c107 announcement widget query 2012-01-18 21:34:26 +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 3d9fd359ed Moving Orbit frontend and widget controller to controllers folder 2012-01-10 18:30:08 +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
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
Christophe Vilayphiou 75c9851dbc Ray's back-end modifications for sub-roles 2011-12-28 20:57:18 +08:00
chris2tof 62aaf79491 Merge with sub_roles 2011-12-23 18:34:21 +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 708a174345 Remove radius from plugins, put it in Gemfile 2011-12-22 11:27:37 +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 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 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
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 e99affbddd Merge with Matt's code 2011-11-20 01:26:24 +08:00
chris2tof 2754f49fe9 Missing code in parser for displaying image in the fornt-end 2011-11-19 23:11:49 +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
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 0a6efeb0a2 put dymanic loading related kernel code and query kernel code into public/static
put dymanic loading related kernel code and query kernel code into
public/static.
everything in JS need be loaded at frontend from ruling com should be
placed here.
2011-10-21 14:11:41 +08:00
Matthew Kaito Juyuan Fu 0e252cf93c APP fronted showing 2011-10-20 15:29:54 +08:00
Matthew Kaito Juyuan Fu cb07a35cc9 Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD 2011-10-20 10:06:06 +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 0956e9784a Fix bug in layout, parser and change lib/fraisier 2011-09-07 11:53:16 +08:00
chris2tof 4ce0bda00b Fix links in the menu when in edit or normal render 2011-09-05 16:29:44 +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 88397d2708 Modification of parser.rb for page rendering 2011-09-01 13:30:01 +08:00
chris2tof 492f691469 Modifications for menu in Design 2011-09-01 09:12:49 +08:00
chris2tof 8b576cac48 Fix bug when selecting theme 2011-08-25 15:44:52 +08:00
chris2tof c427e2af14 Page form with drop down. Modifications for Designs 2011-08-25 08:13:38 +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 2842001a3b Update source: pull from git 2011-08-23 15:01:22 +08:00
chris2tof 7a4ad240a8 Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +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 34d0b8fac1 complete new parser for layout_part 2011-08-10 17:28:10 +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 1839269581 finishing saving edited file online and redo dev.rake modification 2011-07-28 18:08:16 +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 c7fc7084d5 Tag 'link' 2011-06-01 15:49:21 +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 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 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 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
ihower 4ed6e8090e Remove useless rspec.rake 2011-04-13 19:19:40 +08:00
ihower 8a4cffae8f Remove files which should be deleted in previous commit 2011-04-13 18:53:47 +08:00
chris 5151449bc9 radius parser for multilingual - dev.rake 2011-04-13 18:22:51 +08:00
chris 8b8eff6920 replace Liquid by Radius 2011-04-13 18:22:51 +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 a40b117fbe add rough user attributes API 2010-03-08 17:14:59 +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 e2a6d9fe0d Add locale link in template 2010-03-01 14:57:21 +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 3d6446041b handle destroy layout 2010-02-05 16:59:41 +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 ce63c53605 Add 301 redirect for Link item 2010-01-28 17:24:47 +08:00
Wen-Tien Chang aab1199aee Add rake dev:build for pages 2010-01-18 16:23:33 +08:00
Wen-Tien Chang e1440a79d8 Add Item, Page, Component, Link inheritanced models 2010-01-14 18:30:53 +08:00
Wen-Tien Chang 314f6d5219 Add reroute middleware hack 2010-01-11 17:09:50 +08:00
Wen-Tien Chang 736eda103a Add rspec files 2010-01-04 16:08:50 +08:00