a7d84e8583 
								
							 
						 
						
							
							
								
								add tinyscrollbar  
							
							
							
						 
						
							2012-04-05 02:31:32 +08:00  
				
					
						
							
							
								 
						
							
								c4b9a9e275 
								
							 
						 
						
							
							
								
								dock effect  
							
							
							
						 
						
							2012-04-04 05:53:49 +08:00  
				
					
						
							
							
								 
						
							
								11d3906951 
								
							 
						 
						
							
							
								
								new icons  
							
							
							
						 
						
							2012-04-03 18:06:16 +08:00  
				
					
						
							
							
								 
						
							
								aa3997f7cf 
								
							 
						 
						
							
							
								
								with notifications and other changes  
							
							
							
						 
						
							2012-03-29 19:50:23 +08:00  
				
					
						
							
							
								 
						
							
								176597f5af 
								
							 
						 
						
							
							
								
								Stupid theme  
							
							
							
						 
						
							2012-03-29 15:23:48 +08:00  
				
					
						
							
							
								 
						
							
								2e283a039d 
								
							 
						 
						
							
							
								
								Desktop Commit  
							
							
							
						 
						
							2012-03-28 18:53:30 +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  
				
					
						
							
							
								 
						
							
								f5fd3dec7a 
								
							 
						 
						
							
							
								
								Trying nokogiri  
							
							
							
						 
						
							2012-03-27 18:42:22 +08:00  
				
					
						
							
							
								 
						
							
								472744fc87 
								
							 
						 
						
							
							
								
								Changes for IE9 with html5  
							
							
							
						 
						
							2012-03-21 15:51:55 +08:00  
				
					
						
							
							
								 
						
							
								7cc075e124 
								
							 
						 
						
							
							
								
								Change the monkey picture  
							
							
							
						 
						
							2012-03-19 15:49:40 +08:00  
				
					
						
							
							
								 
						
							
								785ead5209 
								
							 
						 
						
							
							
								
								Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard  
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb 
							
						 
						
							2012-03-16 14:55:21 +08:00  
				
					
						
							
							
								 
						
							
								6f6e84b015 
								
							 
						 
						
							
							
								
								fix dashboard & announcement  
							
							
							
						 
						
							2012-03-16 14:44:57 +08:00  
				
					
						
							
							
								 
						
							
								13b6892f87 
								
							 
						 
						
							
							
								
								code for new fact check  
							
							
							
						 
						
							2012-03-16 11:09:44 +08:00  
				
					
						
							
							
								 
						
							
								00ab773942 
								
							 
						 
						
							
							
								
								fix dashboard & announcement  
							
							
							
						 
						
							2012-03-14 20:05:03 +08:00  
				
					
						
							
							
								 
						
							
								cceb785a8d 
								
							 
						 
						
							
							
								
								change view and action for announcement ,Lin checked.  Also add validation for object_auth make sure for each object,the object will be unique for each action.  
							
							
							
						 
						
							2012-02-29 18:58:33 +08:00  
				
					
						
							
							
								 
						
							
								8932615f05 
								
							 
						 
						
							
							
								
								add "all_user" for app&object auth  
							
							
							
						 
						
							2012-02-29 18:56:42 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								6b2aeadde6 
								
							 
						 
						
							
							
								
								Changes for nccu  
							
							
							
						 
						
							2012-02-29 16:01:50 +08:00  
				
					
						
							
							
								 
						
							
								ccb61fc2dd 
								
							 
						 
						
							
							
								
								change Search bar  
							
							
							
						 
						
							2012-02-29 11:29:13 +08:00  
				
					
						
							
							
								 
						
							
								0fa5c3ba9d 
								
							 
						 
						
							
							
								
								Fix bug in orbit-bar  
							
							
							
						 
						
							2012-02-29 04:56:52 +08:00  
				
					
						
							
							
								 
						
							
								344ec86c57 
								
							 
						 
						
							
							
								
								Remove class 'error' in devise forms  
							
							
							
						 
						
							2012-02-29 04:56:32 +08:00  
				
					
						
							
							
								 
						
							
								4b7b57bb3d 
								
							 
						 
						
							
							
								
								Add some missing translations  
							
							
							
						 
						
							2012-02-29 04:48:21 +08:00  
				
					
						
							
							
								 
						
							
								9aa4173933 
								
							 
						 
						
							
							
								
								Change orbit-bar for language but bug when user name is too long  
							
							
							
						 
						
							2012-02-29 04:21:56 +08:00  
				
					
						
							
							
								 
						
							
								18617850e5 
								
							 
						 
						
							
							
								
								Add categories for all the widgets  
							
							
							
						 
						
							2012-02-28 22:00:05 +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  
				
					
						
							
							
								 
						
							
								f13ebc6c46 
								
							 
						 
						
							
							
								
								Fix bugs and changes for nccu  
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
				
					
						
							
							
								 
						
							
								f8d1d7242d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into dashboard  
							
							
							
						 
						
							2012-02-23 16:05:33 +08:00  
				
					
						
							
							
								 
						
							
								1a6e497b3d 
								
							 
						 
						
							
							
								
								Ika's changes  
							
							
							
						 
						
							2012-02-23 15:53:15 +08:00  
				
					
						
							
							
								 
						
							
								63d7810b35 
								
							 
						 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement  
							
							
							
						 
						
							2012-02-23 15:52:58 +08:00  
				
					
						
							
							
								 
						
							
								53ed4b0404 
								
							 
						 
						
							
							
								
								Initial changes in announcement for sorting and filtering  
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
				
					
						
							
							
								 
						
							
								22d9741ac8 
								
							 
						 
						
							
							
								
								Fix for orbit_bar  
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
				
					
						
							
							
								 
						
							
								ba4d71a026 
								
							 
						 
						
							
							
								
								Changes in orbit_bar and js in announcements  
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
				
					
						
							
							
								 
						
							
								1146506063 
								
							 
						 
						
							
							
								
								Fix bug when no bulletins or web_links  
							
							
							
						 
						
							2012-02-20 15:56:17 +08:00  
				
					
						
							
							
								 
						
							
								a3f152b200 
								
							 
						 
						
							
							
								
								Changes for jquery 1.7 (.live -> .on), create module_layout  
							
							
							
						 
						
							2012-02-20 03:24:05 +08:00  
				
					
						
							
							
								 
						
							
								3ff2e7867e 
								
							 
						 
						
							
							
								
								Fix bug when editing home  
							
							
							
						 
						
							2012-02-20 03:22:53 +08:00  
				
					
						
							
							
								 
						
							
								44a346ffe9 
								
							 
						 
						
							
							
								
								Changes for orbit bar, login  
							
							
							
						 
						
							2012-02-19 16:33:22 +08:00  
				
					
						
							
							
								 
						
							
								0b71714d44 
								
							 
						 
						
							
							
								
								Improve code in items, pages, links  
							
							
							
						 
						
							2012-02-17 14:54:11 +08:00  
				
					
						
							
							
								 
						
							
								4389f0cf28 
								
							 
						 
						
							
							
								
								Add new created files to previous commit  
							
							
							
						 
						
							2012-02-16 13:09:09 +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  
				
					
						
							
							
								 
						
							
								3e70634add 
								
							 
						 
						
							
							
								
								Announcement modifications and tags  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								1f7dae9bee 
								
							 
						 
						
							
							
								
								Gemfile and bugs in js for orbit-bar  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								55ae7de01c 
								
							 
						 
						
							
							
								
								Orbit-bar in front-end and back-end, side-bar and drop-down menu  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								dcc6a53430 
								
							 
						 
						
							
							
								
								brief starting  for dashboard,adds i18n vars  
							
							
							
						 
						
							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