97b4eee798 
								
							 
						 
						
							
							
								
								full site search with google  
							
							
							
						 
						
							2012-07-25 17:20:25 +08:00  
				
					
						
							
							
								 
						
							
								10731dc211 
								
							 
						 
						
							
							
								
								demo widget  
							
							
							
						 
						
							2012-07-18 18:07:45 +08:00  
				
					
						
							
							
								 
						
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
				
					
						
							
							
								 
						
							
								09d46f2f75 
								
							 
						 
						
							
							
								
								NCCU 上傳版本  0709  
							
							... 
							
							
							
							Merge branch 'nccu0621'
Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb 
							
						 
						
							2012-07-09 16:02:59 +08:00  
				
					
						
							
							
								 
						
							
								f20f36383e 
								
							 
						 
						
							
							
								
								Timeline ajax load fixed… a bit change in structure..  
							
							
							
						 
						
							2012-07-03 19:45:47 +08:00  
				
					
						
							
							
								 
						
							
								d0632b2e4c 
								
							 
						 
						
							
							
								
								change name format  
							
							
							
						 
						
							2012-07-03 16:05:19 +08:00  
				
					
						
							
							
								 
						
							
								bacb1f1e63 
								
							 
						 
						
							
							
								
								Timeline ajax loading  
							
							
							
						 
						
							2012-07-02 21:06:36 +08:00  
				
					
						
							
							
								 
						
							
								a1e74987dc 
								
							 
						 
						
							
							
								
								Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb 
							
						 
						
							2012-06-29 16:10:29 +08:00  
				
					
						
							
							
								 
						
							
								7151102a86 
								
							 
						 
						
							
							
								
								new page add and timeline changes  
							
							
							
						 
						
							2012-06-28 17:31:48 +08:00  
				
					
						
							
							
								 
						
							
								4aa155a44d 
								
							 
						 
						
							
							
								
								timeline updates major ones..  
							
							
							
						 
						
							2012-06-26 21:09:33 +08:00  
				
					
						
							
							
								 
						
							
								ffd95ee1fd 
								
							 
						 
						
							
							
								
								fix  
							
							... 
							
							
							
							新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion.   may need to run:
 AppManager.all.collect{|am|  am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB. 
							
						 
						
							2012-06-25 16:23:16 +08:00  
				
					
						
							
							
								 
						
							
								3f95fe4f13 
								
							 
						 
						
							
							
								
								tmp commit for search.  start nccu0621 first  
							
							
							
						 
						
							2012-06-22 11:34:10 +08:00  
				
					
						
							
							
								 
						
							
								cb17fe0825 
								
							 
						 
						
							
							
								
								Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working  
							
							
							
						 
						
							2012-06-20 14:50:51 +08:00  
				
					
						
							
							
								 
						
							
								1f1868a75f 
								
							 
						 
						
							
							
								
								cache privilege user list.  
							
							
							
						 
						
							2012-05-29 17:17:26 +08:00  
				
					
						
							
							
								 
						
							
								6f0cf0e92e 
								
							 
						 
						
							
							
								
								cache privilege user list.  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								f1c8bed29d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb 
							
						 
						
							2012-05-22 20:33:07 +08:00  
				
					
						
							
							
								 
						
							
								11a371cbb9 
								
							 
						 
						
							
							
								
								Fix destroy in structure  
							
							... 
							
							
							
							Fix sorting 
							
						 
						
							2012-05-22 17:55:45 +08:00  
				
					
						
							
							
								 
						
							
								d0b030c47d 
								
							 
						 
						
							
							
								
								Put inc/ajax_setting in new_admin  
							
							... 
							
							
							
							Fix callback for link on save 
							
						 
						
							2012-05-22 16:11:00 +08:00  
				
					
						
							
							
								 
						
							
								4d33c7a56d 
								
							 
						 
						
							
							
								
								Changes for dat and time format  
							
							... 
							
							
							
							Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title 
							
						 
						
							2012-05-18 19:42:36 +08:00  
				
					
						
							
							
								 
						
							
								6a022c90da 
								
							 
						 
						
							
							
								
								Changes on nccu  
							
							
							
						 
						
							2012-05-18 15:20:45 +08:00  
				
					
						
							
							
								 
						
							
								79f484300e 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 18:32:06 +08:00  
				
					
						
							
							
								 
						
							
								c9cbec4239 
								
							 
						 
						
							
							
								
								Asset changes, add description  
							
							
							
						 
						
							2012-05-17 18:31:40 +08:00  
				
					
						
							
							
								 
						
							
								5e93fe51a9 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 16:41:11 +08:00  
				
					
						
							
							
								 
						
							
								29c54e6480 
								
							 
						 
						
							
							
								
								Add mandatory fields to assets  
							
							
							
						 
						
							2012-05-17 16:40:09 +08:00  
				
					
						
							
							
								 
						
							
								bfad553cc3 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 09:31:02 +08:00  
				
					
						
							
							
								 
						
							
								84dac1d250 
								
							 
						 
						
							
							
								
								Create FileAssetUploader  
							
							
							
						 
						
							2012-05-17 09:30:21 +08:00  
				
					
						
							
							
								 
						
							
								eba4671733 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 06:46:29 +08:00  
				
					
						
							
							
								 
						
							
								cd1640482a 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509  
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/_side_bar.html.erb 
							
						 
						
							2012-05-17 06:45:30 +08:00  
				
					
						
							
							
								 
						
							
								0f354b8ccc 
								
							 
						 
						
							
							
								
								fix ad_image size hints.   fix orbit backend controller error when changing language.  
							
							
							
						 
						
							2012-05-17 06:44:14 +08:00  
				
					
						
							
							
								 
						
							
								82d78acbad 
								
							 
						 
						
							
							
								
								First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued  
							
							
							
						 
						
							2012-05-17 06:43:39 +08:00  
				
					
						
							
							
								 
						
							
								03387d3c07 
								
							 
						 
						
							
							
								
								Object auth for ad_banner  
							
							
							
						 
						
							2012-05-17 06:42:33 +08:00  
				
					
						
							
							
								 
						
							
								6b9c8eb15d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 06:31:57 +08:00  
				
					
						
							
							
								 
						
							
								26292f0dcc 
								
							 
						 
						
							
							
								
								Asset upload  
							
							
							
						 
						
							2012-05-17 06:28:29 +08:00  
				
					
						
							
							
								 
						
							
								9129835f23 
								
							 
						 
						
							
							
								
								Add tags to assets  
							
							
							
						 
						
							2012-05-16 18:19:41 +08:00  
				
					
						
							
							
								 
						
							
								0647698012 
								
							 
						 
						
							
							
								
								fix ad_image size hints.   fix orbit backend controller error when changing language.  
							
							
							
						 
						
							2012-05-16 17:16:48 +08:00  
				
					
						
							
							
								 
						
							
								a31a9c4792 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of  https://github.com/Rulingcom/orbit  into nccu_0509  
							
							... 
							
							
							
							Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb 
							
						 
						
							2012-05-16 12:13:07 +08:00  
				
					
						
							
							
								 
						
							
								0b0916179f 
								
							 
						 
						
							
							
								
								Change assets  
							
							
							
						 
						
							2012-05-16 11:07:11 +08:00  
				
					
						
							
							
								 
						
							
								f950f77f36 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	Gemfile
	app/models/ad_banner.rb 
							
						 
						
							2012-05-15 23:02:22 +08:00  
				
					
						
							
							
								 
						
							
								e54f4409fb 
								
							 
						 
						
							
							
								
								Add impressionist  
							
							
							
						 
						
							2012-05-15 21:26:09 +08:00  
				
					
						
							
							
								 
						
							
								53a0fbddf0 
								
							 
						 
						
							
							
								
								Fix commit error  
							
							
							
						 
						
							2012-05-15 21:25:51 +08:00  
				
					
						
							
							
								 
						
							
								3f744dab05 
								
							 
						 
						
							
							
								
								First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued  
							
							
							
						 
						
							2012-05-15 18:55:16 +08:00  
				
					
						
							
							
								 
						
							
								b23b5e8ec5 
								
							 
						 
						
							
							
								
								Object auth for ad_banner  
							
							
							
						 
						
							2012-05-15 16:39:23 +08:00  
				
					
						
							
							
								 
						
							
								77deffb512 
								
							 
						 
						
							
							
								
								Nccu calendar and daily job.  
							
							
							
						 
						
							2012-05-15 14:03:54 +08:00  
				
					
						
							
							
								 
						
							
								0a9f0bcc45 
								
							 
						 
						
							
							
								
								starting ad_banner auth  
							
							
							
						 
						
							2012-05-15 09:57:05 +08:00  
				
					
						
							
							
								 
						
							
								8fcb8ef8de 
								
							 
						 
						
							
							
								
								Change the way links are displayed in menus in front-end  
							
							
							
						 
						
							2012-05-14 21:43:10 +08:00  
				
					
						
							
							
								 
						
							
								59b55d1574 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-14 12:42:06 +08:00  
				
					
						
							
							
								 
						
							
								9ba4c2cf2f 
								
							 
						 
						
							
							
								
								Change to apply page to had object_auth  
							
							
							
						 
						
							2012-05-14 12:40:50 +08:00  
				
					
						
							
							
								 
						
							
								2cd67356a5 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_0509' of  https://github.com/Rulingcom/orbit  into nccu_0509  
							
							... 
							
							
							
							Conflicts:
	config/locales/zh_tw.yml 
							
						 
						
							2012-05-14 12:36:09 +08:00  
				
					
						
							
							
								 
						
							
								e1450ec748 
								
							 
						 
						
							
							
								
								Change to apply page to had object_auth  
							
							
							
						 
						
							2012-05-14 12:34:15 +08:00  
				
					
						
							
							
								 
						
							
								ebc8dd33ec 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json 
							
						 
						
							2012-05-14 00:57:17 +08:00  
				
					
						
							
							
								 
						
							
								cf8d20dc84 
								
							 
						 
						
							
							
								
								Add category and tag to pages  
							
							
							
						 
						
							2012-05-14 00:33:52 +08:00  
				
					
						
							
							
								 
						
							
								4ae8299949 
								
							 
						 
						
							
							
								
								Add custom title to widgets  
							
							... 
							
							
							
							Fix pagination conflict with main_content and widgets 
							
						 
						
							2012-05-13 22:35:00 +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  
				
					
						
							
							
								 
						
							
								6a443f0976 
								
							 
						 
						
							
							
								
								Add mongoid-tree to Item  
							
							
							
						 
						
							2012-05-11 16:16:09 +08:00  
				
					
						
							
							
								 
						
							
								2c3637e9b4 
								
							 
						 
						
							
							
								
								very important update for widgets management..  
							
							
							
						 
						
							2012-05-11 15:27:16 +08:00  
				
					
						
							
							
								 
						
							
								d88d4e58dc 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	config/environments/development.rb 
							
						 
						
							2012-05-09 13:51:00 +08:00  
				
					
						
							
							
								 
						
							
								41c0c26330 
								
							 
						 
						
							
							
								
								Add mail_settings  
							
							
							
						 
						
							2012-05-09 11:38:29 +08:00  
				
					
						
							
							
								 
						
							
								909ca19456 
								
							 
						 
						
							
							
								
								Fix bugs in sub_menu  
							
							
							
						 
						
							2012-05-09 04:31:04 +08:00  
				
					
						
							
							
								 
						
							
								9ead6cafda 
								
							 
						 
						
							
							
								
								Ray's changes  
							
							
							
						 
						
							2012-05-09 04:15:02 +08:00  
				
					
						
							
							
								 
						
							
								26a50cc862 
								
							 
						 
						
							
							
								
								Add sub_menu to children  
							
							
							
						 
						
							2012-05-09 04:15:45 +08:00  
				
					
						
							
							
								 
						
							
								55bfaea43e 
								
							 
						 
						
							
							
								
								Can show announcement and news list by tag's key  
							
							
							
						 
						
							2012-05-08 17:27:42 +08:00  
				
					
						
							
							
								 
						
							
								5c7cf1aef2 
								
							 
						 
						
							
							
								
								Add sub_menu to site_info  
							
							
							
						 
						
							2012-05-08 17:27:02 +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  
				
					
						
							
							
								 
						
							
								2083e0bf4f 
								
							 
						 
						
							
							
								
								widget structure improvised…  
							
							
							
						 
						
							2012-05-07 19:00:50 +08:00  
				
					
						
							
							
								 
						
							
								8a3f0b9bdc 
								
							 
						 
						
							
							
								
								Add menu_enabled_for: the page can be shown even if there's no link in the menu  
							
							
							
						 
						
							2012-05-07 15:47:14 +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  
				
					
						
							
							
								 
						
							
								0246341aef 
								
							 
						 
						
							
							
								
								Add footer to site_info  
							
							
							
						 
						
							2012-05-07 11:25:33 +08:00  
				
					
						
							
							
								 
						
							
								1fb6c20b86 
								
							 
						 
						
							
							
								
								Add site_info  
							
							
							
						 
						
							2012-05-07 00:54:18 +08:00  
				
					
						
							
							
								 
						
							
								ce1fecaf93 
								
							 
						 
						
							
							
								
								Add position ordering and hiding page for i18n  
							
							
							
						 
						
							2012-05-06 00:35:13 +08:00  
				
					
						
							
							
								 
						
							
								f190ce18ee 
								
							 
						 
						
							
							
								
								Put sorting in web_link, page_context and design  
							
							
							
						 
						
							2012-05-05 21:20:20 +08:00  
				
					
						
							
							
								 
						
							
								a3a1e4b92e 
								
							 
						 
						
							
							
								
								controller change, views working and db for paper and journals  
							
							
							
						 
						
							2012-05-03 21:30:12 +08:00  
				
					
						
							
							
								 
						
							
								aacd9da9fb 
								
							 
						 
						
							
							
								
								auto login encryption done…  
							
							
							
						 
						
							2012-04-30 14:29:42 +08:00  
				
					
						
							
							
								 
						
							
								c158375d02 
								
							 
						 
						
							
							
								
								with connection and some save settings…  
							
							
							
						 
						
							2012-04-26 21:30:13 +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  
				
					
						
							
							
								 
						
							
								51ee9a4bfa 
								
							 
						 
						
							
							
								
								Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner  
							
							... 
							
							
							
							Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb 
							
						 
						
							2012-04-24 14:43:30 +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  
				
					
						
							
							
								 
						
							
								c57ba305e9 
								
							 
						 
						
							
							
								
								Fix ad_banner  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								670ec2a40e 
								
							 
						 
						
							
							
								
								Themes from db fixed..  
							
							
							
						 
						
							2012-04-23 21:04:02 +08:00  
				
					
						
							
							
								 
						
							
								0836583694 
								
							 
						 
						
							
							
								
								Disable ad_banner_preview. Just show window  
							
							
							
						 
						
							2012-04-23 18:29:23 +08:00  
				
					
						
							
							
								 
						
							
								a5db2382e7 
								
							 
						 
						
							
							
								
								Fix ad image date selector  
							
							
							
						 
						
							2012-04-23 18:20:12 +08:00  
				
					
						
							
							
								 
						
							
								35452c039d 
								
							 
						 
						
							
							
								
								Fix ad_banner  
							
							
							
						 
						
							2012-04-23 17:03:55 +08:00  
				
					
						
							
							
								 
						
							
								2eeb530422 
								
							 
						 
						
							
							
								
								Merge branch 'master' into ldap  
							
							... 
							
							
							
							Conflicts:
	app/assets/stylesheets/new_admin.css.erb 
							
						 
						
							2012-04-23 14:13:37 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4bad25e682 
								
							 
						 
						
							
							
								
								Msg box added and background image saving complete  
							
							
							
						 
						
							2012-04-18 22:01:12 +08:00  
				
					
						
							
							
								 
						
							
								95a1e266ae 
								
							 
						 
						
							
							
								
								Custom thème done and theme id done…  
							
							
							
						 
						
							2012-04-17 21:15:40 +08:00  
				
					
						
							
							
								 
						
							
								51190a79cb 
								
							 
						 
						
							
							
								
								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-17 16:03:48 +08:00  
				
					
						
							
							
								 
						
							
								a9a4ca6ede 
								
							 
						 
						
							
							
								
								fix i18n vars in ad_banner  
							
							
							
						 
						
							2012-04-17 15:21:43 +08:00  
				
					
						
							
							
								 
						
							
								4875b339f8 
								
							 
						 
						
							
							
								
								Fetching desktop from db  
							
							
							
						 
						
							2012-04-11 15:31:10 +08:00  
				
					
						
							
							
								 
						
							
								7309d9c446 
								
							 
						 
						
							
							
								
								Dock change and getting values from db  
							
							
							
						 
						
							2012-04-06 17:49:22 +08:00  
				
					
						
							
							
								 
						
							
								f5c080efd4 
								
							 
						 
						
							
							
								
								Model commit  
							
							
							
						 
						
							2012-04-06 17:47:04 +08:00  
				
					
						
							
							
								 
						
							
								6f9363ef54 
								
							 
						 
						
							
							
								
								Fix bugs in upload design and missing menu  
							
							
							
						 
						
							2012-04-06 17:37:45 +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  
				
					
						
							
							
								 
						
							
								3ba89ecbcf 
								
							 
						 
						
							
							
								
								Fact check program completed,Lin checked  
							
							
							
						 
						
							2012-03-27 18:54:03 +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  
				
					
						
							
							
								 
						
							
								f4fda08e86 
								
							 
						 
						
							
							
								
								Replace PrototypeR4 by Orbit.  
							
							... 
							
							
							
							Move session into mongoid_store.
Reset session when sing_in. 
							
						 
						
							2012-03-16 14:58:32 +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  
				
					
						
							
							
								 
						
							
								3bcd7ea349 
								
							 
						 
						
							
							
								
								Exp with object_auth  
							
							
							
						 
						
							2012-02-29 18:50:23 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								dcc64a20d2 
								
							 
						 
						
							
							
								
								Finish sorting for announcements  
							
							
							
						 
						
							2012-02-24 15:30:49 +08:00  
				
					
						
							
							
								 
						
							
								678f1eabef 
								
							 
						 
						
							
							
								
								LDAP connection and modified Devise  
							
							
							
						 
						
							2012-02-22 14:43:24 +08:00  
				
					
						
							
							
								 
						
							
								9b001aa6c3 
								
							 
						 
						
							
							
								
								new page_content app  
							
							
							
						 
						
							2012-02-21 19:22:42 +08:00  
				
					
						
							
							
								 
						
							
								c304819d6b 
								
							 
						 
						
							
							
								
								Commented out code for Windows  
							
							
							
						 
						
							2012-02-20 08:55:21 +08:00  
				
					
						
							
							
								 
						
							
								cf038183b9 
								
							 
						 
						
							
							
								
								Ika's changes in modules  
							
							
							
						 
						
							2012-02-20 08:48:27 +08:00  
				
					
						
							
							
								 
						
							
								0b71714d44 
								
							 
						 
						
							
							
								
								Improve code in items, pages, links  
							
							
							
						 
						
							2012-02-17 14:54:11 +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  
				
					
						
							
							
								 
						
							
								d0c2856a3a 
								
							 
						 
						
							
							
								
								Fix relations error in tags  
							
							
							
						 
						
							2012-02-15 11:42:19 +08:00  
				
					
						
							
							
								 
						
							
								778a85ca2b 
								
							 
						 
						
							
							
								
								add tags  
							
							
							
						 
						
							2012-02-15 10:37:07 +08:00  
				
					
						
							
							
								 
						
							
								3e70634add 
								
							 
						 
						
							
							
								
								Announcement modifications and tags  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								f57e9f19f7 
								
							 
						 
						
							
							
								
								Changes for multiple i18n_variable in bulletin  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								3ed9b81df9 
								
							 
						 
						
							
							
								
								first commit for object auth,will take new_blog for experiment  
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								964d7b6054 
								
							 
						 
						
							
							
								
								announcement path error  
							
							
							
						 
						
							2012-02-13 17:09:37 +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  
				
					
						
							
							
								 
						
							
								a980847eb3 
								
							 
						 
						
							
							
								
								Basic function for AdBanner  
							
							
							
						 
						
							2012-02-01 14:27:51 +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  
				
					
						
							
							
								 
						
							
								46db173e0b 
								
							 
						 
						
							
							
								
								Modifications in the Design code: the uploader works but the edit is broken  
							
							
							
						 
						
							2012-01-26 12:05:25 +08:00  
				
					
						
							
							
								 
						
							
								6a196c5d3d 
								
							 
						 
						
							
							
								
								Embedded to referenced for users  
							
							
							
						 
						
							2012-01-24 15:12:06 +08:00  
				
					
						
							
							
								 
						
							
								83827f82ec 
								
							 
						 
						
							
							
								
								Fix custom image class  
							
							
							
						 
						
							2012-01-24 15:11:42 +08:00  
				
					
						
							
							
								 
						
							
								4ed8a2164c 
								
							 
						 
						
							
							
								
								First complete with manager and submanager  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								bfd55277d7 
								
							 
						 
						
							
							
								
								Embed attribute_fields and sub_roles  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								7b40706aed 
								
							 
						 
						
							
							
								
								fixing for app_auth  
							
							
							
						 
						
							2012-01-05 16:20:51 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								962bf03af2 
								
							 
						 
						
							
							
								
								Remove snippet  
							
							
							
						 
						
							2011-12-05 10:27:22 +08:00  
				
					
						
							
							
								 
						
							
								66bc0ce560 
								
							 
						 
						
							
							
								
								Modified dev.rake  
							
							
							
						 
						
							2011-11-20 03:16:35 +08:00