nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								89dab7c534
								
							
						 | 
						
							
							
								
								Merging code updates (Unlisted Mode)
							
							
							
							
							
						 | 
						
							2016-11-22 10:25:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								f9bd3d8808
								
							
						 | 
						
							
							
								
								Adding French locale to mastodon.jsx
							
							
							
							
							
						 | 
						
							2016-11-22 10:21:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								115ce90578
								
							
						 | 
						
							
							
								
								Adding French locale to settings_helper.rb
							
							
							
							
							
						 | 
						
							2016-11-22 10:20:28 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								1788164352
								
							
						 | 
						
							
							
								
								Local accounts can control "silenced" attribute which removes them from public timeline
							
							
							
							
							
						 | 
						
							2016-11-21 23:06:41 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								64cfbbcc55
								
							
						 | 
						
							
							
								
								Adding French locale
							
							
							
							
							
						 | 
						
							2016-11-21 22:46:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								46d9076e99
								
							
						 | 
						
							
							
								
								Importing doorkeeper.fr.yml
							
							
							
							
							
							
							
							From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml 
							
						 | 
						
							2016-11-21 22:39:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								12e9f789ab
								
							
						 | 
						
							
							
								
								Importing devise.fr.yml
							
							
							
							
							
							
							
							From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013 
							
						 | 
						
							2016-11-21 22:34:50 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								7abbb02824
								
							
						 | 
						
							
							
								
								Fix #163 - No need for Safari chrome on iOS
							
							
							
							
							
						 | 
						
							2016-11-21 22:33:44 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								835d5483fe
								
							
						 | 
						
							
							
								
								First version for fr.jsx
							
							
							
							
							
						 | 
						
							2016-11-21 22:06:05 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								7944ed6fe5
								
							
						 | 
						
							
							
								
								Adding option to specify asset server, filter followers query by local accounts
							
							
							
							
							
							
							
							during Fan Out On Write to load less stuff into memory 
							
						 | 
						
							2016-11-21 22:04:10 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b6243a186
								
							
						 | 
						
							
							
								
								Create fr.jsx
							
							
							
							
							
						 | 
						
							2016-11-21 21:51:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3afea7b9d
								
							
						 | 
						
							
							
								
								First version for simple_form.fr.yml
							
							
							
							
							
						 | 
						
							2016-11-21 21:30:13 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc87243c39
								
							
						 | 
						
							
							
								
								First version for fr.yml
							
							
							
							
							
						 | 
						
							2016-11-21 21:25:27 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								05823c325c
								
							
						 | 
						
							
							
								
								Create devise.fr.yml
							
							
							
							
							
						 | 
						
							2016-11-21 20:59:41 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								753115ff57
								
							
						 | 
						
							
							
								
								Create doorkeeper.fr.yml
							
							
							
							
							
						 | 
						
							2016-11-21 20:59:13 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								8504110d45
								
							
						 | 
						
							
							
								
								Create simple_form.fr.yml
							
							
							
							
							
						 | 
						
							2016-11-21 20:58:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									nicolas
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9980a9b8b
								
							
						 | 
						
							
							
								
								Create fr.yml
							
							
							
							
							
						 | 
						
							2016-11-21 20:57:28 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								627a85f4e4
								
							
						 | 
						
							
							
								
								Better error message in doorkeeper json response
							
							
							
							
							
						 | 
						
							2016-11-21 16:19:35 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								f88ca4a206
								
							
						 | 
						
							
							
								
								Performance improvement for notifications API
							
							
							
							
							
						 | 
						
							2016-11-21 16:10:42 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								52119104b9
								
							
						 | 
						
							
							
								
								Remove some n+1 queries from notifications API
							
							
							
							
							
						 | 
						
							2016-11-21 15:16:04 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8c27767aa
								
							
						 | 
						
							
							
								
								Remove orphaned notifications, add scopes param to app create API
							
							
							
							
							
						 | 
						
							2016-11-21 14:59:13 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								954f344cf7
								
							
						 | 
						
							
							
								
								Merge branch 'victorhck-master'
							
							
							
							
							
						 | 
						
							2016-11-21 11:05:33 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								db58235930
								
							
						 | 
						
							
							
								
								Fixes for the Spanish translation
							
							
							
							
							
						 | 
						
							2016-11-21 11:05:11 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3665c1d67
								
							
						 | 
						
							
							
								
								Try to fix for browsers that don't support notifications
							
							
							
							
							
						 | 
						
							2016-11-21 10:59:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								c41dc5e8e9
								
							
						 | 
						
							
							
								
								Icon for desktop notifications
							
							
							
							
							
						 | 
						
							2016-11-21 10:55:49 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								d32e0364f9
								
							
						 | 
						
							
							
								
								Switch to compose route when replying and compose is not mounted
							
							
							
							
							
						 | 
						
							2016-11-21 10:52:11 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								93577f74e7
								
							
						 | 
						
							
							
								
								Use old rules for mention notifications as for mentions timeline
							
							
							
							
							
						 | 
						
							2016-11-21 10:37:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb48cc3b74
								
							
						 | 
						
							
							
								
								Desktop notifications
							
							
							
							
							
						 | 
						
							2016-11-21 10:24:50 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								e616ffc5d6
								
							
						 | 
						
							
							
								
								Fix responsive layout breakpoint, replace mentions column with notifications
							
							
							
							
							
						 | 
						
							2016-11-21 10:03:55 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								29b12f9e0a
								
							
						 | 
						
							
							
								
								Call NotifyService about remote reblogs
							
							
							
							
							
						 | 
						
							2016-11-21 09:56:01 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								38dd85daab
								
							
						 | 
						
							
							
								
								Adding notifications column
							
							
							
							
							
						 | 
						
							2016-11-20 19:39:58 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								da2ef4d676
								
							
						 | 
						
							
							
								
								Adding unified streamable notifications
							
							
							
							
							
						 | 
						
							2016-11-20 19:39:58 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									caesarologia
								
							 
						 | 
						
							
							
							
							
								
							
							
								3838e6836d
								
							
						 | 
						
							
							
								
								Portuguese translation (front-end)
							
							
							
							
							
						 | 
						
							2016-11-20 11:40:26 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Victorhck
								
							 
						 | 
						
							
							
							
							
								
							
							
								c12125e6b5
								
							
						 | 
						
							
							
								
								improvements in text made by Ekaitz
							
							
							
							
							
						 | 
						
							2016-11-20 00:52:06 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Victorhck
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b48973733
								
							
						 | 
						
							
							
								
								fix typos, and suggestions made by Ekaitz
							
							
							
							
							
						 | 
						
							2016-11-20 00:50:45 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								8977fde8ed
								
							
						 | 
						
							
							
								
								Fix up Spanish translations
							
							
							
							
							
						 | 
						
							2016-11-19 22:05:26 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									victorhck
								
							 
						 | 
						
							
							
							
							
								
							
							
								daf90377bd
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/victorhck/mastodon
							
							
							
							
							
						 | 
						
							2016-11-19 18:44:58 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									victorhck
								
							 
						 | 
						
							
							
							
							
								
							
							
								065f372bd1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2016-11-19 18:42:37 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Victorhck
								
							 
						 | 
						
							
							
							
							
								
							
							
								d68750d7dc
								
							
						 | 
						
							
							
								
								Finished spanish translation config files
							
							
							
							
							
						 | 
						
							2016-11-19 18:40:03 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								93e47c7135
								
							
						 | 
						
							
							
								
								Fix wrong language declaration
							
							
							
							
							
						 | 
						
							2016-11-19 18:31:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								5cda7f6bbb
								
							
						 | 
						
							
							
								
								Fix wrong language declaration
							
							
							
							
							
						 | 
						
							2016-11-19 18:31:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									victorhck
								
							 
						 | 
						
							
							
							
							
								
							
							
								a6ed09441c
								
							
						 | 
						
							
							
								
								finished spanish translation config files
							
							
							
							
							
						 | 
						
							2016-11-19 17:45:45 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								51dc725794
								
							
						 | 
						
							
							
								
								Graphic emoji in usernames in the "reblogged" string above status
							
							
							
							
							
						 | 
						
							2016-11-19 00:28:42 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								39533190c2
								
							
						 | 
						
							
							
								
								Display human names of locales in dropdown
							
							
							
							
							
						 | 
						
							2016-11-19 00:19:57 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7a1b78536
								
							
						 | 
						
							
							
								
								Activating Spanish i18n
							
							
							
							
							
						 | 
						
							2016-11-19 00:10:47 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac2403fb24
								
							
						 | 
						
							
							
								
								Add more Spanish i18n
							
							
							
							
							
						 | 
						
							2016-11-19 00:01:02 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Victorhck
								
							 
						 | 
						
							
							
							
							
								
							
							
								367b05d733
								
							
						 | 
						
							
							
								
								Spanish translation for devise.es.yml
							
							
							
							
							
						 | 
						
							2016-11-18 23:57:03 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								0293a7dd49
								
							
						 | 
						
							
							
								
								Updating some npm packages
							
							
							
							
							
						 | 
						
							2016-11-18 23:55:44 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								7dea6a23f7
								
							
						 | 
						
							
							
								
								Move Salmon processing to background as well as PuSH
							
							
							
							
							
						 | 
						
							2016-11-18 23:24:57 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c58e7e06a
								
							
						 | 
						
							
							
								
								Catch validation errors in ProcessFeedService so that one failing entry wouldn't stop others from going through
							
							
							
							
							
						 | 
						
							2016-11-18 23:19:38 +01:00 | 
						
						
							
							
							
							
								
							
							
						 |