shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d5782b51f
							
						
					 | 
					
						
						
							
							Fix conflict
						
						
						
						
						
						
					 | 
					
						2017-11-08 12:55:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							83297aba15
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into 'develop'
						
						
						
						
						
						
						
						Add Estonian translation
See merge request pleroma/pleroma-fe!134 
						
						
					 | 
					
						2017-11-08 10:54:08 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								obrez
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7b2d76347
							
						
					 | 
					
						
						
							
							Add Estonian translation
						
						
						
						
						
						
					 | 
					
						2017-11-08 12:44:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							37f5e0d8b6
							
						
					 | 
					
						
						
							
							Merge branch 'fix/polish-user-finder-and-nav-buttons' into 'develop'
						
						
						
						
						
						
						
						Fix/polish user finder and nav buttons
See merge request pleroma/pleroma-fe!132 
						
						
					 | 
					
						2017-11-08 10:44:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							191bbe76a8
							
						
					 | 
					
						
						
							
							Add a bunch of missed localization strings, update english and finnish to match.
						
						
						
						
						
						
					 | 
					
						2017-11-08 12:34:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							176421163b
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/polish-user-finder-and-nav-buttons
						
						
						
						
						
						
					 | 
					
						2017-11-08 11:27:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shpuld
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfa04bfb11
							
						
					 | 
					
						
						
							
							Hide overflowing elements when userfinder is active. Don't scroll on button presses. Make buttons slightly bigger and more spaced out.
						
						
						
						
						
						
					 | 
					
						2017-11-08 11:26:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dca57cc05
							
						
					 | 
					
						
						
							
							Add Polish translation.
						
						
						
						
						
						
						
						Thanks, Roka! 
						
						
					 | 
					
						2017-11-08 09:57:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							62a3c63082
							
						
					 | 
					
						
						
							
							Unify statuses/notices.
						
						
						
						
						
						
					 | 
					
						2017-11-08 09:31:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3895e667d9
							
						
					 | 
					
						
						
							
							Merge branch 'tibike/pleroma-fe-hu-translation' into develop
						
						
						
						
						
						
					 | 
					
						2017-11-08 09:14:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							cadd42c1b2
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into tibike/pleroma-fe-hu-translation
						
						
						
						
						
						
					 | 
					
						2017-11-08 09:13:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							c65974c8c8
							
						
					 | 
					
						
						
							
							Fix typo.
						
						
						
						
						
						
					 | 
					
						2017-11-08 09:12:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							483fef731a
							
						
					 | 
					
						
						
							
							Fix typo.
						
						
						
						
						
						
					 | 
					
						2017-11-08 09:10:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							32cb5e1a48
							
						
					 | 
					
						
						
							
							Add italian translation.
						
						
						
						
						
						
						
						Thank, Eidon! 
						
						
					 | 
					
						2017-11-08 09:09:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							38bd0dbfcd
							
						
					 | 
					
						
						
							
							Add french translation.
						
						
						
						
						
						
						
						Thanks, azu! 
						
						
					 | 
					
						2017-11-08 09:05:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdbcf569f8
							
						
					 | 
					
						
						
							
							Merge branch 'feature/blocks' into 'develop'
						
						
						
						
						
						
						
						Add blocks.
See merge request pleroma/pleroma-fe!130 
						
						
					 | 
					
						2017-11-08 07:02:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tibike
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6c89a9c09
							
						
					 | 
					
						
						
							
							Added Hungarian translation
						
						
						
						
						
						
					 | 
					
						2017-11-08 02:14:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eal
							
						 
					 | 
					
						
						
						
						
							
						
						
							608d1e6776
							
						
					 | 
					
						
						
							
							Add blocks.
						
						
						
						
						
						
					 | 
					
						2017-11-07 22:38:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ab7ac7be6
							
						
					 | 
					
						
						
							
							Merge branch 'feature/ger-translation' into 'develop'
						
						
						
						
						
						
						
						Add DE translation
See merge request pleroma/pleroma-fe!128 
						
						
					 | 
					
						2017-11-07 17:50:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cf972b348
							
						
					 | 
					
						
						
							
							Update ja translation.
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:44:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Huebner
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							0320f03cd2
							
						
					 | 
					
						
						
							
							make linter happy
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:43:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Huebner
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b281303b5
							
						
					 | 
					
						
						
							
							Merge branch 'feature/ger-translation' of git.pleroma.social:pleroma/pleroma-fe into feature/ger-translation
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:38:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Huebner
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a3118d1a7
							
						
					 | 
					
						
						
							
							added ger translation
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:37:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							33ad62bf72
							
						
					 | 
					
						
						
							
							Japanese is ja.
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:34:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Huebner
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							708a338855
							
						
					 | 
					
						
						
							
							rebase
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:33:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Huebner
							
						 
					 | 
					
						
						
						
						
							
						
						
							df895b0510
							
						
					 | 
					
						
						
							
							added ger translation
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:26:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Huebner
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4d4282a759
							
						
					 | 
					
						
						
							
							added ger translation
						
						
						
						
						
						
					 | 
					
						2017-11-07 18:22:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							71395ebca2
							
						
					 | 
					
						
						
							
							Add japanese translation.
						
						
						
						
						
						
						
						Thanks, https://knzk.me/@imncls! 
						
						
					 | 
					
						2017-11-07 18:20:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							2354255615
							
						
					 | 
					
						
						
							
							Merge branch 'feature/fi-language' into 'develop'
						
						
						
						
						
						
						
						Add fi to localization.
See merge request pleroma/pleroma-fe!127 
						
						
					 | 
					
						2017-11-07 16:58:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							f89f120c44
							
						
					 | 
					
						
						
							
							Add fi to localization.
						
						
						
						
						
						
					 | 
					
						2017-11-07 16:55:08 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed18d44e19
							
						
					 | 
					
						
						
							
							update readme
						
						
						
						
						
						
					 | 
					
						2017-11-07 17:12:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fb83502f0
							
						
					 | 
					
						
						
							
							Add translation to readme.
						
						
						
						
						
						
					 | 
					
						2017-11-07 15:42:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							74b513122e
							
						
					 | 
					
						
						
							
							Set locale from browser settings.
						
						
						
						
						
						
					 | 
					
						2017-11-07 15:23:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roger Braun
							
						 
					 | 
					
						
						
						
						
							
						
						
							7516cd859f
							
						
					 | 
					
						
						
							
							Prepare for i18n.
						
						
						
						
						
						
					 | 
					
						2017-11-07 15:14:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							81b0849889
							
						
					 | 
					
						
						
							
							Merge branch 'fix/friendica-html' into 'develop'
						
						
						
						
						
						
						
						Fix issue #33
Closes #33
See merge request pleroma/pleroma-fe!126 
						
						
					 | 
					
						2017-11-07 10:33:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpuldson
							
						 
					 | 
					
						
						
						
						
							
						
						
							acde0b316c
							
						
					 | 
					
						
						
							
							Changes inside status html: restrict image/video sizes, make blockquotes waste less space.
						
						
						
						
						
						
					 | 
					
						2017-11-07 12:22:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							e74e725750
							
						
					 | 
					
						
						
							
							Merge branch 'fix/authenticated-remote-profile-fetching' into 'develop'
						
						
						
						
						
						
						
						Send credentials when fetching remote profile.
See merge request pleroma/pleroma-fe!125 
						
						
					 | 
					
						2017-11-06 22:37:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eal
							
						 
					 | 
					
						
						
						
						
							
						
						
							784eb8426c
							
						
					 | 
					
						
						
							
							Send credentials when fetching remote profile.
						
						
						
						
						
						
					 | 
					
						2017-11-07 00:20:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fedcab988
							
						
					 | 
					
						
						
							
							Merge branch 'fix/update-readme-new-repo' into 'develop'
						
						
						
						
						
						
						
						Update README.md
See merge request pleroma/pleroma-fe!124 
						
						
					 | 
					
						2017-11-06 13:27:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpludson
							
						 
					 | 
					
						
						
						
						
							
						
						
							9eaf7087a3
							
						
					 | 
					
						
						
							
							Update dual boot link in README.md for new repo
						
						
						
						
						
						
					 | 
					
						2017-11-02 15:26:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb8b625d9a
							
						
					 | 
					
						
						
							
							Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop'
						
						
						
						
						
						
						
						Stop inappropriate auto fetching on scroll
See merge request pleroma/pleroma-fe!123 
						
						
					 | 
					
						2017-11-02 14:59:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							302c46741d
							
						
					 | 
					
						
						
							
							Merge branch 'fix/disable-select-on-icons' into 'develop'
						
						
						
						
						
						
						
						Disable text selection on icons and buttons
See merge request pleroma/pleroma-fe!122 
						
						
					 | 
					
						2017-11-02 14:49:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpuldson
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfb1b3f10b
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/stop-inappropriate-scroll-auto-fetch
						
						
						
						
						
						
					 | 
					
						2017-11-02 16:48:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpuldson
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cba955fca
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/disable-select-on-icons
						
						
						
						
						
						
					 | 
					
						2017-11-02 16:41:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpuldson
							
						 
					 | 
					
						
						
						
						
							
						
						
							f897c656fc
							
						
					 | 
					
						
						
							
							Also disable select on buttons
						
						
						
						
						
						
					 | 
					
						2017-11-02 16:27:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpuldson
							
						 
					 | 
					
						
						
						
						
							
						
						
							10bc83018c
							
						
					 | 
					
						
						
							
							Deregister scroll listener properly, only fetch more if timeline is visible.
						
						
						
						
						
						
					 | 
					
						2017-11-02 16:26:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e611f4039
							
						
					 | 
					
						
						
							
							Update .gitlab-ci.yml
						
						
						
						
						
						
					 | 
					
						2017-11-02 14:20:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shpuld Shpuldson
							
						 
					 | 
					
						
						
						
						
							
						
						
							226f435a17
							
						
					 | 
					
						
						
							
							Add user-select: none to i elements.
						
						
						
						
						
						
					 | 
					
						2017-11-02 11:27:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lambadalambda
							
						 
					 | 
					
						
						
						
						
							
						
						
							63473964f8
							
						
					 | 
					
						
						
							
							Merge branch 'feature/emoji-completion' into 'develop'
						
						
						
						
						
						
						
						Add emoji completion
See merge request lambadalambda/pleroma-fe!122 
						
						
					 | 
					
						2017-10-25 10:00:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eal
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba9b04a8ba
							
						
					 | 
					
						
						
							
							Use the API endpoint for emoji completion.
						
						
						
						
						
						
					 | 
					
						2017-10-19 23:39:21 +03:00 | 
					
					
						
						
							
							
							
						
					 |