Commit graph

Select branches

Hide pull requests

develop

main

merge/filtering

patches/emoji-reactions-main

stable/4.3

4.0.1+1.0.0

4.0.1+1.0.1

4.0.1+1.0.2

4.0.1+1.0.3

4.0.1+1.0.4

v3.5.3+1.0.0

v3.5.3+1.0.1

v3.5.3+1.0.3

v3.5.3+1.0.4

v3.5.3+1.0.5

v3.5.3+1.0.6

v3.5.3+1.0.7

v3.5.3+1.0.8

v3.5.3+1.0.9

v3.5.3+1.1.0

v3.5.3+1.1.1

v3.5.3+1.1.2

v3.5.3+1.1.3

v3.5.3+1.1.4

v3.5.3+1.1.5

v3.5.3+1.1.6

v3.5.3+1.2.1

v3.5.3+1.2.2

v3.5.3+1.2.3

v4.0.0+1.0.0

v4.0.2+1.0.0

v4.0.2+1.0.1

v4.0.2+1.0.10

v4.0.2+1.0.11

v4.0.2+1.0.12

v4.0.2+1.0.13

v4.0.2+1.0.2

v4.0.2+1.0.3

v4.0.2+1.0.4

v4.0.2+1.0.5

v4.0.2+1.0.6

v4.0.2+1.0.7

v4.0.2+1.0.8

v4.0.2+1.0.9

v4.0.2+1.1.0

v4.0.2+1.1.1

v4.0.2+1.1.2

v4.0.2+1.1.3

v4.0.2+1.1.4

v4.0.2+1.1.5

v4.0.2+1.1.6

v4.0.2+1.1.7

v4.0.2+1.1.8

v4.0.2+1.1.9

v4.1.0+1.0.0

v4.1.0+1.0.1

v4.1.0+2.0.0

v4.1.0+2.0.1

v4.1.0+2.0.2

v4.1.0+2.0.4

v4.1.0+2.0.5

v4.1.0+2.1.0

v4.1.0+2.1.1

v4.1.1+1.0.0

v4.1.1+1.0.1

v4.1.1+1.0.2

v4.1.1+1.0.3

v4.1.1+1.0.4

v4.1.1+1.0.5

v4.1.1+1.0.6

v4.1.1+1.0.7

v4.1.2+1.0.0

v4.1.2+1.0.1

v4.1.2+1.0.2

v4.1.2+1.0.3

v4.1.2+1.0.4

v4.1.2+1.1.0

v4.1.2+1.1.1

v4.1.2+1.1.2

v4.1.2+1.1.3

v4.1.2+1.1.4

v4.1.3+1.0.0

v4.1.4+1.0.0

v4.3.0+1.0.0

v4.3.0+1.0.1

v4.3.0+cat.1.0.1

v4.3.0+cat.1.0.2

v4.3.0-alpha.0+glitch+cat+1.0.10

v4.3.0-alpha.0+glitch+cat+1.0.11

v4.3.0-alpha.0+glitch+cat+1.0.12

v4.3.0-alpha.0+glitch+cat+1.0.13

v4.3.0-alpha.0+glitch+cat+1.0.14

v4.3.0-alpha.0+glitch+cat+1.0.2

v4.3.0-alpha.0+glitch+cat+1.0.3

v4.3.0-alpha.0+glitch+cat+1.0.4

v4.3.0-alpha.0+glitch+cat+1.0.5

v4.3.0-alpha.0+glitch+cat+1.0.6

v4.3.0-alpha.0+glitch+cat+1.0.7

v4.3.0-alpha.0+glitch+cat+1.0.8

v4.3.0-alpha.0+glitch+cat+1.0.9

v4.3.0-alpha.1+glitch+cat+1.0.15

v4.3.0-alpha.1+glitch+cat+1.0.16

v4.3.0-alpha.1+glitch+cat+1.0.17

v4.3.0-alpha.2+glitch+cat+1.0.18

v4.3.0-alpha.3+glitch+cat+1.0.0

v4.3.0-alpha.3+glitch+cat+1.0.1

v4.3.0-alpha.3+glitch+cat+1.0.2

v4.3.0-alpha.3+glitch+cat+1.0.3

v4.3.0-alpha.3+glitch+cat+1.0.4

v4.3.0-alpha.3+glitch+cat+1.0.5

v4.3.0-alpha.3+glitch+cat+1.0.6

v4.3.0-alpha.3+glitch+cat+1.0.7

v4.3.0-alpha.3+glitch+cat+1.0.8

v4.3.0-alpha.3+glitch+cat+1.0.9

v4.3.0-alpha.3+glitch+cat+1.1.0

v4.3.0-alpha.3+glitch+cat+1.1.1

v4.3.0-alpha.3+glitch+cat+1.1.2

v4.3.0-alpha.3+glitch+cat+1.1.3

v4.3.0-alpha.3+glitch+cat+1.2.0

v4.3.0-alpha.3+glitch+cat+1.2.1

v4.3.0-alpha.3+glitch+cat+1.2.2

v4.3.0-alpha.3+glitch+cat+1.2.3

v4.3.0-alpha.3+glitch+cat+1.2.4

v4.3.0-alpha.3+glitch+cat+1.2.5

v4.3.0-alpha.3+glitch+cat+1.2.6

v4.3.0-alpha.4+glitch+cat+1.0.0

v4.3.0-alpha.4+glitch+cat+1.0.1

v4.3.0-alpha.4+glitch+cat+1.0.2

v4.3.0-alpha.4+glitch+cat+1.0.3

v4.3.0-alpha.4+glitch+cat+1.1.0

v4.3.0-alpha.4+glitch+cat+1.1.1

v4.3.0-alpha.4+glitch+cat+1.1.2

v4.3.0-alpha.4+glitch+cat+1.1.3

v4.3.0-alpha.5+glitch+cat+1.0.0

v4.3.0-alpha.5+glitch+cat+1.0.1

v4.3.0-alpha.5+glitch+cat+1.0.10

v4.3.0-alpha.5+glitch+cat+1.0.2

v4.3.0-alpha.5+glitch+cat+1.0.3

v4.3.0-alpha.5+glitch+cat+1.0.4

v4.3.0-alpha.5+glitch+cat+1.0.5

v4.3.0-alpha.5+glitch+cat+1.0.6

v4.3.0-alpha.5+glitch+cat+1.0.7

v4.3.0-alpha.5+glitch+cat+1.0.8

v4.3.0-alpha.5+glitch+cat+1.0.9

v4.3.0-beta.1+cat.1.0.0

v4.3.0-beta.2+cat.1.0.0

v4.3.0-beta.2+cat.1.0.1

v4.3.0-rc.1+cat.1.0.0

v4.3.0-rc.1+cat.1.0.1

v4.3.1+cat.1.0.0

v4.3.1+cat.1.0.1

v4.3.1+cat.1.0.2

v4.3.2+cat.1.0.0

v4.3.2+cat.1.0.1

v4.3.3+cat.1.0.0

v4.3.3+cat.1.0.1

v4.3.3+cat.1.0.2

Mono Color

• f68bb52556
  Apply Rubocop Style/NegatedIfElseCondition (#23451) Nick Schonning 2023-02-08 01:07:36 -05:00
• 8c1b65c7dd
  Apply Rubocop Style/RedundantAssignment (#23452) Nick Schonning 2023-02-08 01:06:50 -05:00
• 1487fcde93
  Apply Rubocop Style/ExpandPathArguments (#23450) Nick Schonning 2023-02-08 01:06:20 -05:00
• d3f59f52c3
  Apply Rubocop Performance/StringReplacement (#23445) Nick Schonning 2023-02-07 21:21:21 -05:00
• 56c9c4367a
  Merge branch 'feat/notification-collapse' of github.com:neatchee/mastodon into feat/notification-collapse dean 2023-02-07 18:05:27 -08:00
• c18d2f99ae
  update to use a single function dean 2023-02-07 18:05:13 -08:00
• 203739dd3a
  Apply Rubocop Performance/StringIdentifierArgument (#23444) Nick Schonning 2023-02-07 20:36:20 -05:00
• 2e652aa81c
  Apply Rubocop Performance/RedundantSplitRegexpArgument (#23443) Nick Schonning 2023-02-07 20:25:20 -05:00
• ef8988aef2
  Apply Rubocop Performance/DoubleStartEndWith (#23442) Nick Schonning 2023-02-07 20:06:48 -05:00
• c92e033cdd
  Apply Rubocop Performance/BindCall (#23437) Nick Schonning 2023-02-07 19:10:25 -05:00
• cec005068f
  Apply Rubocop Performance/RedundantBlockCall (#23440) Nick Schonning 2023-02-07 18:58:18 -05:00
• 3142da2706 More null ref checks, and refresh the page if we somehow get a null value in notifs anyway neatchee 2023-02-07 09:37:23 -08:00
• f31d9a590d
  Bump sass from 1.57.1 to 1.58.0 (#23421) dependabot[bot] 2023-02-08 00:41:07 +09:00
• e559d1e672
  Bump rubocop-performance from 1.15.2 to 1.16.0 (#23418) dependabot[bot] 2023-02-08 00:40:36 +09:00
• 1e2f839543
  Bump immutable from 4.2.2 to 4.2.4 (#23419) dependabot[bot] 2023-02-08 00:40:15 +09:00
• ea4ff7e786
  Bump doorkeeper from 5.6.3 to 5.6.4 (#23422) dependabot[bot] 2023-02-08 00:39:37 +09:00
• fb7919e4ec
  Bump webpacker from 5.4.3 to 5.4.4 (#23424) dependabot[bot] 2023-02-08 00:39:02 +09:00
• 4f14957723
  Bump faker from 3.1.0 to 3.1.1 (#23425) dependabot[bot] 2023-02-08 00:38:30 +09:00
• e96cece46b Second attempt at fixing null ref in the notification grouping code when notifications[] is empty - Still not sure why this ever happens; the function shouldn't get called when that list is empty. Only seems to happen on mobile when returning to the browser app after some time. Possibly a reflow issue? neatchee 2023-02-07 00:57:49 -08:00
• d2ad955da4
  remove grouping as it is unused Dean Bassett 2023-02-06 20:15:53 -08:00
• ed570050c6
  Autofix Rails/EagerEvaluationLogMessage (#23429) Nick Schonning 2023-02-06 21:44:36 -05:00
• 7c0f025aad
  bug fix, third user links to interaction list dean 2023-02-06 17:48:57 -08:00
• fa9a265c0d
  NameList cleanup Dean Bassett 2023-02-06 17:43:02 -08:00
• 6a71bb23c2
  Update README.md (#23409) mon1kasenpai 2023-02-07 10:23:21 +10:00
• 9edefc779f
  Fix UserCleanupScheduler crash when an unconfirmed account has a moderation note (#23318) Claire 2023-02-07 01:14:44 +01:00
• 5ba6b03953 Fix possible null-ref when there are no notifications to display - This sometimes happens briefly while we load notifications so this error was interrupting that flow neatchee 2023-02-06 16:06:54 -08:00
• 523a86618f
  Fix account serializer crash if account doesn't have a user (#23428) Jeong Arm 2023-02-07 09:03:26 +09:00
• bb89f0af8a
  Fix ActivityPub::ProcessingWorker error on incoming malformed JSON-LD (#23416) Claire 2023-02-06 21:00:58 +01:00
• e2207af3d7
  New Crowdin updates (#23393) Eugen Rochko 2023-02-06 18:41:31 +01:00
• e8cb3ee827
  Add scrolling to Compare history modal (#23396) cadars 2023-02-06 16:53:31 +01:00
• c1f32c9c14
  Show spinner while loading follow requests (#23386) Christian Schmidt 2023-02-06 16:50:08 +01:00
• 1360cb3349
  update docs for getGroupedNotifications dean 2023-02-06 02:07:50 -08:00
• 1a6af790f6
  move logic to inside grouping function dean 2023-02-06 02:04:55 -08:00
• f8d71ece2d
  move from yaml to json dean 2023-02-06 01:59:33 -08:00
• 3016a975fa
  turn off grouping by default Dean Bassett 2023-02-06 01:55:14 -08:00
• 6acbcf7f35
  Fix notification grouping function sometimes returning a single notification element, instead of a list, which would confuse the .map() function (item.get() is not a function) (#46) neatchee 2023-02-06 01:48:00 -08:00
• 8cb2621b82 Merge remote-tracking branch 'glitch-soc/main' neatchee 2023-02-06 01:17:18 -08:00
• c18704bee2
  documentation + refactor dean 2023-02-06 07:42:27 +00:00
• af42b0c8c0
  all major browsers support ListForamt dean 2023-02-06 06:53:09 +00:00
• c3e3aa738a
  change n_others label to "some others" dean 2023-02-06 06:46:46 +00:00
• 9275e7a0f6
  convert NameList to a class component dean 2023-02-06 06:45:43 +00:00
• d9f47ba6a7
  call status's parseClick for viewMoreHref dean 2023-02-05 15:40:06 -08:00
• 0df7b9537d
  add another null check dean 2023-02-04 22:04:43 -08:00
• 27d6b53261
  add null check dean 2023-02-04 19:23:09 -08:00
• a72eee380f
  bug fix with account ordering dean 2023-02-05 03:21:46 +00:00
• 3bc3462dc2
  link to interaction list page if possible dean 2023-02-04 17:50:47 -08:00
• 7446174f09
  bug fix - change poll notifications to get from array dean 2023-02-04 16:56:13 -08:00
• 707c50c58d
  Merge remote-tracking branch 'glitch-soc/main' into feat/notification-collapse dean 2023-02-04 16:55:07 -08:00
• 76b4e7727b
  Merge pull request #2101 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-02-04 23:18:14 +01:00
• 22a661df18
  Collapse favorite/boost notifications into a single notification on the frontend Dean Bassett 2023-02-03 18:30:51 -08:00
• fa433ac5a6 Further JS code style changes Claire 2023-02-04 11:09:05 +01:00
• 67744ee779
  Spell check input fields (#23395) Christian Schmidt 2023-02-04 16:34:21 +01:00
• 5063e052fe
  fix notifications in emoji (#44) Dean Bassett 2023-02-04 04:17:43 -08:00
• cf6bedb7ff
  add reaction collapsing (#45) Dean Bassett 2023-02-04 04:16:18 -08:00
• 1f9f8035e4
  Bump bootsnap from 1.15.0 to 1.16.0 (#23340) dependabot[bot] 2023-02-04 15:55:07 +09:00
• 8651ef751e
  New Crowdin updates (#23356) Eugen Rochko 2023-02-04 07:46:08 +01:00
• 6106e0b6cd Fix poll notifications still referencing account instead accounts neatchee 2023-02-03 21:19:27 -08:00
• 8f590b0a21
  Add setting for status page URL (#23390) Eugen Rochko 2023-02-04 04:56:06 +01:00
• 192fdc389d
  Remove leftover file that was missed in a merge (#42) neatchee 2023-02-03 18:51:57 -08:00
• ed6bce9a60
  Update README.md neatchee 2023-02-03 18:38:11 -08:00
• 612592ff14
  Collapse favorite/boost notifications into a single notification (#38) Dean Bassett 2023-02-03 18:30:51 -08:00
• 3c70d92d76 Merge remote-tracking branch 'mastodon/main' neatchee 2023-02-03 17:40:06 -08:00
• 290772431d Merge remote-tracking branch 'glitch-soc/main' neatchee 2023-02-03 17:36:16 -08:00
• 01584f03e8
  Add metrics endpoint to streaming API (#23388) Eugen Rochko 2023-02-03 21:29:23 +01:00
• 3c451cf88f [Glitch] Fix useless regular-expression character escape detected by CodeQL Claire 2023-02-03 21:14:22 +01:00
• 8ce02aa6e8 [Glitch] autofocus the compose form again on /share Akira Ouchi 2023-01-30 22:49:10 +09:00
• 372fa3fe36 [Glitch] Update hasOwnProperty calls for ESLint Nick Schonning 2023-01-29 21:07:51 -05:00
• 155424e52f [Glitch] Run eslint --fix Claire 2023-02-03 20:52:07 +01:00
• ed7cb79723 [Glitch] Remove extra semicolons with ESLint autofix Nick Schonning 2023-01-29 17:44:03 -05:00
• 1d5395498d [Glitch] chore: remove intersection-observer for old Safari support TAKAHASHI Shuuji 2023-01-30 03:02:04 +09:00
• fb9c786baf [Glitch] Add lang attribute to image description textarea and poll option field Christian Schmidt 2023-01-29 19:00:19 +01:00
• aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-02-03 19:07:58 +01:00
• 79ca19e9b2
  Bump version to 4.1.0rc3 (#23384) Claire 2023-02-03 16:39:38 +01:00
• f98e4c662e
  Change link previews for statuses to never use avatar as fallback (#23376) Eugen Rochko 2023-02-03 10:16:47 +01:00
• 7e04b15ad8
  fix(web-push-notifications): fix favourite push notifications (#23286) Elizabeth Martín Campos 2023-02-03 09:29:32 +01:00
• 20a479ff7c
  Change POST /settings/applications/:id to regenerate token on scopes change (#23359) Claire 2023-02-02 12:03:49 +01:00
• 6a5e447753
  Address check-i18n warnings (#23313) Nick Schonning 2023-02-01 20:14:19 -05:00
• c6ef56fd5e
  Change rate limits to 1,500/5m per user, 300/5m per app (#23347) Eugen Rochko 2023-02-02 00:07:49 +01:00
• 420f33ccb9
  Skip locales linting (#23352) Yamagishi Kazutoshi 2023-02-01 23:15:11 +09:00
• 1c335ac53a
  Fix official docker images nto being compatible with some cloud providers (#23354) Claire 2023-02-01 13:15:42 +01:00
• 9400bdbce5
  Bump docker/build-push-action from 3 to 4 (#23333) dependabot[bot] 2023-02-01 20:09:43 +09:00
• b8c31f8110
  New Crowdin updates (#23221) Eugen Rochko 2023-02-01 11:59:31 +01:00
• e79babe6a3
  Bump jest-environment-jsdom from 29.3.1 to 29.4.1 (#23329) dependabot[bot] 2023-02-01 11:53:54 +01:00
• fe4e2e0bd1
  Bump babel-jest from 29.3.1 to 29.4.1 (#23331) dependabot[bot] 2023-02-01 11:53:13 +01:00
• 842d89fda8
  Bump jest from 29.3.1 to 29.4.1 (#23335) dependabot[bot] 2023-02-01 11:44:29 +01:00
• 05f5e5ae6f
  Bump nokogiri from 1.14.0 to 1.14.1 (#23330) dependabot[bot] 2023-02-01 11:33:07 +01:00
• 91ceb8af11
  Bump ox from 2.14.13 to 2.14.14 (#23338) dependabot[bot] 2023-02-01 11:31:50 +01:00
• 4c919812b9
  Change number of stored items in home feed from 400 to 800 (#23349) Eugen Rochko 2023-02-01 11:24:22 +01:00
• 21780c0204
  Change notifications per page from 15 to 40 in REST API (#23348) Eugen Rochko 2023-02-01 11:23:54 +01:00
• 41baf4b217
  Bump redcarpet from 3.5.1 to 3.6.0 (#23339) dependabot[bot] 2023-02-01 11:19:30 +01:00
• 784961059c
  Bump eslint-plugin-react from 7.32.1 to 7.32.2 (#23336) dependabot[bot] 2023-02-01 11:18:52 +01:00
• c38d685c41
  Bump axios from 1.2.3 to 1.2.6 (#23334) dependabot[bot] 2023-02-01 11:18:31 +01:00
• fa379a993d
  Bump aws-sdk-s3 from 1.118.0 to 1.119.0 (#23341) dependabot[bot] 2023-02-01 11:16:38 +01:00
• 723412ac5e
  Bump rubocop from 1.44.0 to 1.44.1 (#23337) dependabot[bot] 2023-02-01 11:16:13 +01:00
• 597daed17a
  Bump rimraf from 4.1.1 to 4.1.2 (#23332) dependabot[bot] 2023-02-01 11:14:44 +01:00
• f684ff72f2
  Bump utf-8-validate from 6.0.1 to 6.0.2 (#23327) dependabot[bot] 2023-02-01 11:12:12 +01:00
• 801a209e06
  Bump simple_form from 5.1.0 to 5.2.0 (#23328) dependabot[bot] 2023-02-01 11:07:16 +01:00
• d49879cc7b
  Bump rails from 6.1.7.1 to 6.1.7.2 (#23326) dependabot[bot] 2023-02-01 11:06:59 +01:00
• 4b6bd4bc0d
  Bump redux from 4.2.0 to 4.2.1 (#23325) dependabot[bot] 2023-02-01 10:58:43 +01:00
• 409fcd1985
  Bump doorkeeper from 5.6.2 to 5.6.3 (#23324) dependabot[bot] 2023-02-01 10:58:10 +01:00
• 081f14b361
  Bump mkdirp from 1.0.4 to 2.1.3 (#23228) dependabot[bot] 2023-01-31 00:48:28 +09:00
• 1ca3127a1d
  Bump gitlab-omniauth-openid-connect from 0.10.0 to 0.10.1 (#23241) dependabot[bot] 2023-01-31 00:46:27 +09:00
• e73b55184b
  autofocus the compose form again on /share (#23094) Akira Ouchi 2023-01-30 22:49:10 +09:00
• 96d26a9417
  Enable ESLint jsx-a11y/recommended ruleset (#23309) Nick Schonning 2023-01-30 00:18:12 -05:00
• 1032d45644
  Ignore ESLint nested ternary (#23310) Nick Schonning 2023-01-30 00:17:46 -05:00
• f8bdfa2f19
  Bump punycode from 2.2.0 to 2.3.0 (#23230) dependabot[bot] 2023-01-30 11:15:44 +09:00
• 84c72cb21f
  Bump eslint-plugin-jsx-a11y from 6.6.1 to 6.7.1 (#23121) dependabot[bot] 2023-01-30 11:12:35 +09:00
• cbf5ea39d0
  Enable ESLint react/recommended ruleset (#22460) Nick Schonning 2023-01-29 21:08:37 -05:00
• 131e6403cc
  Update hasOwnProperty calls for ESLint (#23307) Nick Schonning 2023-01-29 21:07:51 -05:00
• 56d1af753d
  Only build latest commit on branch for image (#23306) Nick Schonning 2023-01-29 21:07:19 -05:00
• ea1507ee85
  Bump aws-sdk-s3 from 1.117.2 to 1.118.0 (#23202) dependabot[bot] 2023-01-30 10:57:59 +09:00
• 8ce2a4220c
  Bump eslint-plugin-import from 2.26.0 to 2.27.5 (#23120) dependabot[bot] 2023-01-30 10:56:09 +09:00
• e6192eab9b
  Remove unused ESLint disable directives (#22427) Nick Schonning 2023-01-29 20:11:50 -05:00
• c49213f0ea
  Upgrade ESlint to v8 (#23305) Nick Schonning 2023-01-29 19:45:35 -05:00
• b58bf74e35
  Filter Superlinter to Ruby files only (#21976) Nick Schonning 2023-01-29 18:39:31 -05:00
• 4917e38d94
  Separate Stylelint from Superlinter (#23303) Nick Schonning 2023-01-29 18:23:52 -05:00
• d9088ef327
  Separate ESLint CI from Superlinter (#23029) Nick Schonning 2023-01-29 17:44:03 -05:00
• 9cdd643564
  chore: remove intersection-observer for old Safari support (#23284) TAKAHASHI Shuuji 2023-01-30 03:02:04 +09:00
• 2a4f2216d6
  Add lang attribute to image description textarea and poll option field (#23293) Christian Schmidt 2023-01-29 19:00:19 +01:00
• d3f3810fe1
  Fix unserialized role on account entities in admin API (#23290) Eugen Rochko 2023-01-29 15:59:58 +01:00
• ec26f7c1b1
  New translations en.json (German) (#2097) Claire 2023-01-28 10:20:55 +01:00
• 1708167dd3
  Bump sanitize from 6.0.0 to 6.0.1 (#23281) dependabot[bot] 2023-01-28 18:12:57 +09:00
• 637542ce16 Revert "Embiggen the emoji picker!" neatchee 2023-01-27 22:04:04 -08:00
• 695bdf882d Merge remote-tracking branch 'glitch-soc/main' neatchee 2023-01-27 22:00:58 -08:00
• 6d49905068 Merge remote-tracking branch 'neatchee/feat/emoji_reactions' neatchee 2023-01-27 17:27:48 -08:00
• 791aa15624 Fix bad reference to 'PropTypes.map' which does not exist neatchee 2023-01-27 16:58:37 -08:00
• 27fdb81b65
  
  Merge remote-tracking branch 'upstream/main' into develop v4.0.2+1.1.9 Jeremy Kescher 2023-01-27 00:36:19 +01:00
• d9a078e6d3
  Add role badges to WebUI (#2096) Claire 2023-01-26 23:35:23 +01:00
• 1e27826472 Fix rebase issues neatchee 2023-01-26 11:32:03 -08:00
• cfa92c4ec0
  Merge pull request #2095 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-01-26 20:16:31 +01:00
• 20abef6590
  Allow users to set the trigger height for lengthy toot auto-collapse (#2070) neatchee 2023-01-26 10:36:44 -08:00
• fad6633156 Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-01-26 19:31:39 +01:00
• 74bad9a4cb Per PR suggestion, split name and domain, and look for emoji ID, for unreact, so remote emoji's can be unreacted neatchee 2023-01-26 10:22:15 -08:00
• 855b0d4dbb
  
  Merge remote-tracking branch 'upstream/main' into develop v4.0.2+1.1.8 Jeremy Kescher 2023-01-26 17:27:01 +01:00
• 751ac5701f Merge remote-tracking branch 'mastodon/main' neatchee 2023-01-25 14:03:36 -08:00
• 87ace617b7
  Merge branch 'glitch-soc:main' into main neatchee 2023-01-25 14:00:06 -08:00
• 0ac4ccfc3a move emoji reaction strings to locales-glitch fef 2022-12-20 17:19:56 +00:00
• 88257fe15c Fix status reactions preventing an on_cascade delete Jeremy Kescher 2022-12-18 04:23:42 +01:00
• 5173613890 bypass reaction limit for foreign accounts fef 2022-12-15 15:27:54 +00:00
• c1f4e493e9 fix 404 when reacting with Keycap Number Sign fef 2022-12-11 13:26:23 +00:00
• ac31a8d48d fix status action bar after upstream changes fef 2022-12-08 09:48:55 +00:00
• 9ec39f98af fix schema after rebase fef 2022-12-07 21:52:53 +01:00
• 48b00c2bdc delete reaction notifications when deleting status fef 2022-12-07 12:47:03 +00:00
• e27fb1b632 support reacting with foreign custom emojis fef 2022-12-07 12:19:36 +00:00
• 76a519f83e properly disable reactions when not logged in fef 2022-12-04 12:33:47 +00:00
• 8304dc14a7 serialize custom emoji reactions properly for AP fef 2022-12-04 10:52:02 +00:00
• cbc7bc95ef also disable reaction buttons in vanilla flavour fef 2022-12-04 08:47:24 +00:00
• 0eec369211 disable reaction button when not signed in fef 2022-12-03 16:55:37 +00:00
• 1ad2c68912 fix image for new custom emoji reactions fef 2022-12-03 16:20:29 +00:00
• 615ecb3161 run i18n-tasks normalize fef 2022-12-03 14:23:55 +00:00
• 2ffa61db05 display external custom emoji reactions properly fef 2022-12-03 11:57:00 +00:00
• 4516cb47ac handle incoming custom emoji reactions properly fef 2022-12-03 10:22:15 +00:00
• 102fbc25be support Undo action for EmojiReaction fef 2022-12-03 08:24:23 +00:00
• 48a5f5f250 download remote custom emojis from reactions fef 2022-12-02 17:02:06 +00:00
• 29627a4c6c fix integer cast bug fef 2022-12-02 10:17:59 +00:00
• 59f73df49d sanitize setting for number of visible reactions fef 2022-12-02 09:37:56 +00:00
• 3431edd68b Add reaction limit to instance serializer Jeremy Kescher 2022-12-02 08:05:10 +01:00
• 0f59ce3e56 fix padding on posts without reactions fef 2022-12-02 01:52:59 +00:00
• 3956154a16 rename nop handler to handleNoOp fef 2022-12-02 01:00:08 +00:00
• d61c47edb0 cleanup JS imports and other minor stuff fef 2022-12-01 23:30:39 +01:00
• 97043dce21 remove unnecessary parameter fef 2022-12-01 04:26:13 +00:00
• 3fd6173203 change reaction api to match other interactions fef 2022-12-01 02:24:08 +00:00
• aa76853d51 fix reaction deletion bug and clean up controller fef 2022-12-01 01:41:47 +00:00
• 5e8f805447 remove outdated comments fef 2022-11-30 19:29:56 +00:00
• 341c663d29 clean up new imports in vanilla flavour fef 2022-11-30 17:09:16 +00:00
• b7c8a2b7b7 rebase with upstream fef 2022-11-30 17:25:36 +01:00
• 6ff67a6775 make number of visible reactions a vanilla setting fef 2022-11-30 14:59:37 +00:00
• 20166444de make number of displayed reactions a setting fef 2022-11-30 13:20:20 +00:00
• 7fc71af0cc change default reaction limit to 1 fef 2022-11-30 12:01:34 +00:00
• 63c03cf902 limit number of reactions displayed fef 2022-11-30 09:06:14 +00:00
• fff8112a5f fix reaction margins and paddings fef 2022-11-29 09:07:10 +00:00
• aa6abec827 cleanup frontend emoji reaction code fef 2022-11-29 08:54:35 +00:00
• a88d98f7d7 cleanup backend emoji reaction code fef 2022-11-29 08:15:52 +00:00
• 26972e3947 fix padding for reaction button fef 2022-11-29 06:25:43 +00:00
• 79b741ea93 handle misskey reactions properly fef 2022-11-29 05:21:53 +00:00
• cafc95381c move react button to action bar fef 2022-11-29 04:37:44 +00:00
• 0f29c1fa8f cherry-pick emoji reaction changes fef 2022-11-29 04:31:22 +01:00
• 7acf26e777
  Merge pull request #2094 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-01-25 21:58:31 +01:00
• d65c974741 make frontend fetch reaction limit fef 2022-11-29 00:39:40 +00:00
• 0e5bb30222 make status reaction count limit configurable fef 2022-11-28 23:16:56 +00:00
• 64defa3eed remove accidentally created file fef 2022-11-28 22:25:12 +00:00
• cb75d43185 federate emoji reactions fef 2022-11-28 22:23:13 +00:00
• 9958664f55 show reactions in detailed status view fef 2022-11-25 23:02:40 +00:00
• 5df48a4d8a add frontend for emoji reactions fef 2022-11-24 17:30:52 +00:00
• 9410d00d7b add backend support for status emoji reactions fef 2022-11-24 11:50:32 +00:00
• 13a2abacc8
  Add roles attribute to Account entities in REST API (#23255) Claire 2023-01-25 19:55:40 +01:00
• 83fa8fc0cc Merge remote-tracking branch 'mastodon/main' neatchee 2023-01-25 09:57:15 -08:00
• 2093436349 [Glitch] Fix styling of featured tags in light theme Claire 2023-01-25 16:28:29 +01:00
• 0f4637981b Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-01-25 17:26:38 +01:00
• e5ae75bf6a
  Fix styling of featured tags in light theme (#23252) Claire 2023-01-25 16:28:29 +01:00
• 2f112432e6
  Bump version to 4.1.0rc2 (#23220) Claire 2023-01-25 16:20:54 +01:00
• ffea668076 [Glitch] Fix missing filtering on some notification types Claire 2023-01-23 13:21:50 +01:00
• 853d0f28c5 [Glitch] Add lang attribute to compose textarea and CW field Claire 2023-01-24 18:49:21 +01:00
• 78b822c61d [Glitch] Make <Audio> to handle volume change Mina Her 2023-01-25 00:24:46 +09:00
• cf3ad10e75 [Glitch] Fix upload area display in single-column mode Claire 2023-01-23 17:42:58 +01:00
• 3074338d79 Merge branch 'main' into glitch-soc/merge-upstream Claire 2023-01-24 20:32:31 +01:00
• a5a00d7f7a
  Fix email with empty domain name labels passing validation (#23246) Claire 2023-01-24 20:18:41 +01:00
• dd58db64d8
  Change email address input to be disabled for logged-in users when requesting a new confirmation e-mail (#23247) Claire 2023-01-24 20:18:25 +01:00
• 6883fddb19
  Fix account activation being triggered before email confirmation (#23245) Claire 2023-01-24 19:40:21 +01:00
• 4725191d3c
  Fix moderation audit log items for warnings having incorrect links (#23242) Claire 2023-01-24 18:50:13 +01:00