Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								6c33d353ba
								
							
						 | 
						
							
							
								
								make journal list easy to read
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								05027afa63
								
							
						 | 
						
							
							
								
								make journal list easy to read
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								4f31b1362b
								
							
						 | 
						
							
							
								
								fixed new  co-author relation bug....
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								1289ad9f9d
								
							
						 | 
						
							
							
								
								fixed co-author relation bug....
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								afd8e7e380
								
							
						 | 
						
							
							
								
								when delete co-author relation, the co-author will be reset nil
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								09c59c4e03
								
							
						 | 
						
							
							
								
								midify button type
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								21b1432f7f
								
							
						 | 
						
							
							
								
								change settings table default display
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								e0e1c30f68
								
							
						 | 
						
							
							
								
								delete onside widget in db
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								4a8878132e
								
							
						 | 
						
							
							
								
								add content for announcement rss
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								80c17c9718
								
							
						 | 
						
							
							
								
								Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:00 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								7d3c535e01
								
							
						 | 
						
							
							
								
								add info field
							
							
							
							
							
						 | 
						
							2012-12-06 07:58:39 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								a39d406bcb
								
							
						 | 
						
							
							
								
								add info field
							
							
							
							
							
						 | 
						
							2012-12-05 20:32:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e68c52bc00
								
							
						 | 
						
							
							
								
								Changes for store back-end
							
							
							
							
							
						 | 
						
							2012-12-05 13:46:10 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9a79e432dd
								
							
						 | 
						
							
							
								
								Fix typo
							
							
							
							
							
						 | 
						
							2012-12-04 01:12:15 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2983b181e6
								
							
						 | 
						
							
							
								
								Fix some translations
							
							
							
							
							
						 | 
						
							2012-12-04 01:03:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								8d798b14d7
								
							
						 | 
						
							
							
								
								Merge branch 'publication' of github.com:Rulingcom/orbit into publication
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/desktop/journal_pages_controller.rb
	app/models/user/user.rb 
							
						 | 
						
							2012-12-04 00:32:55 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c6e0b56012
								
							
						 | 
						
							
							
								
								stupid bug fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								58e71c29b3
								
							
						 | 
						
							
							
								
								uniq relation
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								9759a32394
								
							
						 | 
						
							
							
								
								can display relation between author
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								f89a6194c4
								
							
						 | 
						
							
							
								
								add back button
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								49d1ca6997
								
							
						 | 
						
							
							
								
								new type fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5d6dd8cded
								
							
						 | 
						
							
							
								
								separate relation list from index page and render it
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								e143f9a345
								
							
						 | 
						
							
							
								
								can select relection from relation db
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:46 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0e6c75e677
								
							
						 | 
						
							
							
								
								form for coauthor - fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								0affc73370
								
							
						 | 
						
							
							
								
								modify delete co-author message
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a6a50227eb
								
							
						 | 
						
							
							
								
								new type fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f7f55850fe
								
							
						 | 
						
							
							
								
								coauthor edit and destroy fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								7822ffc33d
								
							
						 | 
						
							
							
								
								can add relation between co-author
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5dabfe9319
								
							
						 | 
						
							
							
								
								refine co-authro page
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5986817e16
								
							
						 | 
						
							
							
								
								add journal_list. now, those pair, (journal_title, journal_levels), is uniq
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								b1ddc9950a
								
							
						 | 
						
							
							
								
								adjust update password textfield position
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								184f903b1c
								
							
						 | 
						
							
							
								
								correct user passwd and sent json to front-end
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								8a7ae3f061
								
							
						 | 
						
							
							
								
								correct user passwd and sent json to front-end
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								eb97d417bd
								
							
						 | 
						
							
							
								
								if coauthor not in coauthor db then it will be add in db
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								7f7b33f310
								
							
						 | 
						
							
							
								
								fixed journal update method
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								ee830f148e
								
							
						 | 
						
							
							
								
								jumping menus updated..
							
							
							
							
							
						 | 
						
							2012-12-04 00:30:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								6426fb74d9
								
							
						 | 
						
							
							
								
								remove edit page cancel buttom
							
							
							
							
							
						 | 
						
							2012-12-04 00:25:58 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d70ef4666b
								
							
						 | 
						
							
							
								
								delete fixed..
							
							
							
							
							
						 | 
						
							2012-12-04 00:25:58 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								43a9f231a6
								
							
						 | 
						
							
							
								
								multiple file fixed
							
							
							
							
							
						 | 
						
							2012-12-04 00:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								d806e8cf82
								
							
						 | 
						
							
							
								
								have done multiple file
							
							
							
							
							
						 | 
						
							2012-12-04 00:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								4a0cc61852
								
							
						 | 
						
							
							
								
								can add multiple file
							
							
							
							
							
						 | 
						
							2012-12-04 00:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5a9d9151d9
								
							
						 | 
						
							
							
								
								add journal list template
							
							
							
							
							
						 | 
						
							2012-12-04 00:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e2da22b29c
								
							
						 | 
						
							
							
								
								Clean translations
							
							
							
							
							
						 | 
						
							2012-12-04 00:17:12 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3be3c9a1
								
							
						 | 
						
							
							
								
								Translation changes
							
							
							
							
							
						 | 
						
							2012-12-03 23:00:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9c6c622a49
								
							
						 | 
						
							
							
								
								Add missing icons and css for icons in layout
							
							
							
							
							
						 | 
						
							2012-12-03 22:31:00 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9254b9960d
								
							
						 | 
						
							
							
								
								Add timeout to user
							
							
							
							
							
						 | 
						
							2012-12-03 21:45:00 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fbe2b26e9f
								
							
						 | 
						
							
							
								
								Do not create layout part if it already exists
							
							
							
							
							
						 | 
						
							2012-12-03 18:59:32 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								4f9aa63045
								
							
						 | 
						
							
							
								
								Remove extra end
							
							
							
							
							
						 | 
						
							2012-12-03 18:45:32 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								5c7f1aa164
								
							
						 | 
						
							
							
								
								Fix saving of page_part after layout change
							
							
							
							
							
						 | 
						
							2012-12-03 18:42:50 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f227e55c4f
								
							
						 | 
						
							
							
								
								stupid bug fixed
							
							
							
							
							
						 | 
						
							2012-12-03 17:52:05 +08:00 |