Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								803253ebcf
								
							
						 | 
						
							
							
								
								Put nestedSortable in page_edit.js.erb
							
							
							
							
							
						 | 
						
							2012-05-12 22:12:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ef49df448d
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	app/helpers/admin/item_helper.rb 
							
						 | 
						
							2012-05-11 18:09:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								076f5ad6ef
								
							
						 | 
						
							
							
								
								Ray's changes for drag and drop in structure's side_bar
							
							
							
							
							
						 | 
						
							2012-05-11 17:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6a443f0976
								
							
						 | 
						
							
							
								
								Add mongoid-tree to Item
							
							
							
							
							
						 | 
						
							2012-05-11 16:16:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								fd52d00187
								
							
						 | 
						
							
							
								
								Add drag and drop to structure side_bar
							
							
							
							
							
						 | 
						
							2012-05-11 10:00:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5aca3db95f
								
							
						 | 
						
							
							
								
								Ray's changes for structure and web_links
							
							
							
							
							
						 | 
						
							2012-04-27 11:02:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								72efdbd742
								
							
						 | 
						
							
							
								
								changes before Chirs and Ray's trip
							
							
							
							
							
						 | 
						
							2012-04-19 11:50:54 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								d85f29e65c
								
							
						 | 
						
							
							
								
								Fix missing modification for "panel_main" to "back_main"
							
							
							
							
							
						 | 
						
							2011-12-29 17:49:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								fc591ee308
								
							
						 | 
						
							
							
								
								Ray's back_end modification before sub_roles
							
							
							
							
							
						 | 
						
							2011-12-23 18:02:45 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								26b49dcf02
								
							
						 | 
						
							
							
								
								Remove js from html
							
							
							
							
							
						 | 
						
							2011-12-05 10:36:25 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								f3f405c1b4
								
							
						 | 
						
							
							
								
								Remove useless files in items
							
							
							
							
							
						 | 
						
							2011-12-05 09:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								f387139ae1
								
							
						 | 
						
							
							
								
								rails 3.1 and designs (with bug)
							
							
							
							
							
						 | 
						
							2011-07-12 16:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								a695b9ad29
								
							
						 | 
						
							
							
								
								Items UI changes
							
							
							
							
							
						 | 
						
							2011-06-10 13:57:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								d971a8ecbe
								
							
						 | 
						
							
							
								
								Uniformized: @page and @ link in @item
							
							
							
							
							
							
							
							Change parser for page edition. 
							
						 | 
						
							2011-05-25 14:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								24ae7ed5e3
								
							
						 | 
						
							
							
								
								Links edition
							
							
							
							
							
						 | 
						
							2011-05-13 09:08:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								d9ba76ebd5
								
							
						 | 
						
							
							
								
								- No more Home object
							
							
							
							
							
							
							
							- Sitemap on the left side and view of the current page in the main block 
							
						 | 
						
							2011-05-09 18:49:57 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e62df90117
								
							
						 | 
						
							
							
								
								user can't delete self and flash_messages
							
							
							
							
							
						 | 
						
							2011-04-13 18:22:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ihower
							
						 | 
						
							
							
							
							
							
								
							
							
								19a7d51e60
								
							
						 | 
						
							
							
								
								Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
							
							
							
							
							
						 | 
						
							2011-04-13 18:19:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								bd46cb1b12
								
							
						 | 
						
							
							
								
								remove component link
							
							
							
							
							
						 | 
						
							2010-02-22 17:10:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								93169b1098
								
							
						 | 
						
							
							
								
								Add Item list interface, but acts_as_list can not used
							
							
							
							
							
						 | 
						
							2010-02-22 16:10:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								66a462faa8
								
							
						 | 
						
							
							
								
								Add nested route url
							
							
							
							
							
						 | 
						
							2010-02-05 17:18:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								32e8bd108f
								
							
						 | 
						
							
							
								
								Add Item#ancestors
							
							
							
							
							
						 | 
						
							2010-01-18 15:52:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								e1440a79d8
								
							
						 | 
						
							
							
								
								Add Item, Page, Component, Link inheritanced models
							
							
							
							
							
						 | 
						
							2010-01-14 18:30:53 +08:00 |