Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a46a8898d7
								
							
						 | 
						
							
							
								
								Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
							
							
							
							
							
						 | 
						
							2012-04-30 00:24:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5aca3db95f
								
							
						 | 
						
							
							
								
								Ray's changes for structure and web_links
							
							
							
							
							
						 | 
						
							2012-04-27 11:02:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6bf4c60d45
								
							
						 | 
						
							
							
								
								Changes for js and ccs load for site's pages
							
							
							
							
							
						 | 
						
							2012-04-26 01:49:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6f1eb97ace
								
							
						 | 
						
							
							
								
								Fix for structure js and css
							
							
							
							
							
						 | 
						
							2012-04-25 18:41:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								573c19ff4b
								
							
						 | 
						
							
							
								
								Remove .erb when including css
							
							
							
							
							
						 | 
						
							2012-04-25 15:44:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								834cbe3a11
								
							
						 | 
						
							
							
								
								Fix side_bar for tags
							
							
							
							
							
							
							
							Modules needs to use the fullpath for active or visible in tags 
							
						 | 
						
							2012-04-23 16:12:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								72efdbd742
								
							
						 | 
						
							
							
								
								changes before Chirs and Ray's trip
							
							
							
							
							
						 | 
						
							2012-04-19 11:50:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6728c35023
								
							
						 | 
						
							
							
								
								Fix side_bar.
							
							
							
							
							
							
							
							In the case of tags, take the uri instead of controller name 
							
						 | 
						
							2012-04-12 18:14:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b54578ce1e
								
							
						 | 
						
							
							
								
								ad banner preview
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								486845460c
								
							
						 | 
						
							
							
								
								Filter and delete for bulletins
							
							
							
							
							
						 | 
						
							2012-04-12 06:50:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								253f4bcb54
								
							
						 | 
						
							
							
								
								Ray's changes for orbit bar
							
							
							
							
							
						 | 
						
							2012-04-06 18:06:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8f28d45379
								
							
						 | 
						
							
							
								
								The new AdBanner.
							
							
							
							
							
						 | 
						
							2012-04-02 03:04:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								503f71e554
								
							
						 | 
						
							
							
								
								Ray's changes in tags, css and js
							
							
							
							
							
						 | 
						
							2012-04-02 02:55:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f5fd3dec7a
								
							
						 | 
						
							
							
								
								Trying nokogiri
							
							
							
							
							
						 | 
						
							2012-03-27 18:42:22 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								9aa4173933
								
							
						 | 
						
							
							
								
								Change orbit-bar for language but bug when user name is too long
							
							
							
							
							
						 | 
						
							2012-02-29 04:21:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f13ebc6c46
								
							
						 | 
						
							
							
								
								Fix bugs and changes for nccu
							
							
							
							
							
						 | 
						
							2012-02-27 18:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								63d7810b35
								
							
						 | 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement
							
							
							
							
							
						 | 
						
							2012-02-23 15:52:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								53ed4b0404
								
							
						 | 
						
							
							
								
								Initial changes in announcement for sorting and filtering
							
							
							
							
							
						 | 
						
							2012-02-23 15:51:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								a980847eb3
								
							
						 | 
						
							
							
								
								Basic function for AdBanner
							
							
							
							
							
						 | 
						
							2012-02-01 14:27:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								4ed8a2164c
								
							
						 | 
						
							
							
								
								First complete with manager and submanager
							
							
							
							
							
						 | 
						
							2012-01-24 12:28:32 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								26b49dcf02
								
							
						 | 
						
							
							
								
								Remove js from html
							
							
							
							
							
						 | 
						
							2011-12-05 10:36:25 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								d9d7099da6
								
							
						 | 
						
							
							
								
								Fix bug: users can now be saved
							
							
							
							
							
						 | 
						
							2011-11-12 17:54:45 +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 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								c48a11d9f5
								
							
						 | 
						
							
							
								
								Add some JS for design uploading
							
							
							
							
							
						 | 
						
							2011-07-19 18:31:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								f73f09ffcf
								
							
						 | 
						
							
							
								
								adding files not commited from previous commit
							
							
							
							
							
						 | 
						
							2011-07-12 16:02:41 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								7b5ea870a0
								
							
						 | 
						
							
							
								
								Delete page.
							
							
							
							
							
						 | 
						
							2011-06-01 12:00:41 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								ddc7c74436
								
							
						 | 
						
							
							
								
								Create page.
							
							
							
							
							
						 | 
						
							2011-06-01 10:24:14 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								0969f6b6cc
								
							
						 | 
						
							
							
								
								CKEditor.
							
							
							
							
							
							
							
							The error came from some script in Application.js 
							
						 | 
						
							2011-05-26 13:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								3d97c5bfda
								
							
						 | 
						
							
							
								
								Modification of the page model
							
							
							
							
							
						 | 
						
							2011-05-18 10:00:00 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								e62df90117
								
							
						 | 
						
							
							
								
								user can't delete self and flash_messages
							
							
							
							
							
						 | 
						
							2011-04-13 18:22:50 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								29ee4585b2
								
							
						 | 
						
							
							
								
								upgrade to rails3, but grip is broken
							
							
							
							
							
						 | 
						
							2010-03-08 16:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								32e8bd108f
								
							
						 | 
						
							
							
								
								Add Item#ancestors
							
							
							
							
							
						 | 
						
							2010-01-18 15:52:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								4807066c68
								
							
						 | 
						
							
							
								
								Add announcement model
							
							
							
							
							
						 | 
						
							2009-06-01 10:54:16 +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 |