Commit Graph

11420 Commits

Author SHA1 Message Date
danidfra fb5003682f Merge remote-tracking branch 'origin/main' into no-untranslated-jsx 2024-10-23 10:44:54 -03:00
danidfra ad878aa6ce Fix arbitrary value classname 2024-10-22 23:03:15 -03:00
danidfra 97036d3c42 Adjust tailwind css classnames order 2024-10-22 22:25:54 -03:00
Alex Gleason 01f00a018c Merge branch 'fix-nest-ternary-expressions' into 'main'
Refactored nest ternary expressions

See merge request soapbox-pub/soapbox!3179
2024-10-23 01:23:00 +00:00
danidfra e63c792d53 Finished 2024-10-22 22:17:03 -03:00
Alex Gleason 242a6ace1a Merge branch 'verify-clear-after' into 'main'
Clear meta.pubkey after verify_credentials

See merge request soapbox-pub/soapbox!3180
2024-10-23 01:16:47 +00:00
Alex Gleason 32e305d1c6
Clear meta.pubkey after verify_credentials 2024-10-22 20:11:33 -05:00
danidfra 62491f6749 Refactored nest ternary expressions 2024-10-22 20:26:07 -03:00
Alex Gleason b032b47359 Merge branch 'nostr-load' into 'main'
Connect to the Nostr relay before calling verify_credentials

See merge request soapbox-pub/soapbox!3178
2024-10-22 23:14:06 +00:00
Alex Gleason 7e16d35f05
Get accountPubkey correctly 2024-10-22 18:01:34 -05:00
Alex Gleason 2b4886615d
Connect to the Nostr relay before calling verify_credentials 2024-10-22 16:52:25 -05:00
Alex Gleason eb54495c10 Merge branch 'fix-bunker-load' into 'main'
Fix infinite loading when signed in with bunker URI

Closes #1767

See merge request soapbox-pub/soapbox!3177
2024-10-22 21:10:15 +00:00
Alex Gleason db203bcb56
Fix infinite loading when signed in with bunker URI
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1767
2024-10-22 16:04:56 -05:00
danidfra 5e97e6e0ef Fix untranslated text warnings
- Fix untranslated text
 - Adjust Tailwind class order
 - Adjust indentation
2024-10-22 16:48:35 -03:00
Alex Gleason d6fb1a4c93 Merge branch 'ditto-staff' into 'main'
AccountModerationModal: allow promoting users to staff on Ditto

See merge request soapbox-pub/soapbox!3175
2024-10-22 16:57:32 +00:00
Alex Gleason 016e2077d4
AccountModerationModal: allow promoting users to staff on Ditto 2024-10-22 11:52:26 -05:00
danidfra 850a9a78d5 Change warn to error 2024-10-22 11:53:26 -03:00
Alex Gleason c712167a27 Merge branch 'fix-admin-account-schema' into 'main'
Make adminAccountSchema less strict

Closes #1766

See merge request soapbox-pub/soapbox!3174
2024-10-22 02:29:46 +00:00
Alex Gleason e35efd60fc
Make adminAccountSchema less strict
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1766
2024-10-21 21:24:29 -05:00
Alex Gleason e5ec33ae88 Merge branch 'bunker' into 'main'
Fix parsing of bunker URI from standards-compliant runtimes

See merge request soapbox-pub/soapbox!3173
2024-10-21 15:56:45 +00:00
Alex Gleason 67c1e7eba5
Fix parsing of bunker URI from standards-compliant runtimes 2024-10-21 10:51:38 -05:00
Alex Gleason 38be26a9e9 Merge branch 'bunker' into 'main'
Add Nostr bunker login

See merge request soapbox-pub/soapbox!3172
2024-10-20 20:49:38 +00:00
Alex Gleason 734169d8c1
Add Nostr bunker login 2024-10-20 15:44:39 -05:00
Alex Gleason b3dd9865ad Merge branch 'madge' into 'main'
Resolve some circular imports

See merge request soapbox-pub/soapbox!3171
2024-10-19 23:29:49 +00:00
Alex Gleason 6194cb8d1c
Fix circular import between statuses/compose actions 2024-10-19 18:23:13 -05:00
Alex Gleason 76a4f6ad57
Fix circular import in NostrSignupModal 2024-10-19 17:45:13 -05:00
Alex Gleason 2a69482201
Fix circular dependency in Group Members 2024-10-19 17:43:30 -05:00
Alex Gleason 18792f3a29
Fix circular dependency in Poll/PollFooter 2024-10-19 17:41:13 -05:00
Alex Gleason d1432f60ee
Add .madgerc 2024-10-19 17:34:32 -05:00
Alex Gleason d19a53434b Merge branch 'coins' into 'main'
Remove cryptocurrency-icons package, vendor in the most popular open source cryptocurrencies

See merge request soapbox-pub/soapbox!3170
2024-10-19 22:01:45 +00:00
Alex Gleason 16658b42ba
Lowercase the ticker symbols 2024-10-19 16:54:22 -05:00
Alex Gleason ef51d127b1
CryptoIcon: improve getIcon dynamic import 2024-10-19 16:41:02 -05:00
Alex Gleason f61fa18835
Remove cryptocurrency-icons package, vendor in the most popular open source cryptocurrencies 2024-10-19 16:38:01 -05:00
Alex Gleason 1a70afe98d Merge branch 'datepicker' into 'main'
Remove react-datepicker, add a custom Datepicker component

See merge request soapbox-pub/soapbox!3169
2024-10-19 20:52:30 +00:00
Alex Gleason c0ee3167b7
Remove react-datepicker, add a custom Datepicker component 2024-10-19 15:46:34 -05:00
Alex Gleason e55743ffdd Merge branch 'ci-rework' into 'main'
Simplify GitLab CI, do everything in one step, switch to manual review apps

See merge request soapbox-pub/soapbox!3167
2024-10-19 19:44:20 +00:00
Alex Gleason f7d16e2adc
Simplify GitLab CI, do everything in one step, switch to manual review apps 2024-10-19 14:29:49 -05:00
Alex Gleason de7a281736 Merge branch 'weblate-soapbox-pub-soapbox' into 'main'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!3168
2024-10-19 19:19:38 +00:00
Hosted Weblate 26c7f0b413
Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
2024-10-19 21:18:05 +02:00
Alex Gleason 5157b7cd76 Merge branch 'rm-pl-admin' into 'main'
Admin refactors

See merge request soapbox-pub/soapbox!3166
2024-10-19 19:17:50 +00:00
Alex Gleason 73e7331851
yarn i18n 2024-10-19 14:00:40 -05:00
Alex Gleason 3cbf8dac00
Remove "admin user index" reducer (and related actions) 2024-10-19 13:32:39 -05:00
Alex Gleason c0f8c9d5e7
Add useAdminAccount hook, refactor admin accounts in dashboard, refactor admin actions 2024-10-19 13:23:08 -05:00
Alex Gleason dde5e9154b
Remove Pleroma moderation API where an equivalent Mastodon endpoint exists 2024-10-19 12:13:08 -05:00
Alex Gleason cf56918f66 Merge branch 'rm-accounts-reducer' into 'main'
Remove accounts reducer

See merge request soapbox-pub/soapbox!3165
2024-10-19 16:41:01 +00:00
Alex Gleason 85fd43a095 Merge branch 'pagination-trends' into 'main'
Pagination trends

Closes ditto#236

See merge request soapbox-pub/soapbox!3163
2024-10-19 16:38:29 +00:00
Alex Gleason c6f179b1be
Remove unused account reducer... 🤦 2024-10-19 11:31:42 -05:00
Alex Gleason 32006407a3
Remove Immutable from accounts reducer 2024-10-19 11:11:40 -05:00
Alex Gleason 12c81d9847 Merge branch 'disable-wasmboy' into 'main'
Disable Wasmboy

See merge request soapbox-pub/soapbox!3164
2024-10-19 04:30:04 +00:00
Alex Gleason eeb74c1d9c
gameboy.tsx: disable eslint 2024-10-18 22:47:33 -05:00