9ead6cafda 
								
							 
						 
						
							
							
								
								Ray's changes  
							
							
							
						 
						
							2012-05-09 04:15:02 +08:00  
				
					
						
							
							
								 
						
							
								8d70d87120 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							
							
						 
						
							2012-05-09 04:13:14 +08:00  
				
					
						
							
							
								 
						
							
								26a50cc862 
								
							 
						 
						
							
							
								
								Add sub_menu to children  
							
							
							
						 
						
							2012-05-09 04:15:45 +08:00  
				
					
						
							
							
								 
						
							
								a186ae08d8 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							
							
						 
						
							2012-05-08 21:47:03 +08:00  
				
					
						
							
							
								 
						
							
								49e2eb0187 
								
							 
						 
						
							
							
								
								Add class 'active' in the menu for current page  
							
							
							
						 
						
							2012-05-08 21:46:24 +08:00  
				
					
						
							
							
								 
						
							
								c28d7d59b6 
								
							 
						 
						
							
							
								
								starting Resque  
							
							
							
						 
						
							2012-05-08 20:21:28 +08:00  
				
					
						
							
							
								 
						
							
								083963af65 
								
							 
						 
						
							
							
								
								Test version for DB sync schedule job  
							
							
							
						 
						
							2012-05-08 19:20:53 +08:00  
				
					
						
							
							
								 
						
							
								5c7cf1aef2 
								
							 
						 
						
							
							
								
								Add sub_menu to site_info  
							
							
							
						 
						
							2012-05-08 17:27:02 +08:00  
				
					
						
							
							
								 
						
							
								d2e07f537a 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							
							
						 
						
							2012-05-08 17:24:40 +08:00  
				
					
						
							
							
								 
						
							
								a3868cb785 
								
							 
						 
						
							
							
								
								Ray's changes for front-end banner  
							
							
							
						 
						
							2012-05-08 17:21:26 +08:00  
				
					
						
							
							
								 
						
							
								65a0998080 
								
							 
						 
						
							
							
								
								Merge branch 'jobs_and_mail' into ldap  
							
							... 
							
							
							
							Conflicts:
	config/environments/development.rb
	config/routes.rb 
							
						 
						
							2012-05-08 11:45:34 +08:00  
				
					
						
							
							
								 
						
							
								7339d1ee4a 
								
							 
						 
						
							
							
								
								starting Resque  
							
							
							
						 
						
							2012-05-08 11:41:58 +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  
				
					
						
							
							
								 
						
							
								ba4385e3fd 
								
							 
						 
						
							
							
								
								Add module authorization for news  
							
							... 
							
							
							
							Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom 
							
						 
						
							2012-05-08 10:50:09 +08:00  
				
					
						
							
							
								 
						
							
								8b61314cc4 
								
							 
						 
						
							
							
								
								Add i18n for site_info.  
							
							... 
							
							
							
							Add always display site title.
Changes for menu in front-end 
							
						 
						
							2012-05-07 15:11:43 +08:00  
				
					
						
							
							
								 
						
							
								e52119e258 
								
							 
						 
						
							
							
								
								Add footer parser  
							
							
							
						 
						
							2012-05-07 13:33:29 +08:00  
				
					
						
							
							
								 
						
							
								ce1fecaf93 
								
							 
						 
						
							
							
								
								Add position ordering and hiding page for i18n  
							
							
							
						 
						
							2012-05-06 00:35:13 +08:00  
				
					
						
							
							
								 
						
							
								8e6fd277c2 
								
							 
						 
						
							
							
								
								Fix bug: preview was always true  
							
							
							
						 
						
							2012-05-04 19:02:40 +08:00  
				
					
						
							
							
								 
						
							
								3bd3820519 
								
							 
						 
						
							
							
								
								Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust  
							
							... 
							
							
							
							Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/config/locales/en.yml
	vendor/built_in_modules/announcement/config/locales/zh_tw.yml 
							
						 
						
							2012-05-04 15:59:26 +08:00  
				
					
						
							
							
								 
						
							
								453cb21066 
								
							 
						 
						
							
							
								
								Announcement preivew  
							
							
							
						 
						
							2012-05-04 15:50:45 +08:00  
				
					
						
							
							
								 
						
							
								2a14c8bad4 
								
							 
						 
						
							
							
								
								Announcement preivew  
							
							
							
						 
						
							2012-05-03 14:57:10 +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  
				
					
						
							
							
								 
						
							
								2362e1cfdd 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-04-27 15:28:32 +08:00  
				
					
						
							
							
								 
						
							
								3beb035101 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							
							
						 
						
							2012-04-27 11:11:56 +08:00  
				
					
						
							
							
								 
						
							
								5aca3db95f 
								
							 
						 
						
							
							
								
								Ray's changes for structure and web_links  
							
							
							
						 
						
							2012-04-27 11:02:56 +08:00  
				
					
						
							
							
								 
						
							
								7d6b82d9dd 
								
							 
						 
						
							
							
								
								Merge branch 'ad_banner' into ldap  
							
							
							
						 
						
							2012-04-26 17:15:44 +08:00  
				
					
						
							
							
								 
						
							
								4af2068c1f 
								
							 
						 
						
							
							
								
								Fix ad_banner sec and msec  
							
							
							
						 
						
							2012-04-26 17:11:06 +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  
				
					
						
							
							
								 
						
							
								f05b7db73a 
								
							 
						 
						
							
							
								
								Fix for parser sub_menu  
							
							... 
							
							
							
							Add style to the sub_menu 
							
						 
						
							2012-04-24 11:26:36 +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  
				
					
						
							
							
								 
						
							
								fe9032787c 
								
							 
						 
						
							
							
								
								NCCU ldap debug  
							
							
							
						 
						
							2012-04-23 10:13:44 +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  
				
					
						
							
							
								 
						
							
								6f9363ef54 
								
							 
						 
						
							
							
								
								Fix bugs in upload design and missing menu  
							
							
							
						 
						
							2012-04-06 17:37:45 +08:00  
				
					
						
							
							
								 
						
							
								d45725cf3b 
								
							 
						 
						
							
							
								
								fix announcement & add lang tab  
							
							
							
						 
						
							2012-04-05 15:23:20 +08:00  
				
					
						
							
							
								 
						
							
								1b79400f44 
								
							 
						 
						
							
							
								
								Fix menu for frontend  
							
							
							
						 
						
							2012-04-05 14:06:58 +08:00  
				
					
						
							
							
								 
						
							
								7e922d8ed4 
								
							 
						 
						
							
							
								
								Fic bug from merge  
							
							
							
						 
						
							2012-04-02 10:54:48 +08:00  
				
					
						
							
							
								 
						
							
								8f28d45379 
								
							 
						 
						
							
							
								
								The new AdBanner.  
							
							
							
						 
						
							2012-04-02 03:04:38 +08:00  
				
					
						
							
							
								 
						
							
								32519f308f 
								
							 
						 
						
							
							
								
								Fix several bus when there is no design  
							
							
							
						 
						
							2012-04-02 02:41:42 +08:00  
				
					
						
							
							
								 
						
							
								32b7d95669 
								
							 
						 
						
							
							
								
								Fix parser_back_end & side_bar & meta  
							
							
							
						 
						
							2012-03-30 15:51:29 +08:00  
				
					
						
							
							
								 
						
							
								717e50a25e 
								
							 
						 
						
							
							
								
								Add rake task for layout with nokogiri  
							
							
							
						 
						
							2012-03-27 19:00:03 +08:00  
				
					
						
							
							
								 
						
							
								c5f6dbc1c4 
								
							 
						 
						
							
							
								
								Nokogiri in parsers  
							
							
							
						 
						
							2012-03-27 19:00:03 +08:00  
				
					
						
							
							
								 
						
							
								0f60ab9fc2 
								
							 
						 
						
							
							
								
								Add ad_banner to nokogiri  
							
							
							
						 
						
							2012-03-27 18:58:48 +08:00  
				
					
						
							
							
								 
						
							
								7eff06a378 
								
							 
						 
						
							
							
								
								Trying nokogiri  
							
							
							
						 
						
							2012-03-27 18:58:48 +08:00  
				
					
						
							
							
								 
						
							
								d02bbdbaa5 
								
							 
						 
						
							
							
								
								Nokogiri in parsers  
							
							
							
						 
						
							2012-03-27 18:58:04 +08:00  
				
					
						
							
							
								 
						
							
								3ba89ecbcf 
								
							 
						 
						
							
							
								
								Fact check program completed,Lin checked  
							
							
							
						 
						
							2012-03-27 18:54:03 +08:00  
				
					
						
							
							
								 
						
							
								7efaddf57c 
								
							 
						 
						
							
							
								
								Add ad_banner to nokogiri  
							
							
							
						 
						
							2012-03-27 18:42:22 +08:00  
				
					
						
							
							
								 
						
							
								f5fd3dec7a 
								
							 
						 
						
							
							
								
								Trying nokogiri  
							
							
							
						 
						
							2012-03-27 18:42:22 +08:00  
				
					
						
							
							
								 
						
							
								a126935d2c 
								
							 
						 
						
							
							
								
								Clean the parsers and introduce the metas  
							
							
							
						 
						
							2012-03-21 18:30:12 +08:00  
				
					
						
							
							
								 
						
							
								13b6892f87 
								
							 
						 
						
							
							
								
								code for new fact check  
							
							
							
						 
						
							2012-03-16 11:09:44 +08:00  
				
					
						
							
							
								 
						
							
								3e22c6e61b 
								
							 
						 
						
							
							
								
								Add bootstrap-orbit.css in front-end  
							
							
							
						 
						
							2012-03-07 18:16:59 +08:00  
				
					
						
							
							
								 
						
							
								4dd9b7ffa4 
								
							 
						 
						
							
							
								
								Fix announcement pagination in front-end  
							
							
							
						 
						
							2012-03-07 18:16:59 +08:00  
				
					
						
							
							
								 
						
							
								d5a2de5476 
								
							 
						 
						
							
							
								
								LDAP with sync rake task  
							
							
							
						 
						
							2012-03-06 16:41:06 +08:00  
				
					
						
							
							
								 
						
							
								7f05f21930 
								
							 
						 
						
							
							
								
								Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap  
							
							... 
							
							
							
							Conflicts:
	config/environments/development.rb 
							
						 
						
							2012-03-01 10:13:49 +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  
				
					
						
							
							
								 
						
							
								2e58c63ff7 
								
							 
						 
						
							
							
								
								fix bugs with token  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								6b2aeadde6 
								
							 
						 
						
							
							
								
								Changes for nccu  
							
							
							
						 
						
							2012-02-29 16:01:50 +08:00  
				
					
						
							
							
								 
						
							
								9a40ecd1d9 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine  
							
							... 
							
							
							
							Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb 
							
						 
						
							2012-02-29 13:07:21 +08:00  
				
					
						
							
							
								 
						
							
								6a30b0a1e4 
								
							 
						 
						
							
							
								
								Add RSS event  
							
							
							
						 
						
							2012-02-28 18:29:13 +08:00  
				
					
						
							
							
								 
						
							
								fdf4cfad2d 
								
							 
						 
						
							
							
								
								Add category for announcement widget  
							
							
							
						 
						
							2012-02-28 14:08:57 +08:00  
				
					
						
							
							
								 
						
							
								680b28023a 
								
							 
						 
						
							
							
								
								Fix ad_banner loading  
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
				
					
						
							
							
								 
						
							
								f13ebc6c46 
								
							 
						 
						
							
							
								
								Fix bugs and changes for nccu  
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
				
					
						
							
							
								 
						
							
								3209f9aa27 
								
							 
						 
						
							
							
								
								Complete for 229 check.  
							
							
							
						 
						
							2012-02-24 19:07:47 +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  
				
					
						
							
							
								 
						
							
								20c320961f 
								
							 
						 
						
							
							
								
								edit page_content  
							
							
							
						 
						
							2012-02-23 15:13:36 +08:00  
				
					
						
							
							
								 
						
							
								44a346ffe9 
								
							 
						 
						
							
							
								
								Changes for orbit bar, login  
							
							
							
						 
						
							2012-02-19 16:33:22 +08:00  
				
					
						
							
							
								 
						
							
								9cd3cbc478 
								
							 
						 
						
							
							
								
								Modifications for design, pages, page_parts…  
							
							... 
							
							
							
							Move orbit_bar out of kernel.js 
							
						 
						
							2012-02-17 02:09:32 +08:00  
				
					
						
							
							
								 
						
							
								e61aa6b210 
								
							 
						 
						
							
							
								
								Modify dev.rake to create the ModuleApp object for web_recsource  
							
							
							
						 
						
							2012-02-16 13:28:51 +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  
				
					
						
							
							
								 
						
							
								8ef2d4b02e 
								
							 
						 
						
							
							
								
								include ad_banner query code. cleaned up parser  
							
							
							
						 
						
							2012-02-15 00:34:21 +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  
				
					
						
							
							
								 
						
							
								8f885e8bb7 
								
							 
						 
						
							
							
								
								Use key not title for module_app in parser.  
							
							... 
							
							
							
							Modify announcement routes. 
							
						 
						
							2012-02-06 16:58:19 +08:00  
				
					
						
							
							
								 
						
							
								0af37c0688 
								
							 
						 
						
							
							
								
								Add rake task for ad_banner. Will have ad_banner at dev:build  
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
				
					
						
							
							
								 
						
							
								394099c388 
								
							 
						 
						
							
							
								
								Ad banner close complete,need validation  
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
				
					
						
							
							
								 
						
							
								68cea1ea49 
								
							 
						 
						
							
							
								
								AdBanner is now working  
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
				
					
						
							
							
								 
						
							
								f530eb7112 
								
							 
						 
						
							
							
								
								Revert "mistake commit"  
							
							... 
							
							
							
							This reverts commit 2608b72d65 
							
						 
						
							2012-02-03 14:39:15 +08:00  
				
					
						
							
							
								 
						
							
								2608b72d65 
								
							 
						 
						
							
							
								
								mistake commit  
							
							
							
						 
						
							2012-02-03 14:28:08 +08:00  
				
					
						
							
							
								 
						
							
								ccbde122df 
								
							 
						 
						
							
							
								
								Fix bugs in design.  
							
							... 
							
							
							
							The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly. 
							
						 
						
							2012-01-31 16:38:25 +08:00  
				
					
						
							
							
								 
						
							
								762c2f5e8a 
								
							 
						 
						
							
							
								
								Add key in module_app.rb to use instead of title for authorization  
							
							
							
						 
						
							2012-01-30 18:12:18 +08:00  
				
					
						
							
							
								 
						
							
								7f999f20ab 
								
							 
						 
						
							
							
								
								Modify rake.dev for new design structure  
							
							
							
						 
						
							2012-01-30 15:45:55 +08:00  
				
					
						
							
							
								 
						
							
								783eae4597 
								
							 
						 
						
							
							
								
								Change "NewBlog" folders into "new_blog" in assets  
							
							... 
							
							
							
							Modify routes and pages handling for clean front-end urls 
							
						 
						
							2012-01-24 18:16:58 +08:00  
				
					
						
							
							
								 
						
							
								25cbe0c2a5 
								
							 
						 
						
							
							
								
								update app package for previous commit  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								9fcf8280fa 
								
							 
						 
						
							
							
								
								Change "_filename" to "_identifier" for carrierwave  
							
							
							
						 
						
							2012-01-24 11:57:27 +08:00  
				
					
						
							
							
								 
						
							
								5518ae362d 
								
							 
						 
						
							
							
								
								Ray's modification before redesign  
							
							
							
						 
						
							2012-01-24 11:57:27 +08:00  
				
					
						
							
							
								 
						
							
								4cfae9c107 
								
							 
						 
						
							
							
								
								announcement widget query  
							
							
							
						 
						
							2012-01-18 21:34:26 +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  
				
					
						
							
							
								 
						
							
								3d9fd359ed 
								
							 
						 
						
							
							
								
								Moving Orbit frontend and widget controller to controllers folder  
							
							
							
						 
						
							2012-01-10 18:30:08 +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  
				
					
						
							
							
								 
						
							
								7ebfe3a7f9 
								
							 
						 
						
							
							
								
								Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug  
							
							
							
						 
						
							2011-12-29 18:08:08 +08:00  
				
					
						
							
							
								 
						
							
								75c9851dbc 
								
							 
						 
						
							
							
								
								Ray's back-end modifications for sub-roles  
							
							
							
						 
						
							2011-12-28 20:57:18 +08:00  
				
					
						
							
							
								 
						
							
								62aaf79491 
								
							 
						 
						
							
							
								
								Merge with sub_roles  
							
							
							
						 
						
							2011-12-23 18:34:21 +08:00  
				
					
						
							
							
								 
						
							
								a9f06b9517 
								
							 
						 
						
							
							
								
								Divide parser into sub-parsers  
							
							
							
						 
						
							2011-12-22 16:23:48 +08:00  
				
					
						
							
							
								 
						
							
								d465febca7 
								
							 
						 
						
							
							
								
								merge with november_presentation  
							
							
							
						 
						
							2011-12-22 15:43:38 +08:00