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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								3153bb5b05
								
							
						 | 
						
							
							
								
								Also fix wrong color in user card
							
							
							
							
							
						 | 
						
							2018-04-14 10:24:39 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								96692454a0
								
							
						 | 
						
							
							
								
								change external link icon, move chat from side panel to floating, hide own bio, prevent body/app from scrolling horizontally.
							
							
							
							
							
						 | 
						
							2018-04-14 10:19:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								1db9b1e1ad
								
							
						 | 
						
							
							
								
								Fix long names in notifications too
							
							
							
							
							
						 | 
						
							2018-04-14 08:59:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								121f7424dc
								
							
						 | 
						
							
							
								
								Fix overflowing long maes in statuses and repeats.
							
							
							
							
							
						 | 
						
							2018-04-14 07:44:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab2546ab38
								
							
						 | 
						
							
							
								
								Fix timeline error not using correct styling while at it
							
							
							
							
							
						 | 
						
							2018-04-13 23:04:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0e7803e42
								
							
						 | 
						
							
							
								
								change timeline min/max id updating behavior to not get stuck with 20 wrong type of activities on fetch older.
							
							
							
							
							
						 | 
						
							2018-04-13 22:35:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								37212db5bb
								
							
						 | 
						
							
							
								
								Merge branch 'feature/update-russian-translation' into 'develop'
							
							
							
							
							
							
							
							Update Russian l10n
See merge request pleroma/pleroma-fe!232 
							
						 | 
						
							2018-04-13 15:33:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dtluna
								
							 
						 | 
						
							
							
							
							
								
							
							
								e168837f24
								
							
						 | 
						
							
							
								
								Update Russian l10n
							
							
							
							
							
						 | 
						
							2018-04-13 17:01:02 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dtluna
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7ec41d726
								
							
						 | 
						
							
							
								
								Update Russian l10n
							
							
							
							
							
						 | 
						
							2018-04-13 16:57:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								a30f90c768
								
							
						 | 
						
							
							
								
								Update polish translation (thanks, roka!)
							
							
							
							
							
						 | 
						
							2018-04-13 10:29:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								e446919784
								
							
						 | 
						
							
							
								
								Merge branch 'patch-3' into 'develop'
							
							
							
							
							
							
							
							[i18n] OC: new strings
See merge request pleroma/pleroma-fe!231 
							
						 | 
						
							2018-04-13 07:44:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Exilat
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2f478a769
								
							
						 | 
						
							
							
								
								[i18n] OC: new strings
							
							
							
							
							
						 | 
						
							2018-04-13 05:17:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc0fd8177c
								
							
						 | 
						
							
							
								
								Fix status preview loader having different offset from the actual stats preview
							
							
							
							
							
						 | 
						
							2018-04-12 20:03:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								8db70ffa85
								
							
						 | 
						
							
							
								
								Fix missing border radii and read button text color
							
							
							
							
							
						 | 
						
							2018-04-12 19:51:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ccbec217a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/update-de-translation' into 'develop'
							
							
							
							
							
							
							
							updated german translation
See merge request pleroma/pleroma-fe!230 
							
						 | 
						
							2018-04-12 15:48:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								de4664a2ac
								
							
						 | 
						
							
							
								
								Merge branch 'patch-2' into 'develop'
							
							
							
							
							
							
							
							[i18n] Update OC: colour settings.
See merge request pleroma/pleroma-fe!227 
							
						 | 
						
							2018-04-12 15:47:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								d49e211060
								
							
						 | 
						
							
							
								
								Merge branch 'ja-translation' into 'develop'
							
							
							
							
							
							
							
							Add missing Japanese translation and Update some Japanese translation
See merge request pleroma/pleroma-fe!228 
							
						 | 
						
							2018-04-12 15:47:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sebastian Huebner
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1e48a2a402
								
							
						 | 
						
							
							
								
								updated german translation
							
							
							
							
							
						 | 
						
							2018-04-12 17:40:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									imncls
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								168c3b04cf
								
							
						 | 
						
							
							
								
								Add missing Japanese translation and Update some Japanese translation
							
							
							
							
							
						 | 
						
							2018-04-12 23:43:43 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Exilat
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad0fd9f8f2
								
							
						 | 
						
							
							
								
								Update messages.js
							
							
							
							
							
						 | 
						
							2018-04-12 04:57:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Exilat
								
							 
						 | 
						
							
							
							
							
								
							
							
								e23f43cafc
								
							
						 | 
						
							
							
								
								[i18n] Update OC: colour settings.
							
							
							
							
							
							
							
							Update messages.js 
							
						 | 
						
							2018-04-12 04:56:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								974702efc6
								
							
						 | 
						
							
							
								
								aha, found another bug in oembed text
							
							
							
							
							
						 | 
						
							2018-04-11 19:47:03 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee883d0f88
								
							
						 | 
						
							
							
								
								Remove some commented lines and logs
							
							
							
							
							
						 | 
						
							2018-04-11 19:40:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shpuld
								
							 
						 | 
						
							
							
							
							
								
							
							
								a1f6ef1dca
								
							
						 | 
						
							
							
								
								Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein.
							
							
							
							
							
						 | 
						
							2018-04-11 19:34:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shpuld Shpludson
								
							 
						 | 
						
							
							
							
							
								
							
							
								82ee24ec31
								
							
						 | 
						
							
							
								
								Merge branch 'fix/autocomplete-case-insensitive' into 'develop'
							
							
							
							
							
							
							
							Make autocomplete case insensitive
Closes #73
See merge request pleroma/pleroma-fe!225 
							
						 | 
						
							2018-04-11 08:34:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								52d72599ee
								
							
						 | 
						
							
							
								
								Forgot to fix other tabs
							
							
							
							
							
						 | 
						
							2018-04-11 04:29:46 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								11a89ee06d
								
							
						 | 
						
							
							
								
								Replace tab indentation with spaces
							
							
							
							
							
						 | 
						
							2018-04-11 04:28:27 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Francis Dinh
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d8d941d89
								
							
						 | 
						
							
							
								
								Make autocomplete case insensitive
							
							
							
							
							
						 | 
						
							2018-04-11 04:23:13 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shpuld Shpludson
								
							 
						 | 
						
							
							
							
							
								
							
							
								748e01d3e9
								
							
						 | 
						
							
							
								
								Merge branch 'feature/chat-styling-and-hiding' into 'develop'
							
							
							
							
							
							
							
							Feature/chat styling and hiding
See merge request pleroma/pleroma-fe!224 
							
						 | 
						
							2018-04-11 03:37:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Shpuld Shpludson
								
							 
						 | 
						
							
							
							
							
								
							
							
								020d2f83f9
								
							
						 | 
						
							
							
								
								Merge branch 'feature/rewrite-status-and-notifications-and-preview' into 'develop'
							
							
							
							
							
							
							
							Rewrite status and notifications and preview, graceful handling of linkless attachments
See merge request pleroma/pleroma-fe!223 
							
						 | 
						
							2018-04-11 03:37:25 +00:00 | 
						
						
							
							
							
								
							
							
						 |