Commit Graph

  • 2e7bd99444 Merge remote-tracking branch 'origin/develop' into websocket-fixes Henry Jameson 2021-03-08 22:01:28 +0200
  • 3d95ea6acb cleanup + fix Henry Jameson 2021-03-08 21:56:20 +0200
  • fada49768d extra protection to not write what we don't know Henry Jameson 2021-03-08 21:14:03 +0200
  • 914b4eb593 lint Henry Jameson 2021-03-08 21:03:55 +0200
  • 395e12cbc6 better error/warnings Henry Jameson 2021-03-08 21:00:43 +0200
  • dda95543e8 implemented import/export for themes Henry Jameson 2021-03-08 19:53:30 +0200
  • bd5b62b107 changed importexport into a service instead of component for simplicity Henry Jameson 2021-03-08 19:42:24 +0200
  • 4baa397ed0 fixed another problem with p's broken theme causing theme editor to become unusable Henry Jameson 2021-03-08 19:19:16 +0200
  • 8a590f9269 Cleaned up panel-footer. No longer uses header styles since those look and work ugly. Henry Jameson 2021-03-08 19:18:43 +0200
  • 6281241b92 Merge branch 'feat/user-highlight-localizable' into 'develop' Shpuld Shpludson 2021-03-04 20:02:57 +0000
  • c14c144cc8 Apply 1 suggestion(s) to 1 file(s) rinpatch 2021-03-04 19:46:03 +0000
  • b4f5df9ce5 Make it possible to localize user highlight options rinpatch 2021-03-04 22:24:17 +0300
  • fb183adc74 Merge branch 'fix/shoutbox-fixes' into 'develop' Shpuld Shpludson 2021-03-03 15:07:10 +0000
  • becacf0643 remove shoutbox test hacks Shpuld Shpuldson 2021-03-03 16:47:59 +0200
  • 0673511fc2 fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack Shpuld Shpuldson 2021-03-03 16:46:53 +0200
  • d1bffd7659 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop sadposter 2021-03-03 13:51:57 +0000
  • 30057a4944 Merge branch 'chore/update-changelog' into 'develop' Shpuld Shpludson 2021-03-02 08:03:59 +0000
  • d1ab424ebc update changelog with 2.3.0 Shpuld Shpuldson 2021-03-02 09:53:17 +0200
  • c3fcbbd918 Merge branch 'rc/2.3.0' into 'master' 2.3.0 Shpuld Shpludson 2021-03-01 18:15:46 +0000
  • 0ac34b3014 Merge branch 'master' into 'rc/2.3.0' Shpuld Shpludson 2021-03-01 18:06:55 +0000
  • 06cde8ad06 fix changelog entries in wrong places Shpuld Shpuldson 2021-03-01 20:04:27 +0200
  • 434f9cdd7e changelog date Shpuld Shpuldson 2021-03-01 19:59:57 +0200
  • ae159f6ad8 ui never refers to them as likes Shpuld Shpuldson 2021-03-01 16:30:10 +0200
  • 11a036d6d6 changelog Shpuld Shpuldson 2021-03-01 16:27:24 +0200
  • f6af4c43f6 add quick filters for notifications2 Shpuld Shpuldson 2021-03-01 16:21:35 +0200
  • 6d7b5b157b Merge branch 'feat/timeline-quick-settings' into 'develop' Shpuld Shpludson 2021-03-01 12:12:12 +0000
  • fc5483f764 change icons around Shpuld Shpuldson 2021-03-01 10:14:17 +0200
  • 35cde98d2c Merge branch 'fix/punycode-buggy' into rc/2.3.0 Shpuld Shpuldson 2021-03-01 09:27:19 +0200
  • a90910be8f Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' HJ 2021-03-01 00:10:45 +0000
  • 846e58c3d2 Translated using Weblate (Japanese) Ryo Ueno 2021-02-27 23:07:22 +0000
  • 91f93d4a55 Merge branch 'develop' into 'feat/timeline-quick-settings' Shpuld Shpludson 2021-02-28 15:37:39 +0000
  • 670abd633f Update timeline_quick_settings.js Shpuld Shpludson 2021-02-28 15:36:51 +0000
  • b4782ad159 Merge branch 'feat/sensitive-by-default' into 'develop' Shpuld Shpludson 2021-02-27 18:31:13 +0000
  • 92a9ce67c5 Update CHANGELOG.md Shpuld Shpludson 2021-02-27 18:23:11 +0000
  • aa5cb3d1d2 Merge branch 'fix/punycode-buggy' into 'develop' Shpuld Shpludson 2021-02-27 18:12:52 +0000
  • 237f272d15 Merge branch 'develop' into 'fix/punycode-buggy' Shpuld Shpludson 2021-02-27 18:03:49 +0000
  • a83fdbbd59 Merge branch 'fix/dont-crash-on-invalid-notificaiton' into 'develop' Shpuld Shpludson 2021-02-27 16:57:46 +0000
  • 49aa10e1c0 add screen_name_ui to tests Shpuld Shpuldson 2021-02-26 16:37:46 +0200
  • 09fe160e8b separate screen_name and screen_name_ui with decoded punycode Shpuld Shpuldson 2021-02-26 16:23:11 +0200
  • 7c37f495f6 Update CHANGELOG.md Shpuld Shpludson 2021-02-26 12:36:58 +0000
  • cd2f5ced31 add basic validation for statusless status notifications Shpuld Shpuldson 2021-02-26 14:27:25 +0200
  • 59db4582b0 Merge branch 'feat/focus-input-with-emoji-pickers' into 'develop' Shpuld Shpludson 2021-02-26 11:13:33 +0000
  • 44e687653c set changelog version Shpuld Shpuldson 2021-02-26 13:01:09 +0200
  • 20b755d57e Merge branch 'fix-build-warnings' into 'develop' HJ 2021-02-26 10:16:21 +0000
  • a7a69d08a7 Merge branch 'fix/chat-unread-badge' into 'develop' HJ 2021-02-26 10:15:09 +0000
  • 2e7529cf50 changelog mention Shpuld Shpuldson 2021-02-26 11:03:26 +0200
  • 6fefa5a9c5 fix chat unread badge Shpuld Shpuldson 2021-02-26 11:00:21 +0200
  • cef6ecb916 update shelljs to get rid of warnings on build Shpuld Shpuldson 2021-02-26 10:30:30 +0200
  • acc08932cd save a few characters Shpuld Shpuldson 2021-02-25 17:32:54 +0200
  • 74caf42ed7 Merge branch 'develop' into feat/focus-input-with-emoji-pickers Shpuld Shpuldson 2021-02-25 17:31:36 +0200
  • 34d18ac0c4 focus input in emoji picker and react picker Shpuld Shpuldson 2021-02-25 17:27:29 +0200
  • dd9e18fd34 Merge branch 'fix-vue-warnings-again' into 'develop' Shpuld Shpludson 2021-02-25 12:43:22 +0000
  • 59aaade7fc fix vue warnings Shpuld Shpuldson 2021-02-25 14:32:21 +0200
  • 096747a5dc add only to wording Shpuld Shpuldson 2021-02-25 11:12:51 +0200
  • 93785634a7 basic loggedin check for reply filtering Shpuld Shpuldson 2021-02-25 11:01:11 +0200
  • 51a78e8b8a add a quick settings menu for timeline headers Shpuld Shpuldson 2021-02-25 10:56:16 +0200
  • ecb211606c change config comment to be consistent Shpuld Shpuldson 2021-02-23 10:06:45 +0200
  • 29dae3c12e update changelog Shpuld Shpuldson 2021-02-23 10:03:29 +0200
  • 3f23aecd10 add sensitive by default option Shpuld Shpuldson 2021-02-23 10:00:23 +0200
  • 5faca01261 Merge branch 'fix/redline-final-v2' into 'develop' HJ 2021-02-22 18:53:26 +0000
  • 485f4b899c changelog conflict Shpuld Shpuldson 2021-02-22 18:11:27 +0200
  • e14b9ddc02 changelog conflict fix Shpuld Shpuldson 2021-02-22 18:00:02 +0200
  • 3d013630ae Merge branch 'fix/scroll-lock-jumpiness' into 'develop' Shpuld Shpludson 2021-02-22 15:14:23 +0000
  • 589ab6510c Merge branch 'feat/keep-chat-perf-up' into 'develop' Shpuld Shpludson 2021-02-22 15:01:05 +0000
  • e8b8c3cc49 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' Shpuld Shpludson 2021-02-22 15:00:47 +0000
  • 2f60c6a821 fix redline again Shpuld Shpuldson 2021-02-22 16:44:12 +0200
  • 98cb9abac7 Add timeline menu toggle to nav panel Shpuld Shpuldson 2021-02-22 16:24:04 +0200
  • 5ddfc787ed Translated using Weblate (Chinese (Simplified)) Kana 2021-02-21 03:44:53 +0000
  • 226ec1c5be Translated using Weblate (Korean) Ryo Ueno 2021-02-21 02:54:02 +0000
  • 3983ea79cd Translated using Weblate (Korean) Ryo Ueno 2021-02-20 23:29:55 +0000
  • 20997d6cfc Translated using Weblate (Japanese) Ryo Ueno 2021-02-20 23:26:19 +0000
  • d5f191db38 Translated using Weblate (Italian) Ben Is 2021-02-20 22:47:05 +0000
  • d0b1a68f86 Translated using Weblate (Esperanto) Tirifto 2021-02-20 16:01:20 +0000
  • a89710452a Merge branch 'feat/reason-in-registration' into 'develop' Shpuld Shpludson 2021-02-20 20:37:12 +0000
  • 663362db56 Merge branch 'fix/poll-type-text-overflow' into 'develop' HJ 2021-02-20 19:29:02 +0000
  • a7f055a875 Merge branch 'weblate-pleroma-pleroma-fe' into 'develop' HJ 2021-02-20 19:27:51 +0000
  • 7ed1fe70d1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop sadposter 2021-02-20 15:29:27 +0000
  • 67f3532ac9 add additional check with timeout Shpuld Shpuldson 2021-02-18 10:14:45 +0200
  • ee1cf36d52 update changelog Shpuld Shpuldson 2021-02-17 10:54:14 +0200
  • 7834ff52b1 add test Shpuld Shpuldson 2021-02-17 10:53:38 +0200
  • 47770ed715 get rid of older messages when scrolling down in chat to keep it from bloating dom Shpuld Shpuldson 2021-02-17 10:16:58 +0200
  • e720d4dd8a Translated using Weblate (Chinese (Simplified)) Kana 2021-02-15 08:57:25 +0000
  • aa240f935f Merge branch 'chore/mailmap' into 'develop' rinpatch 2021-02-15 10:25:57 +0000
  • 265bb2cd41 Add myself to .mailmap rinpatch 2021-02-15 13:17:52 +0300
  • 23a5c601a7 changelog Shpuld Shpuldson 2021-02-15 11:35:14 +0200
  • b4580d086f Merge branch 'develop' into feat/reason-in-registration Shpuld Shpuldson 2021-02-15 11:10:38 +0200
  • a636e53404 add reason field when approval is required Shpuld Shpuldson 2021-02-15 11:10:09 +0200
  • 2f8d4c7406 Merge branch 'fix/weblate-conflicts' into 'develop' HJ 2021-02-15 08:33:58 +0000
  • 3d25946bbf Merge Weblate updates rinpatch 2021-02-15 11:25:03 +0300
  • c3b267f2b9 add padding to poll type to not have arrow icon overlap text Shpuld Shpuldson 2021-02-15 08:30:41 +0200
  • 44bddf6cd2 Merge branch 'fix/usercard-use-general-roles' into 'develop' Shpuld Shpludson 2021-02-15 06:20:55 +0000
  • 7e11093fcd Translated using Weblate (Japanese) Ryo Ueno 2021-02-13 22:33:33 +0000
  • cba48476ad Translated using Weblate (Italian) Ben Is 2021-02-13 22:46:59 +0000
  • 033b7eaeb9 Translated using Weblate (Russian) rinpatch 2021-02-13 12:35:35 +0000
  • 6acf812101 User card: use general.role instead of card-specific roles rinpatch 2021-02-13 16:34:43 +0300
  • 376d431681 Translated using Weblate (Italian) Ben Is 2021-02-12 08:23:47 +0000
  • 0dc6937bf8 Translated using Weblate (Korean) Ryo Ueno 2021-02-10 02:29:27 +0000
  • a848462f19 Translated using Weblate (Japanese) Anonymous 2021-02-09 04:19:33 +0000
  • cccdda3a7b Translated using Weblate (Japanese) Ryo Ueno 2021-02-09 04:15:08 +0000
  • e85fa160c7 Translated using Weblate (Japanese) Anonymous 2021-02-09 01:53:24 +0000