CatCatNya/catstodon
4
2
Fork 0
forked from glitch-soc-github-mirror/mastodon
Code Issues 11 Pull requests Projects 1 Releases 14 Wiki Activity

Commit graph

  • a167d715c9
         api.rb: Remove resources line that wasn't in routes.rb anymore Jeremy Kescher 2023-05-10 00:49:41 +02:00
  • 3869e8c210
         Change "Sign in" to "Login" (#24942) Eugen Rochko 2023-05-10 20:17:55 +02:00
  • 0eed06073f
         Fix videos being improperly positioned on safari (#24943) Claire 2023-05-10 17:22:34 +02:00
  • 5eeb40bdbe
         Add stricter ESLint rules for Typescript files (#24926) Renaud Chaput 2023-05-10 12:59:29 +02:00
  • b878e3d8df
         Enable ESLint react/no-deprecated (#24471) Nick Schonning 2023-05-10 03:05:32 -04:00
  • 2d5e257938
         Rewrite logo.tsx as FC (#24909) たいち ひ 2023-05-10 15:58:21 +09:00
  • 6f8db56a01
         Disable RTK safety middlewares (#24936) Renaud Chaput 2023-05-10 08:38:02 +02:00
  • bef6efcf8a Fix duplicate emoji reaction bars after merge neatchee 2023-05-09 17:32:37 -07:00
  • 6199f97bd3 Merge remote-tracking branch 'kescherCode/feature/emoji_reactions' neatchee 2023-05-09 16:03:37 -07:00
  • 531ae61398
         api.rb: Remove resources line that wasn't in routes.rb anymore Jeremy Kescher 2023-05-10 00:49:41 +02:00
  • 0ce28f5c13 Merge branch 'feature/emoji_reactions' neatchee 2023-05-09 15:44:42 -07:00
  • e2865c0781
         Remove German translation for setting_visible_reactions Jeremy Kescher 2023-05-10 00:43:56 +02:00
  • 968dce888d
         Remove duplicate strings Jeremy Kescher 2023-05-10 00:42:22 +02:00
  • 6137ede4e8
         Remove leftover German translation Jeremy Kescher 2023-05-10 00:38:25 +02:00
  • 570b754233 Merge remote-tracking branch 'glitch-soc/main' neatchee 2023-05-09 15:38:10 -07:00
  • 873e183d4d
         Remove old french emoji reaction-related strings Jeremy Kescher 2023-05-10 00:34:52 +02:00
  • 1fad578552
         Remove old emoji reaction-related strings and translations Jeremy Kescher 2023-05-10 00:34:03 +02:00
  • a6f1533aa0
         Restore loc files for non-English languages; CrowdIn should handle this neatchee 2023-05-07 15:33:50 -07:00
  • 2742a9958b
         Introduce visible reactions default setting Jeremy Kescher 2023-05-10 00:19:41 +02:00
  • bf2c39ec7f
         Re-apply schema version Jeremy Kescher 2023-05-10 00:18:32 +02:00
  • 300c2288ba
         Fix visible reactions setting not applying Jeremy Kescher 2023-05-10 00:15:19 +02:00
  • c50ccdf69d
         eslint fix Jeremy Kescher 2023-05-10 00:11:15 +02:00
  • ed5e07cc5d
         Remove further leftover makeCustomEmojiMap references Jeremy Kescher 2023-05-10 00:05:39 +02:00
  • 63e9572b94
         Remove further leftover makeCustomEmojiMap references Jeremy Kescher 2023-05-10 00:05:39 +02:00
  • a1395de405
         Remove duplicate notification_mailer definition Jeremy Kescher 2023-05-10 00:02:17 +02:00
  • f371464639 Remove our copy of image.d.ts as tsconfig already uses upstream's Claire 2023-05-10 00:00:28 +02:00
  • f28f2bf216
         Fix n+1 query for move emoji reaction settings migration Jeremy Kescher 2023-05-10 00:00:06 +02:00
  • 54cf5721ac
         Run rubocop -a Jeremy Kescher 2023-05-09 23:41:48 +02:00
  • 12f0a5333f
         Add back missing visibleReactions variable to both initial_state.js files Jeremy Kescher 2023-05-09 23:37:34 +02:00
  • 845d1be5ca
         Run rubocop -a Jeremy Kescher 2023-05-09 23:41:48 +02:00
  • 96e99e2170 Run prettier on Typescript files Claire 2023-05-09 23:41:18 +02:00
  • f3c8de9379
         Removed unused imports in status_container.js Jeremy Kescher 2023-05-09 23:37:40 +02:00
  • facc7ab03c Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream Claire 2023-05-09 23:37:38 +02:00
  • 3ecb6ce63e
         Add back missing visibleReactions variable to both initial_state.js files Jeremy Kescher 2023-05-09 23:37:34 +02:00
  • 5aa08826cf [Glitch] Type Redux store and middleware Renaud Chaput 2023-05-09 16:56:26 +02:00
  • f26f4676db
         Add missing visible_reactions to vanilla initial_state typedef Jeremy Kescher 2023-05-09 23:20:21 +02:00
  • b5eb2b639c
         Fix max_reactions typedef Jeremy Kescher 2023-05-09 23:18:20 +02:00
  • 27df8a9079
         Move reaction endpoints from route.rb to api.rb Jeremy Kescher 2023-05-09 23:08:13 +02:00
  • 9fe04326ea
         Merge remote-tracking branch 'upstream/main' into develop Jeremy Kescher 2023-05-09 23:26:00 +02:00
  • a56c71faba [Glitch] Remove unused iOS agent sniffing function Renaud Chaput 2023-05-09 15:48:53 +02:00
  • 711fee1508
         Add missing visible_reactions to vanilla initial_state typedef Jeremy Kescher 2023-05-09 23:20:21 +02:00
  • 526fe33e2f [Glitch] Rework polyfills loading Renaud Chaput 2023-05-09 14:55:35 +02:00
  • 010569da7b
         Fix max_reactions typedef Jeremy Kescher 2023-05-09 23:18:20 +02:00
  • e22a88b512 [Glitch] Add more detailed type annotation for Account fusagiko / takayamaki 2023-05-09 19:09:32 +09:00
  • 1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream Claire 2023-05-09 23:12:48 +02:00
  • 349cae0b57
         Add type annotation for DisplayName component (#24752) fusagiko / takayamaki 2023-05-10 06:08:54 +09:00
  • ab7716cff4
         Rename Image component to ServerHeroImage (#24894) fusagiko / takayamaki 2023-05-10 06:08:28 +09:00
  • 42d494dda3
         Move reaction endpoints from route.rb to api.rb Jeremy Kescher 2023-05-09 23:08:13 +02:00
  • 56079b0e1a
         Move reaction locale to locales-glitch Jeremy Kescher 2023-05-09 23:04:44 +02:00
  • 0fff2b67de Disable broken onboarding code Claire 2023-05-09 23:03:23 +02:00
  • 81c3d63f01
         Remove stale/missed references to makeCustomEmojiMap / EmojiMap neatchee 2023-05-07 16:24:43 -07:00
  • 530167dff5
         Reactions: Return 404 when status should not be visible, asynchronous unreact Jeremy Kescher 2023-05-07 23:27:19 +02:00
  • 5fd81b6144
         Add missing authorization to ReactService Jeremy Kescher 2023-05-07 22:05:44 +02:00
  • 6af0296abc
         Restore loc files for non-English languages; CrowdIn should handle this neatchee 2023-05-07 15:33:50 -07:00
  • 92d6dc61eb
         Update emoji reaction patches Jeremy Kescher 2023-05-07 22:01:04 +02:00
  • 214eee241b
         Fix placement of reactions bar for new threading UI neatchee 2023-05-07 01:10:49 -07:00
  • 5b7d1d5281
         Migrate emoji reactions Jeremy Kescher 2023-04-03 22:16:35 +02:00
  • 1b76bb6bcc
         Remove old .js locale files accidentally restored during rebase neatchee 2023-03-08 13:27:25 -08:00
  • 55303adfef
         Keep emoji picker within screen bounds Ivan Rodriguez 2023-03-07 23:21:32 -06:00
  • f577764472
         Fix rebase issues neatchee 2023-01-26 11:32:03 -08:00
  • a789208939
         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
  • ba68e3e0dc
         move emoji reaction strings to locales-glitch fef 2022-12-20 17:19:56 +00:00
  • d23b8adc8b
         Fix status reactions preventing an on_cascade delete Jeremy Kescher 2022-12-18 04:23:42 +01:00
  • bec3c13cad
         bypass reaction limit for foreign accounts fef 2022-12-15 15:27:54 +00:00
  • 9b2cfc3191
         fix 404 when reacting with Keycap Number Sign fef 2022-12-11 13:26:23 +00:00
  • b7d563611f
         fix status action bar after upstream changes fef 2022-12-08 09:48:55 +00:00
  • 9d1467a364
         fix schema after rebase fef 2022-12-07 21:52:53 +01:00
  • c05db8c765
         delete reaction notifications when deleting status fef 2022-12-07 12:47:03 +00:00
  • c2209aca12
         support reacting with foreign custom emojis fef 2022-12-07 12:19:36 +00:00
  • 5f2071d055 [Glitch] Enforce stricter rules for Typescript files Renaud Chaput 2023-05-09 03:11:56 +02:00
  • b46adb9a1d
         properly disable reactions when not logged in fef 2022-12-04 12:33:47 +00:00
  • 9ad49a191c
         serialize custom emoji reactions properly for AP fef 2022-12-04 10:52:02 +00:00
  • f0d129fabe
         also disable reaction buttons in vanilla flavour fef 2022-12-04 08:47:24 +00:00
  • 245f5b3f2f
         disable reaction button when not signed in fef 2022-12-03 16:55:37 +00:00
  • 01723aef2b
         fix image for new custom emoji reactions fef 2022-12-03 16:20:29 +00:00
  • 122abba7bc
         run i18n-tasks normalize fef 2022-12-03 14:23:55 +00:00
  • 83bffa8b3c
         display external custom emoji reactions properly fef 2022-12-03 11:57:00 +00:00
  • 38346d52ef
         handle incoming custom emoji reactions properly fef 2022-12-03 10:22:15 +00:00
  • fe084475e9
         support Undo action for EmojiReaction fef 2022-12-03 08:24:23 +00:00
  • d800559866
         download remote custom emojis from reactions fef 2022-12-02 17:02:06 +00:00
  • 7792235a89
         sanitize setting for number of visible reactions fef 2022-12-02 09:37:56 +00:00
  • 5482045c22
         Add reaction limit to instance serializer Jeremy Kescher 2022-12-02 08:05:10 +01:00
  • a97b0fd62b
         fix padding on posts without reactions fef 2022-12-02 01:52:59 +00:00
  • 9ac20598db
         rename nop handler to handleNoOp fef 2022-12-02 01:00:08 +00:00
  • c53ff0fecc
         cleanup JS imports and other minor stuff fef 2022-12-01 23:30:39 +01:00
  • c898de9aba
         remove unnecessary parameter fef 2022-12-01 04:26:13 +00:00
  • ef5396ce65
         change reaction api to match other interactions fef 2022-12-01 02:24:08 +00:00
  • 99f03f2d1c
         fix reaction deletion bug and clean up controller fef 2022-12-01 01:41:47 +00:00
  • 9702fa0a99
         remove outdated comments fef 2022-11-30 19:29:56 +00:00
  • c32386f15a
         clean up new imports in vanilla flavour fef 2022-11-30 17:09:16 +00:00
  • 5aa74e9aae
         rebase with upstream fef 2022-11-30 17:25:36 +01:00
  • 5d5fd9457d
         make number of visible reactions a vanilla setting fef 2022-11-30 14:59:37 +00:00
  • 4d7340472b
         make number of displayed reactions a setting fef 2022-11-30 13:20:20 +00:00
  • fdb5d35c7c
         change default reaction limit to 1 fef 2022-11-30 12:01:34 +00:00
  • fbace10f99
         limit number of reactions displayed fef 2022-11-30 09:06:14 +00:00
  • 2e312d28e8
         fix reaction margins and paddings fef 2022-11-29 09:07:10 +00:00
  • 46179ed6be
         cleanup frontend emoji reaction code fef 2022-11-29 08:54:35 +00:00
  • 42490e21f8
         cleanup backend emoji reaction code fef 2022-11-29 08:15:52 +00:00
  • 4653f9830d
         fix padding for reaction button fef 2022-11-29 06:25:43 +00:00
  • abd60c57f7
         handle misskey reactions properly fef 2022-11-29 05:21:53 +00:00
  • 2ec91c6d0f
         move react button to action bar fef 2022-11-29 04:37:44 +00:00
  • c5befd7c1a
         cherry-pick emoji reaction changes fef 2022-11-29 04:31:22 +01:00
  • dd4762f3ca
         make frontend fetch reaction limit fef 2022-11-29 00:39:40 +00:00
  • e210fccb9d
         make status reaction count limit configurable fef 2022-11-28 23:16:56 +00:00
  • ad6b92df8d
         remove accidentally created file fef 2022-11-28 22:25:12 +00:00
  • add68d9291
         federate emoji reactions fef 2022-11-28 22:23:13 +00:00
  • 6eeda52a8e
         show reactions in detailed status view fef 2022-11-25 23:02:40 +00:00
  • a445e38694
         add frontend for emoji reactions fef 2022-11-24 17:30:52 +00:00
  • 4829f96113
         add backend support for status emoji reactions fef 2022-11-24 11:50:32 +00:00
  • b509b96504 [Glitch] Enforce React Rules of Hooks with eslint Renaud Chaput 2023-05-09 03:09:11 +02:00
  • 108720d7b0 [Glitch] Dont use CommonJS (require, module.exports) anywhere Renaud Chaput 2023-05-09 03:08:47 +02:00
  • c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream Claire 2023-05-09 22:12:05 +02:00
  • 887112a065 [Glitch] Add TypeScript support for mastodon alias and image imports たいち ひ 2023-05-08 18:28:36 +09:00
  • 499450dd9d
         Remove old makeCustomEmojiMap function Jeremy Kescher 2023-05-09 21:43:21 +02:00
  • 9538e520d2
         Exclude reactions from email notification types Jeremy Kescher 2023-05-09 21:36:31 +02:00
  • 4b9437b9d4
         Adjust order of with_options to emoji patch Jeremy Kescher 2023-05-09 21:30:51 +02:00
  • 42bdc2add9 Copy hooks/useHovering.ts to glitch-soc Claire 2023-05-09 21:30:10 +02:00
  • 8e806b6e88 Fix IconButton prop types in glitch-soc Claire 2023-05-09 21:11:23 +02:00
  • 6415981056 [Glitch] Mark wheel events on scrollable list as passive Renaud Chaput 2023-05-09 03:07:13 +02:00
  • f94eb65cf9 [Glitch] Rewrite Domain component as function component fusagiko / takayamaki 2023-05-08 22:12:12 +09:00
  • 468dfffd26 [Glitch] Use LayoutType from is_mobile in actions/app fusagiko / takayamaki 2023-05-08 22:10:21 +09:00
  • 87a704f70b [Glitch] Rewrite RadioButton component as FC たいち ひ 2023-05-08 18:12:53 +09:00
  • bd851d3b58 [Glitch] Rewrite Image component as function component たいち ひ 2023-05-08 18:12:44 +09:00
  • 1edaf58fb9 [Glitch] Rewrite <NotSignedInIndicator /> as FC たいち ひ 2023-05-08 18:12:13 +09:00
  • 8b568755ad Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream Claire 2023-05-09 20:12:33 +02:00
  • 51b83ed195
         Use Prettier for ESLint formatting TypeScript (#23631) Nick Schonning 2023-05-09 13:02:12 -04:00
  • 6aeb162927
         Type Redux store and middleware (#24843) Renaud Chaput 2023-05-09 16:56:26 +02:00
  • e1f466fbbe
         Fix javascript on moderation interface (#24933) Claire 2023-05-09 16:42:02 +02:00
  • 224d458f7e
         Remove unused iOS agent sniffing function (#24931) Renaud Chaput 2023-05-09 15:48:53 +02:00
  • 72dcb2ef58
         Bump @typescript-eslint/eslint-plugin from 5.59.2 to 5.59.5 (#24922) dependabot[bot] 2023-05-09 15:42:21 +02:00
  • a5ba98d2df
         Bump @typescript-eslint/parser from 5.59.2 to 5.59.5 (#24921) dependabot[bot] 2023-05-09 15:25:49 +02:00
  • af7bf59b3e
         Fix wrong documentation link (#24924) eggplants 2023-05-09 21:56:02 +09:00
  • a3a2414f0e
         Rework polyfills loading (#24907) Renaud Chaput 2023-05-09 14:55:35 +02:00
  • f08f6d20e6
         Merge pull request #2215 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-05-09 14:47:11 +02:00
  • 536dd046d4
         Add ability to block sign-ups from IP using the CLI (#24870) Daniel M Brasil 2023-05-09 09:46:00 -03:00
  • ffb3fef7db
         Fix uncaught ActiveRecord::StatementInvalid in Mastodon::IpBlocksCLI (#24861) Daniel M Brasil 2023-05-09 09:45:47 -03:00
  • aec486b4ec
         Upgrade uuid to 9.0.0 (#24917) Renaud Chaput 2023-05-09 14:43:07 +02:00
  • 6579e3af7d
         Add more detailed type annotation for Account (#24815) fusagiko / takayamaki 2023-05-09 19:09:32 +09:00
  • c8181eb0a4
         Enforce stricter rules for Typescript files (#24910) Renaud Chaput 2023-05-09 03:11:56 +02:00
  • 64ec41d89c
         Make Webpack fail on failed imports (#24908) Renaud Chaput 2023-05-09 03:10:04 +02:00
  • d9b93bd15e
         Enforce React Rules of Hooks with eslint (#24911) Renaud Chaput 2023-05-09 03:09:11 +02:00
  • 955179fc55
         Dont use CommonJS (require, module.exports) anywhere (#24913) Renaud Chaput 2023-05-09 03:08:47 +02:00
  • 89269e4b71
         Mark wheel events on scrollable list as passive (#24914) Renaud Chaput 2023-05-09 03:07:13 +02:00
  • c37d81d508 Merge remote-tracking branch 'glitch-soc/main' neatchee 2023-05-08 15:12:02 -07:00
  • ea04f33f50 [Glitch] Fixes build errors from some previous TS-related commits Renaud Chaput 2023-05-03 16:28:14 +02:00
  • 3d9e35375c [Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction fusagiko / takayamaki 2023-05-03 22:28:39 +09:00
  • a33d6c946a [Glitch] Remove MastodonMap TS type Renaud Chaput 2023-05-03 13:32:11 +02:00
  • e8243d5bbd [Glitch] Add type annotation for some js files fusagiko / takayamaki 2023-05-03 18:43:29 +09:00
  • 5f0d2b6e3b Copy Typescript type definitions to glitch-soc Claire 2023-05-08 21:32:26 +02:00
  • f3af434c25 [Glitch] Fix incorrect import of redux store Claire 2023-05-03 10:29:45 +02:00
  • f4e3e309b1 [Glitch] use configureStore of redux-toolkit instead of createStore of redux fusagiko / takayamaki 2023-05-03 03:39:06 +09:00
  • bbd0e9caa6 [Glitch] Add ALT badges to media that has alternative text in web UI Eugen Rochko 2023-05-02 14:47:04 +02:00
  • a8939e9098 [Glitch] Change media elements to use aspect-ratio rather than compute height themselves Claire 2023-05-02 13:58:48 +02:00
  • 10f5329ddf [Glitch] Fix incorrect box shadow on avatar in thread view Claire 2023-05-03 09:11:20 +02:00
  • 9ab89bb832 [Glitch] Add type annotation for Blurhash component fusagiko / takayamaki 2023-05-02 19:54:00 +09:00
  • 20f1f3aa7d [Glitch] Add type annotation for IconButton component fusagiko / takayamaki 2023-05-02 19:53:32 +09:00
  • d183f8c306
         Bump version v4.1.2+1.1.1 Jeremy Kescher 2023-05-08 19:38:15 +02:00
  • 0cf94443bd
         Rubocop fixes Jeremy Kescher 2023-05-08 19:37:56 +02:00
  • 8c64325cc6
         Fix n+1 query in settings migration for emoji reaction settings Jeremy Kescher 2023-05-08 19:34:04 +02:00
  • 8b31030fe4 Fix rubocop issues in glitch-soc-specific code Claire 2023-05-08 19:26:00 +02:00
  • d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream Claire 2023-05-08 19:05:55 +02:00
  • f1a71785b9
         Merge remote-tracking branch 'upstream/main' into develop Jeremy Kescher 2023-05-08 18:40:08 +02:00
  • f89f3a8566
         Fix glitch-soc's thread line styling (#2214) Claire 2023-05-08 18:21:36 +02:00
  • 61f3e0e95e
         Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream Claire 2023-05-08 17:59:28 +02:00
  • 8bf9bd5ac8 [Glitch] Fix n+1 query in settings migration Eugen Rochko 2023-05-02 10:26:39 +02:00
  • 75e28731a5 [Glitch] Fix transaction around settings migration Eugen Rochko 2023-05-01 17:45:18 +02:00
  • aff2d55b80 [Glitch] Add type annotation for RelativeTimestamp component fusagiko / takayamaki 2023-05-01 07:51:31 +09:00
  • a49707dacb [Glitch] Rewrite Icon and IconWithBadge with typescript fusagiko / takayamaki 2023-05-01 07:51:00 +09:00
  • 7835f8fd22 [Glitch] Fix icons having an image role Eugen Rochko 2022-11-14 00:38:56 +01:00
  • e9eab013e7 [Glitch] Fix audio player width in thread view Claire 2023-04-30 06:42:22 +02:00
  • 51479f5c28 [Glitch] Add eslint-plugin-jsdoc Nick Schonning 2023-04-29 20:29:54 -04:00
  • 09054f5485 [Glitch] Fix media description not being cleared Christian Schmidt 2023-04-30 02:29:24 +02:00
  • 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream Claire 2023-05-08 15:28:36 +02:00
  • 5d18840ab9
         Fix more JS linting issues (#2212) Claire 2023-05-08 15:16:55 +02:00
  • 9818f34273
         Rewrite Domain component as function component (#24896) fusagiko / takayamaki 2023-05-08 22:12:12 +09:00
  • 5bc8e2d1fd
         Use LayoutType from is_mobile in actions/app (#24863) fusagiko / takayamaki 2023-05-08 22:10:21 +09:00
  • 16c5354b8c
         Fix some more JS linting issues (#2211) Claire 2023-05-08 14:02:41 +02:00
  • 7c1305b3a4
         Add TypeScript support for mastodon alias and image imports (#24895) たいち ひ 2023-05-08 18:28:36 +09:00
  • 76264e3fe8
         Rewrite RadioButton component as FC (#24897) たいち ひ 2023-05-08 18:12:53 +09:00
  • a65d2d1045
         Rewrite Image component as function component (#24893) たいち ひ 2023-05-08 18:12:44 +09:00
  • 490ccbf40b
         Rewrite <NotSignedInIndicator /> as FC (#24903) たいち ひ 2023-05-08 18:12:13 +09:00
  • 6fdbee240c
         Rewrite <Check /> as FC (#24901) たいち ひ 2023-05-08 15:26:02 +09:00
  • 3552ca41fd Fix extra reaction row in status neatchee 2023-05-07 20:32:31 -07:00
  • 12f32b5667 Temporarly disable onboarding modal; we're not tracking the state properly neatchee 2023-05-07 20:01:57 -07:00
  • 78ee5fee10 Fix null ref error, leftover line from merge neatchee 2023-05-07 17:03:28 -07:00
  • 7b9acad400 Fix appearance/show.html.haml neatchee 2023-05-07 16:52:52 -07:00
  • 813433c5f6 Revert "Fix appearance/show.html.haml" neatchee 2023-05-07 16:33:41 -07:00
  • 210a60b38f Revert "Fix missed merge conflict text in version.rb" neatchee 2023-05-07 16:33:38 -07:00
  • cdb0a30501 Remove stale/missed references to makeCustomEmojiMap / EmojiMap neatchee 2023-05-07 16:24:43 -07:00
  • 6d5c018213 Merge latest branch 'feat/emoji_reactions' neatchee 2023-05-07 16:20:37 -07:00
  • 2a8b66ad40 Fix missed merge conflict text in version.rb neatchee 2023-05-07 16:12:37 -07:00
  • 10cfb1c21a Reactions: Return 404 when status should not be visible, asynchronous unreact Jeremy Kescher 2023-05-07 23:27:19 +02:00
  • 6dc97b63ef Remove failing skip_before_action from v1/custom_emojis_controller.rb Jeremy Kescher 2023-05-07 23:15:28 +02:00
  • 177b65d1cf Add missing authorization to ReactService Jeremy Kescher 2023-05-07 22:05:44 +02:00
  • c318930b4a Restore loc files for non-English languages; CrowdIn should handle this neatchee 2023-05-07 15:33:50 -07:00
  • 11add4985a Update emoji reaction patches Jeremy Kescher 2023-05-07 22:01:04 +02:00
  • cde1e8a16f Restoring missing db migrate for reactions. How did this even go missing??? neatchee 2023-05-07 15:00:01 -07:00
  • 628c027049
         Merge remote-tracking branch 'upstream/main' into develop v4.1.2+1.1.0 Jeremy Kescher 2023-05-08 00:38:55 +02:00
  • 4bd3c80038 Reactions: Return 404 when status should not be visible, asynchronous unreact Jeremy Kescher 2023-05-07 23:27:19 +02:00
  • ec687d7edb Remove failing skip_before_action from v1/custom_emojis_controller.rb Jeremy Kescher 2023-05-07 23:15:28 +02:00