| 
								
								
									 Maksim Pechnikov | f6c0e06884 | Merge branch 'develop' into feature/following_reblogs | 2019-10-09 08:15:37 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 792eaf5625 | fix! i noticed it!! | 2019-10-08 23:57:58 +03:00 |  | 
				
					
						| 
								
								
									 HJ | 7d3330b7b6 | Merge branch 'issue/679' into 'develop' [#679] fix follow request on search page
See merge request pleroma/pleroma-fe!970 | 2019-10-08 19:06:57 +00:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | fa4e69ec8c | eslint | 2019-10-08 21:38:27 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 81d86a39fe | fixed emoji picker showing up beyond viewport | 2019-10-08 21:38:27 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | bed109ae46 | start loading emoji when picker is open | 2019-10-08 21:38:27 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 37b8490c01 | remove the "textbox grows the 'wrong' way" behavior, replace it with more conditions to scroll to bottom | 2019-10-08 21:38:27 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 6511a744a2 | arbitrary limit with option to overcome it | 2019-10-08 21:38:27 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 29e6e62e7c | emoji picker gradual render | 2019-10-08 21:38:27 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 91ca1db778 | moved emoji stuff away from after-store and into users module since we only need emoji after login | 2019-10-08 21:38:27 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 7fede8572d | change icon | 2019-10-08 17:32:58 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 78e8a49f40 | fix follow request on search page | 2019-10-08 17:07:01 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 541a71c3a5 | Merge branch 'develop' into feature/following_reblogs | 2019-10-08 16:49:03 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | a26d550137 | updated user_card | 2019-10-08 16:46:54 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 9c305c5f93 | Revert "added acccount_actions component" This reverts commit 188b6f56ed. | 2019-10-08 10:21:40 +03:00 |  | 
				
					
						| 
								
								
									 tarteka | 16c03995cb | [i18n] spanish new strings translations update to translate the latest text strings | 2019-10-07 21:21:16 +02:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | d0800d0bd8 | removed unused thing | 2019-10-07 20:44:03 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | e7532464e3 | Replaced most trivial checkboxes with Checkbox component | 2019-10-07 20:43:23 +03:00 |  | 
				
					
						| 
								
								
									 Echedey López Romero | 97f9628bea | Little fix to "login"/"description" and "register" strings to es.json referenced as verbs. | 2019-10-07 12:34:38 +00:00 |  | 
				
					
						| 
								
								
									 tarteka | 67436ed144 | update and fix | 2019-10-07 10:22:17 +02:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 8ee50f9f16 | replace checkboxes in user-settings with Checkbox component | 2019-10-07 00:05:21 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 0be86304d2 | Fix tests, more replacing with mergedConfig | 2019-10-06 23:28:30 +03:00 |  | 
				
					
						| 
								
								
									 HJ | 122323f35c | Merge branch 'docs/add-links' into 'develop' Minor documentation improvements
See merge request pleroma/pleroma-fe!965 | 2019-10-04 14:30:29 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | c07bf59da7 | Move the epigraph after the heading so MkDocs can pick up the heading | 2019-10-04 17:24:36 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 2060dd8377 | Add links to directions in the beginning of CONFIGURATION.md | 2019-10-04 17:12:14 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | e82405ae35 | Merge branch 'docs-sync' into 'develop' CI: trigger doc rebuild on commits to develop
See merge request pleroma/pleroma-fe!964 | 2019-10-03 16:09:54 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 4b8c9a03f2 | CI: trigger doc rebuild on commits to develop | 2019-10-03 18:48:16 +03:00 |  | 
				
					
						| 
								
								
									 HJ | 84dbc86624 | Merge branch 'admin-link' into 'develop' Add Admin panel link to navigation for admins
See merge request pleroma/pleroma-fe!954 | 2019-10-02 20:12:44 +00:00 |  | 
				
					
						| 
								
								
									 taehoon | 33759e4153 | update admin url | 2019-10-02 13:28:16 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 7e5a3fa09f | update copy | 2019-10-01 07:36:42 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 503f086487 | add trailing slash to admin url | 2019-10-01 07:36:42 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | d9b01643e2 | open in a new tab | 2019-10-01 07:36:42 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 093fcee902 | add admin link to the side drawer | 2019-10-01 07:36:41 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 4f75ad9905 | add admin link to nav | 2019-10-01 07:36:41 -04:00 |  | 
				
					
						| 
								
								
									 taehoon | 57fedd63ca | add gauge icon | 2019-10-01 07:36:41 -04:00 |  | 
				
					
						| 
								
								
									 kaniini | f3fdc92f15 | Merge branch 'fix-regex-normalizer' into 'develop' fix regex shortcode problem
Closes #675
See merge request pleroma/pleroma-fe!963 | 2019-10-01 06:29:31 +00:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | a2923570c3 | fix regex shortcode problem | 2019-09-30 23:45:03 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 188b6f56ed | added acccount_actions component | 2019-09-30 20:36:14 +03:00 |  | 
				
					
						| 
								
								
									 Shpuld Shpludson | bcfdd68e70 | Merge branch 'i18n/update-ja_pedantic' into 'develop' i18n/Update Pedantic Japanese Messages
See merge request pleroma/pleroma-fe!962 | 2019-09-30 05:09:05 +00:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | 194979783e | i18n/Update Pedantic Japanese Messages | 2019-09-30 05:09:05 +00:00 |  | 
				
					
						| 
								
								
									 Shpuld Shpludson | b90137631f | Merge branch 'i18n/update-ja' into 'develop' i18n/Update Japanese Messages
See merge request pleroma/pleroma-fe!961 | 2019-09-30 05:07:57 +00:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | 087a5b612d | i18n/Update Japanese Messages | 2019-09-30 05:07:57 +00:00 |  | 
				
					
						| 
								
								
									 Shpuld Shpludson | 767b965780 | Merge branch '672' into 'develop' Make post status modal state persistent unless reply user is changed
Closes #672
See merge request pleroma/pleroma-fe!959 | 2019-09-30 05:05:12 +00:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 20fc259350 | fixed default values for multi-choice configurations, should also fix warnings | 2019-09-30 00:04:43 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 39b71e5dd6 | Removed all whole mess of manual watch/data declaration, now fully automatic | 2019-09-29 23:47:26 +03:00 |  | 
				
					
						| 
								
								
									 Henry Jameson | 979e170bd6 | created mergedConfig getter to avoid obnoxious checks for undefined everywhere | 2019-09-29 22:33:15 +03:00 |  | 
				
					
						| 
								
								
									 taehoon | 50d9ed0007 | reset post status form only when reply user is changed | 2019-09-28 16:35:39 -04:00 |  | 
				
					
						| 
								
								
									 kaniini | aadd36f3ec | Merge branch 'refactor-who-to-follow' into 'develop' Small refactoring in who to follow page
See merge request pleroma/pleroma-fe!932 | 2019-09-26 22:32:40 +00:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | bc17839e52 | Small refactoring in who to follow page | 2019-09-26 22:32:39 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 9ef0e65b25 | Merge branch 'feature/add-discoverable-preference' into 'develop' Feature/Add _Allow user discovery services_ preference
See merge request pleroma/pleroma-fe!947 | 2019-09-26 22:31:28 +00:00 |  |