e40c76bf5f 
								
							 
						 
						
							
							
								
								Fix new page form  
							
							... 
							
							
							
							Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json 
							
						 
						
							2012-05-13 23:48:34 +08:00  
				
					
						
							
							
								 
						
							
								17b486f9e9 
								
							 
						 
						
							
							
								
								Fix bugs for shift_to and change items.rake for the missing position in db  
							
							
							
						 
						
							2012-05-11 17:56:26 +08:00  
				
					
						
							
							
								 
						
							
								0a34f0277e 
								
							 
						 
						
							
							
								
								Remove unless files and change routes.  
							
							
							
						 
						
							2012-05-11 16:46:36 +08:00  
				
					
						
							
							
								 
						
							
								20a1a6e30f 
								
							 
						 
						
							
							
								
								New Interface for App Auth and Object Auth  
							
							
							
						 
						
							2012-05-11 16:44:40 +08:00  
				
					
						
							
							
								 
						
							
								fd52d00187 
								
							 
						 
						
							
							
								
								Add drag and drop to structure side_bar  
							
							
							
						 
						
							2012-05-11 10:00:45 +08:00  
				
					
						
							
							
								 
						
							
								4f1e47bb82 
								
							 
						 
						
							
							
								
								Don't display admin in any premission select. Fix not necessary header for UT data  
							
							
							
						 
						
							2012-05-10 14:43:05 +08:00  
				
					
						
							
							
								 
						
							
								5eba2638ce 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-10 14:17:38 +08:00  
				
					
						
							
							
								 
						
							
								b6aad17681 
								
							 
						 
						
							
							
								
								Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.  
							
							
							
						 
						
							2012-05-10 14:16:37 +08:00  
				
					
						
							
							
								 
						
							
								87ebcc48e7 
								
							 
						 
						
							
							
								
								Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.  
							
							
							
						 
						
							2012-05-10 11:51:44 +08:00  
				
					
						
							
							
								 
						
							
								de739d7d20 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json 
							
						 
						
							2012-05-10 00:34:23 +08:00  
				
					
						
							
							
								 
						
							
								13587306bc 
								
							 
						 
						
							
							
								
								Add list widgets for announcement, news and links with categories and tags  
							
							
							
						 
						
							2012-05-10 00:25:30 +08:00  
				
					
						
							
							
								 
						
							
								d88d4e58dc 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	config/environments/development.rb 
							
						 
						
							2012-05-09 13:51:00 +08:00  
				
					
						
							
							
								 
						
							
								2b03263fb7 
								
							 
						 
						
							
							
								
								Dashboard partial implementation  
							
							
							
						 
						
							2012-05-09 05:53:07 +08:00  
				
					
						
							
							
								 
						
							
								26a50cc862 
								
							 
						 
						
							
							
								
								Add sub_menu to children  
							
							
							
						 
						
							2012-05-09 04:15:45 +08:00  
				
					
						
							
							
								 
						
							
								2b9190a49e 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb 
							
						 
						
							2012-05-08 11:40:38 +08:00  
				
					
						
							
							
								 
						
							
								1fb6c20b86 
								
							 
						 
						
							
							
								
								Add site_info  
							
							
							
						 
						
							2012-05-07 00:54:18 +08:00  
				
					
						
							
							
								 
						
							
								f190ce18ee 
								
							 
						 
						
							
							
								
								Put sorting in web_link, page_context and design  
							
							
							
						 
						
							2012-05-05 21:20:20 +08:00  
				
					
						
							
							
								 
						
							
								bff3cefbc7 
								
							 
						 
						
							
							
								
								Apply app_auth to ad_banner.   From now,ad_banner can only be viewed for at least manager.  
							
							
							
						 
						
							2012-05-04 15:40:43 +08:00  
				
					
						
							
							
								 
						
							
								05ded8de03 
								
							 
						 
						
							
							
								
								Fix for NCCU 0430 all functions ok with two submanagers but different behavors  
							
							
							
						 
						
							2012-05-04 15:38:18 +08:00  
				
					
						
							
							
								 
						
							
								20504b2205 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb 
							
						 
						
							2012-04-30 07:57:20 +08:00  
				
					
						
							
							
								 
						
							
								b8f52fa1ec 
								
							 
						 
						
							
							
								
								Separate announcement and news  
							
							
							
						 
						
							2012-04-30 06:31:46 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1f4fe65430 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb 
							
						 
						
							2012-04-25 16:45:04 +08:00  
				
					
						
							
							
								 
						
							
								7f285f4719 
								
							 
						 
						
							
							
								
								Change ad_banner preview from using title to id  
							
							
							
						 
						
							2012-04-25 16:10:11 +08:00  
				
					
						
							
							
								 
						
							
								70f6c7b540 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb 
							
						 
						
							2012-04-24 15:28:52 +08:00  
				
					
						
							
							
								 
						
							
								bbcdaf00e7 
								
							 
						 
						
							
							
								
								Disable ad_banner_preview. Just show window  
							
							
							
						 
						
							2012-04-24 14:37:06 +08:00  
				
					
						
							
							
								 
						
							
								e7bb9ea86b 
								
							 
						 
						
							
							
								
								Fix ad image date selector  
							
							
							
						 
						
							2012-04-24 14:37:06 +08:00  
				
					
						
							
							
								 
						
							
								d4aea664e2 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb 
							
						 
						
							2012-04-24 02:37:03 +08:00  
				
					
						
							
							
								 
						
							
								a5b13e680f 
								
							 
						 
						
							
							
								
								Add sub_menu in r_tags  
							
							
							
						 
						
							2012-04-24 02:30:40 +08:00  
				
					
						
							
							
								 
						
							
								2eeb530422 
								
							 
						 
						
							
							
								
								Merge branch 'master' into ldap  
							
							... 
							
							
							
							Conflicts:
	app/assets/stylesheets/new_admin.css.erb 
							
						 
						
							2012-04-23 14:13:37 +08:00  
				
					
						
							
							
								 
						
							
								0c46b4da23 
								
							 
						 
						
							
							
								
								AdImage and AnBanner JS fixed  
							
							
							
						 
						
							2012-04-23 14:07:13 +08:00  
				
					
						
							
							
								 
						
							
								81b0046f42 
								
							 
						 
						
							
							
								
								Preview now can be use at both ad_banner and ad_image,however it won't run correctly  if user change its ad_banner at ad_image.  
							
							
							
						 
						
							2012-04-23 14:07:13 +08:00  
				
					
						
							
							
								 
						
							
								e353afb5ac 
								
							 
						 
						
							
							
								
								fix i18n vars in ad_banner  
							
							
							
						 
						
							2012-04-23 14:07:13 +08:00  
				
					
						
							
							
								 
						
							
								1b70852ff7 
								
							 
						 
						
							
							
								
								realtime preview is working. but save to object when preview  
							
							
							
						 
						
							2012-04-23 14:06:37 +08:00  
				
					
						
							
							
								 
						
							
								ff472714de 
								
							 
						 
						
							
							
								
								AdBanner i18n vars patch  
							
							
							
						 
						
							2012-04-23 14:05:18 +08:00  
				
					
						
							
							
								 
						
							
								f55b3a4374 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Rulingcom/orbit  into ldap  
							
							... 
							
							
							
							Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb 
							
						 
						
							2012-04-19 14:06:00 +08:00  
				
					
						
							
							
								 
						
							
								8f28d45379 
								
							 
						 
						
							
							
								
								The new AdBanner.  
							
							
							
						 
						
							2012-04-02 03:04:38 +08:00  
				
					
						
							
							
								 
						
							
								928c642840 
								
							 
						 
						
							
							
								
								change layout from old admin to new_admin. not complete code  
							
							
							
						 
						
							2012-04-02 02:58:01 +08:00  
				
					
						
							
							
								 
						
							
								e953344965 
								
							 
						 
						
							
							
								
								Fix before_filter order for object_auth  
							
							
							
						 
						
							2012-03-20 14:17:28 +08:00  
				
					
						
							
							
								 
						
							
								f4fda08e86 
								
							 
						 
						
							
							
								
								Replace PrototypeR4 by Orbit.  
							
							... 
							
							
							
							Move session into mongoid_store.
Reset session when sing_in. 
							
						 
						
							2012-03-16 14:58:32 +08:00  
				
					
						
							
							
								 
						
							
								d5a2de5476 
								
							 
						 
						
							
							
								
								LDAP with sync rake task  
							
							
							
						 
						
							2012-03-06 16:41:06 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								8932615f05 
								
							 
						 
						
							
							
								
								add "all_user" for app&object auth  
							
							
							
						 
						
							2012-02-29 18:56:42 +08:00  
				
					
						
							
							
								 
						
							
								cc550c5745 
								
							 
						 
						
							
							
								
								First version for App and Object auth.Taking Announcement as experiment  
							
							
							
						 
						
							2012-02-29 18:55:55 +08:00  
				
					
						
							
							
								 
						
							
								3bcd7ea349 
								
							 
						 
						
							
							
								
								Exp with object_auth  
							
							
							
						 
						
							2012-02-29 18:50:23 +08:00  
				
					
						
							
							
								 
						
							
								18617850e5 
								
							 
						 
						
							
							
								
								Add categories for all the widgets  
							
							
							
						 
						
							2012-02-28 22:00:05 +08:00  
				
					
						
							
							
								 
						
							
								fdf4cfad2d 
								
							 
						 
						
							
							
								
								Add category for announcement widget  
							
							
							
						 
						
							2012-02-28 14:08:57 +08:00  
				
					
						
							
							
								 
						
							
								f13ebc6c46 
								
							 
						 
						
							
							
								
								Fix bugs and changes for nccu  
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
				
					
						
							
							
								 
						
							
								8f531a6fe5 
								
							 
						 
						
							
							
								
								Fix bus for pages and page content  
							
							
							
						 
						
							2012-02-24 15:14:23 +08:00  
				
					
						
							
							
								 
						
							
								63d7810b35 
								
							 
						 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement  
							
							
							
						 
						
							2012-02-23 15:52:58 +08:00  
				
					
						
							
							
								 
						
							
								9b001aa6c3 
								
							 
						 
						
							
							
								
								new page_content app  
							
							
							
						 
						
							2012-02-21 19:22:42 +08:00  
				
					
						
							
							
								 
						
							
								0b71714d44 
								
							 
						 
						
							
							
								
								Improve code in items, pages, links  
							
							
							
						 
						
							2012-02-17 14:54:11 +08:00  
				
					
						
							
							
								 
						
							
								cf4a6c0b35 
								
							 
						 
						
							
							
								
								Remove useless destroy methods  
							
							
							
						 
						
							2012-02-17 12:26:03 +08:00  
				
					
						
							
							
								 
						
							
								9cd3cbc478 
								
							 
						 
						
							
							
								
								Modifications for design, pages, page_parts…  
							
							... 
							
							
							
							Move orbit_bar out of kernel.js 
							
						 
						
							2012-02-17 02:09:32 +08:00  
				
					
						
							
							
								 
						
							
								e0accbecaa 
								
							 
						 
						
							
							
								
								Changes into page_part edition.  
							
							... 
							
							
							
							Can choose between 'text', 'public_r_tag' and 'widget' 
							
						 
						
							2012-02-16 13:09:09 +08:00  
				
					
						
							
							
								 
						
							
								edf236c1c7 
								
							 
						 
						
							
							
								
								edit tags  
							
							
							
						 
						
							2012-02-15 15:38:27 +08:00  
				
					
						
							
							
								 
						
							
								af3a2547e1 
								
							 
						 
						
							
							
								
								Change ModuleAppTag into "Module name"Tag.  
							
							
							
						 
						
							2012-02-15 15:18:11 +08:00  
				
					
						
							
							
								 
						
							
								d0c2856a3a 
								
							 
						 
						
							
							
								
								Fix relations error in tags  
							
							
							
						 
						
							2012-02-15 11:42:19 +08:00  
				
					
						
							
							
								 
						
							
								3e70634add 
								
							 
						 
						
							
							
								
								Announcement modifications and tags  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								55ae7de01c 
								
							 
						 
						
							
							
								
								Orbit-bar in front-end and back-end, side-bar and drop-down menu  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								3ed9b81df9 
								
							 
						 
						
							
							
								
								first commit for object auth,will take new_blog for experiment  
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								a980847eb3 
								
							 
						 
						
							
							
								
								Basic function for AdBanner  
							
							
							
						 
						
							2012-02-01 14:27:51 +08:00  
				
					
						
							
							
								 
						
							
								4906894fb5 
								
							 
						 
						
							
							
								
								Page edit wasn't showing when module_app was nil  
							
							
							
						 
						
							2012-01-31 16:35:40 +08:00  
				
					
						
							
							
								 
						
							
								46db173e0b 
								
							 
						 
						
							
							
								
								Modifications in the Design code: the uploader works but the edit is broken  
							
							
							
						 
						
							2012-01-26 12:05:25 +08:00  
				
					
						
							
							
								 
						
							
								afbb9e266a 
								
							 
						 
						
							
							
								
								User role and sub_role simple interface complete  
							
							
							
						 
						
							2012-01-24 12:28:33 +08:00  
				
					
						
							
							
								 
						
							
								4ed8a2164c 
								
							 
						 
						
							
							
								
								First complete with manager and submanager  
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
				
					
						
							
							
								 
						
							
								4df8ab6cc3 
								
							 
						 
						
							
							
								
								Add methods to work with manager role,add task to build user test data  
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
				
					
						
							
							
								 
						
							
								18a82d7f47 
								
							 
						 
						
							
							
								
								Manger and SubManager  
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
				
					
						
							
							
								 
						
							
								9fcf8280fa 
								
							 
						 
						
							
							
								
								Change "_filename" to "_identifier" for carrierwave  
							
							
							
						 
						
							2012-01-24 11:57:27 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								c0efb5d1bc 
								
							 
						 
						
							
							
								
								Listing for Module-apps  
							
							
							
						 
						
							2012-01-12 14:13:41 +08:00  
				
					
						
							
							
								 
						
							
								cae3daa9c4 
								
							 
						 
						
							
							
								
								Change NewBlog to new_blog  
							
							
							
						 
						
							2012-01-10 18:29:11 +08:00  
				
					
						
							
							
								 
						
							
								79f778ad8c 
								
							 
						 
						
							
							
								
								creating for disabling widgets and frontend  
							
							
							
						 
						
							2012-01-05 16:21:33 +08:00  
				
					
						
							
							
								 
						
							
								7b40706aed 
								
							 
						 
						
							
							
								
								fixing for app_auth  
							
							
							
						 
						
							2012-01-05 16:20:51 +08:00  
				
					
						
							
							
								 
						
							
								ea19f11fe2 
								
							 
						 
						
							
							
								
								Integrate Harry's modifications to reload pop-up content  
							
							
							
						 
						
							2011-12-29 14:09:06 +08:00  
				
					
						
							
							
								 
						
							
								245def9cb6 
								
							 
						 
						
							
							
								
								Integration of pop-up and generic js.erb  
							
							
							
						 
						
							2011-12-28 20:49:53 +08:00  
				
					
						
							
							
								 
						
							
								62aaf79491 
								
							 
						 
						
							
							
								
								Merge with sub_roles  
							
							
							
						 
						
							2011-12-23 18:34:21 +08:00  
				
					
						
							
							
								 
						
							
								d3ca1647be 
								
							 
						 
						
							
							
								
								fix page form bugs  
							
							
							
						 
						
							2011-12-23 13:54:28 +08:00  
				
					
						
							
							
								 
						
							
								d465febca7 
								
							 
						 
						
							
							
								
								merge with november_presentation  
							
							
							
						 
						
							2011-12-22 15:43:38 +08:00  
				
					
						
							
							
								 
						
							
								a09f8e4551 
								
							 
						 
						
							
							
								
								merge with november_presentation  
							
							
							
						 
						
							2011-12-20 16:47:17 +08:00  
				
					
						
							
							
								 
						
							
								afbffe37d5 
								
							 
						 
						
							
							
								
								Users can now be saved with sub_roles  
							
							
							
						 
						
							2011-12-20 14:35:28 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d23cf152da 
								
							 
						 
						
							
							
								
								Merge 'standardization' and 'role structure modification'  
							
							
							
						 
						
							2011-12-10 18:21:59 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f774084e9a 
								
							 
						 
						
							
							
								
								Back-end standardization  
							
							
							
						 
						
							2011-12-10 18:03:32 +08:00  
				
					
						
							
							
								 
						
							
								e0cdedfa2e 
								
							 
						 
						
							
							
								
								Remove useless controller and view  
							
							... 
							
							
							
							user_attributes_controller and user_attributes views 
							
						 
						
							2011-12-06 18:12:12 +08:00  
				
					
						
							
							
								 
						
							
								962bf03af2 
								
							 
						 
						
							
							
								
								Remove snippet  
							
							
							
						 
						
							2011-12-05 10:27:22 +08:00  
				
					
						
							
							
								 
						
							
								75a3c4d5b1 
								
							 
						 
						
							
							
								
								Modify assets  
							
							... 
							
							
							
							Each layout has a manifest for css and js 
							
						 
						
							2011-12-05 09:54:41 +08:00  
				
					
						
							
							
								 
						
							
								dac6348402 
								
							 
						 
						
							
							
								
								Integration of module_app workflow  
							
							
							
						 
						
							2011-11-19 14:33:26 +08:00  
				
					
						
							
							
								 
						
							
								861237d65b 
								
							 
						 
						
							
							
								
								Integration of Ray' modifications  
							
							
							
						 
						
							2011-11-17 20:02:58 +08:00  
				
					
						
							
							
								 
						
							
								5c3ae104f0 
								
							 
						 
						
							
							
								
								Add log info for asking restart after app module installed  
							
							
							
						 
						
							2011-11-16 17:01:44 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								c1d77fa6d6 
								
							 
						 
						
							
							
								
								Changes for purchases - handle different type of purchases  
							
							
							
						 
						
							2011-11-14 10:22:31 +08:00  
				
					
						
							
							
								 
						
							
								cb07a35cc9 
								
							 
						 
						
							
							
								
								Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD  
							
							
							
						 
						
							2011-10-20 10:06:06 +08:00  
				
					
						
							
							
								 
						
							
								ff82391b7d 
								
							 
						 
						
							
							
								
								Revert "Merge with new_blog"  
							
							... 
							
							
							
							This reverts commit 64c68fcdeb 
							
						 
						
							2011-10-20 10:01:39 +08:00  
				
					
						
							
							
								 
						
							
								64c68fcdeb 
								
							 
						 
						
							
							
								
								Merge with new_blog  
							
							
							
						 
						
							2011-10-18 11:36:01 +08:00  
				
					
						
							
							
								 
						
							
								4db88282a1 
								
							 
						 
						
							
							
								
								Modification in Design structure_css -> default_css  
							
							
							
						 
						
							2011-09-13 11:57:20 +08:00