lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							68cb614db9
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into 'develop'
						
						
						
						
						
						
						
						Added a complete Esperanto translation.
See merge request pleroma/pleroma-fe!240 
						
						
					 | 
					
						2018-04-29 14:52:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							bff20a29b7
							
						
					 | 
					
						
						
							
							Merge branch 'nb' into 'develop'
						
						
						
						
						
						
						
						Add Norwegian localization
See merge request pleroma/pleroma-fe!241 
						
						
					 | 
					
						2018-04-29 14:52:01 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							805410b933
							
						
					 | 
					
						
						
							
							Merge branch 'feature/redirect-root-by-login-or-not' into 'develop'
						
						
						
						
						
						
						
						Redirect root by login ro not login
See merge request pleroma/pleroma-fe!251 
						
						
					 | 
					
						2018-04-29 14:51:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							462eeb90b9
							
						
					 | 
					
						
						
							
							Add message preset functionality.
						
						
						
						
						
						
					 | 
					
						2018-04-29 16:44:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hakaba Hitoyo
							
						 
					 | 
					
						
						
						
						
							
						
						
							150b815407
							
						
					 | 
					
						
						
							
							lint
						
						
						
						
						
						
					 | 
					
						2018-04-29 18:09:49 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hakaba Hitoyo
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1d1c7cfc4
							
						
					 | 
					
						
						
							
							lint
						
						
						
						
						
						
					 | 
					
						2018-04-29 18:07:40 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hakaba Hitoyo
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a6721ea56
							
						
					 | 
					
						
						
							
							redirect root by login or not
						
						
						
						
						
						
					 | 
					
						2018-04-29 17:55:23 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hakaba Hitoyo
							
						 
					 | 
					
						
						
						
						
							
						
						
							df486e18c2
							
						
					 | 
					
						
						
							
							add redirectRootNoLogin and redirectRootLogin configuration
						
						
						
						
						
						
					 | 
					
						2018-04-29 17:31:47 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ffb17c0ae
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading
						
						
						
						
						
						
					 | 
					
						2018-04-27 09:59:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							38653e1ea0
							
						
					 | 
					
						
						
							
							Fix specs.
						
						
						
						
						
						
					 | 
					
						2018-04-26 20:30:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RX14
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							099a37483e
							
						
					 | 
					
						
						
							
							Add favicon to pleroma-fe
						
						
						
						
						
						
					 | 
					
						2018-04-26 19:13:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							d003dea5ee
							
						
					 | 
					
						
						
							
							Merge branch 'feature/collapse-chat-by-default' into 'develop'
						
						
						
						
						
						
						
						Collapse chat by default
See merge request pleroma/pleroma-fe!246 
						
						
					 | 
					
						2018-04-24 08:01:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hakaba Hitoyo
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb92798b74
							
						
					 | 
					
						
						
							
							Collapse chat by default
						
						
						
						
						
						
					 | 
					
						2018-04-24 07:48:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							935b7745ea
							
						
					 | 
					
						
						
							
							Fix nsfw in notifications again.
						
						
						
						
						
						
					 | 
					
						2018-04-23 19:22:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							39026f8bc3
							
						
					 | 
					
						
						
							
							Fix repeat nsfw hiding.
						
						
						
						
						
						
					 | 
					
						2018-04-23 19:07:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							9557ec59a8
							
						
					 | 
					
						
						
							
							Update timeline.js
						
						
						
						
						
						
					 | 
					
						2018-04-22 20:16:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								csaurus
							
						 
					 | 
					
						
						
						
						
							
						
						
							59f98aecd9
							
						
					 | 
					
						
						
							
							Stop blink from loading more statuses with every scroll.
						
						
						
						
						
						
					 | 
					
						2018-04-22 16:12:34 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								William Pitcock
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4ee222e3c
							
						
					 | 
					
						
						
							
							make nsfw censor image configurable
						
						
						
						
						
						
					 | 
					
						2018-04-22 09:10:10 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hakaba Hitoyo
							
						 
					 | 
					
						
						
						
						
							
						
						
							033170212f
							
						
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2018-04-22 00:48:06 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								morguldir
							
						 
					 | 
					
						
						
						
						
							
						
						
							741cd8cb67
							
						
					 | 
					
						
						
							
							Add Norwegian localization
						
						
						
						
						
						
					 | 
					
						2018-04-21 02:19:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tirifto
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcf07253bc
							
						
					 | 
					
						
						
							
							Added Esperanto to the list of language codes.
						
						
						
						
						
						
					 | 
					
						2018-04-21 01:24:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tirifto
							
						 
					 | 
					
						
						
						
						
							
						
						
							acf96f207d
							
						
					 | 
					
						
						
							
							Added a complete Esperanto translation.
						
						
						
						
						
						
					 | 
					
						2018-04-21 01:03:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6eb1b1d98
							
						
					 | 
					
						
						
							
							Merge branch 'patch-4' into 'develop'
						
						
						
						
						
						
						
						Small Update messages.js [OC]
See merge request pleroma/pleroma-fe!239 
						
						
					 | 
					
						2018-04-19 05:28:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Exilat
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef4e052ede
							
						
					 | 
					
						
						
							
							Small Update messages.js [OC]
						
						
						
						
						
						
					 | 
					
						2018-04-19 04:57:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb240a3e95
							
						
					 | 
					
						
						
							
							Merge branch 'patch-5' into 'develop'
						
						
						
						
						
						
						
						Translated the latest update to french
See merge request pleroma/pleroma-fe!237 
						
						
					 | 
					
						2018-04-17 16:52:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbe6327615
							
						
					 | 
					
						
						
							
							Merge branch 'fix/follow-import-typo' into 'develop'
						
						
						
						
						
						
						
						Fix follow import typo.
See merge request pleroma/pleroma-fe!238 
						
						
					 | 
					
						2018-04-17 15:16:40 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eal
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ad837f506
							
						
					 | 
					
						
						
							
							Fix follow import typo.
						
						
						
						
						
						
					 | 
					
						2018-04-17 15:03:10 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c90a24133
							
						
					 | 
					
						
						
							
							Merge branch 'fix/no-nsfw-in-repeats' into develop
						
						
						
						
						
						
					 | 
					
						2018-04-16 18:24:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							573f01650b
							
						
					 | 
					
						
						
							
							Copy parent status nsfw into retweeted_status
						
						
						
						
						
						
					 | 
					
						2018-04-16 18:19:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce0b551c59
							
						
					 | 
					
						
						
							
							some ugly hack to prevent the jump in form height when you input first character
						
						
						
						
						
						
					 | 
					
						2018-04-16 17:52:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Azurolu
							
						 
					 | 
					
						
						
						
						
							
						
						
							58ae14f184
							
						
					 | 
					
						
						
							
							Update messages.js
						
						
						
						
						
						
					 | 
					
						2018-04-15 20:44:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Azurolu
							
						 
					 | 
					
						
						
						
						
							
						
						
							0dd81f1904
							
						
					 | 
					
						
						
							
							Update messages.js
						
						
						
						
						
						
					 | 
					
						2018-04-15 20:42:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Azurolu
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9891354df
							
						
					 | 
					
						
						
							
							Translated the latest update to french
						
						
						
						
						
						
					 | 
					
						2018-04-15 18:42:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							5bc7ecdb3b
							
						
					 | 
					
						
						
							
							Merge branch 'patch-4' into 'develop'
						
						
						
						
						
						
						
						French translation updated
See merge request pleroma/pleroma-fe!236 
						
						
					 | 
					
						2018-04-15 18:17:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Azurolu
							
						 
					 | 
					
						
						
						
						
							
						
						
							13d9f12cf3
							
						
					 | 
					
						
						
							
							Update messages.js
						
						
						
						
						
						
					 | 
					
						2018-04-15 18:14:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a7ed79fd3
							
						
					 | 
					
						
						
							
							Merge branch 'fix/additionalInputboxHeightUpdates' into 'develop'
						
						
						
						
						
						
						
						Fix/additional inputbox height updates
See merge request pleroma/pleroma-fe!235 
						
						
					 | 
					
						2018-04-15 17:33:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Jameson
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9e37a034c
							
						
					 | 
					
						
						
							
							fml
						
						
						
						
						
						
					 | 
					
						2018-04-15 20:30:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Jameson
							
						 
					 | 
					
						
						
						
						
							
						
						
							e1dce2c5af
							
						
					 | 
					
						
						
							
							better approach
						
						
						
						
						
						
					 | 
					
						2018-04-15 19:05:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Jameson
							
						 
					 | 
					
						
						
						
						
							
						
						
							600b2d5bbd
							
						
					 | 
					
						
						
							
							Added resizing inputbox on focus so that replying to The Discourse™ is less painful
						
						
						
						
						
						
					 | 
					
						2018-04-15 18:38:10 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ef2385d14
							
						
					 | 
					
						
						
							
							Merge branch 'patch-3' into 'develop'
						
						
						
						
						
						
						
						Update messages.js: Added "streaming" french translation and corrected typo.
See merge request pleroma/pleroma-fe!221 
						
						
					 | 
					
						2018-04-15 05:12:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							208b2ed125
							
						
					 | 
					
						
						
							
							Additional check to make console shut up
						
						
						
						
						
						
					 | 
					
						2018-04-15 00:06:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							e88bb1a23e
							
						
					 | 
					
						
						
							
							I broke timelines again, fixed now again (hopefully).
						
						
						
						
						
						
					 | 
					
						2018-04-14 22:13:28 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							3488141fdd
							
						
					 | 
					
						
						
							
							Whoops, broke older statuses accidentally
						
						
						
						
						
						
					 | 
					
						2018-04-14 17:18:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb7a5af303
							
						
					 | 
					
						
						
							
							Merge branch 'fix/add-back-timeline-id-overlap' into develop
						
						
						
						
						
						
					 | 
					
						2018-04-14 16:40:28 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							dff27357d4
							
						
					 | 
					
						
						
							
							remove +1/-1 from min/max id checking
						
						
						
						
						
						
					 | 
					
						2018-04-14 16:33:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa8fa2d330
							
						
					 | 
					
						
						
							
							Force oembeds to use 100% width
						
						
						
						
						
						
					 | 
					
						2018-04-14 15:45:38 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3bea8dfd1
							
						
					 | 
					
						
						
							
							Fix rt heading alignment again
						
						
						
						
						
						
					 | 
					
						2018-04-14 14:28:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a2bd28f53
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into fix/status-heading-alignment-issues
						
						
						
						
						
						
					 | 
					
						2018-04-14 14:26:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							424e9166d9
							
						
					 | 
					
						
						
							
							Fix alignment issues in status heading and repeat info
						
						
						
						
						
						
					 | 
					
						2018-04-14 14:24:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							9587c6dac1
							
						
					 | 
					
						
						
							
							Merge branch 'fix/better-timeline-min-max-id-behavior' into 'develop'
						
						
						
						
						
						
						
						Fix/better timeline min max id behavior
See merge request pleroma/pleroma-fe!233 
						
						
					 | 
					
						2018-04-14 09:52:54 +00:00 | 
					
					
						
						
							
							
							
						
					 |