|  Matthew Fu | 4ed8a2164c | First complete with manager and submanager | 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 | 
				
					
						|  Matthew Fu | 18a82d7f47 | Manger and SubManager | 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 | c0efb5d1bc | Listing for Module-apps | 2012-01-12 14:13:41 +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 | ea19f11fe2 | Integrate Harry's modifications to reload pop-up content | 2011-12-29 14:09:06 +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 | 
				
					
						|  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 | 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 | 962bf03af2 | Remove snippet | 2011-12-05 10:27:22 +08:00 | 
				
					
						|  chris2tof | 75a3c4d5b1 | Modify assets Each layout has a manifest for css and js | 2011-12-05 09:54:41 +08:00 | 
				
					
						|  chris2tof | dac6348402 | Integration of module_app workflow | 2011-11-19 14:33:26 +08:00 | 
				
					
						|  chris2tof | 861237d65b | Integration of Ray' modifications | 2011-11-17 20:02:58 +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 | 
				
					
						|  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 | 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 | a571d1dcff | Clean code and workaround mongoid embedded with carrierwave | 2011-09-08 18:12:04 +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 | 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 | 32849f1d1b | Set default design to first design | 2011-08-25 15:08:42 +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 | 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 | 
				
					
						|  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 | a272b871e2 | complete del and destroy funciton for desgin | 2011-07-22 15:54:38 +08:00 | 
				
					
						|  Matthew Fu | f8d1a1315b | fixing duplicate when updating design | 2011-07-20 17:05:28 +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 | 
				
					
						|  chris2tof | 247b8ec4dc | HTML code can be modify (paser: update) | 2011-06-10 10:31:50 +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 | 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 | 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 | 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 | 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 | 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 | 2ccc2c9b39 | add user_info | 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 | 
				
					
						|  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 | 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 | 13065aa85a | Add devise gem and panel/users controller | 2010-03-04 16:33:26 +08:00 |