Commit graph

4003 commits

Author SHA1 Message Date
Alex Gleason
6735598f6c Merge branch 'funding-gh' into 'develop'
Move FUNDING.yml to .github/FUNDING.yml

See merge request soapbox-pub/soapbox-fe!1241
2022-04-18 21:21:30 +00:00
Alex Gleason
daed253cae
Move FUNDING.yml to .github/FUNDING.yml 2022-04-18 16:20:40 -05:00
Alex Gleason
fc587f1093 Merge branch 'funding-fix' into 'develop'
FUNDING.yml: fix custom link

See merge request soapbox-pub/soapbox-fe!1240
2022-04-18 21:13:46 +00:00
Alex Gleason
9eae46d2b5
FUNDING.yml: link to actual docs 2022-04-18 16:11:23 -05:00
Alex Gleason
5609af521f
FUNDING.yml: fix custom link 2022-04-18 16:09:50 -05:00
Alex Gleason
4eb8391a1e Merge branch 'liberapay' into 'develop'
FUNDING.yml: add Liberapay

See merge request soapbox-pub/soapbox-fe!1234
2022-04-18 01:09:55 +00:00
Alex Gleason
1e68f3bada
FUNDING.yml: add Liberapay 2022-04-17 20:09:16 -05:00
Alex Gleason
2a2e771b94 Merge branch 'funding-yml' into 'develop'
Add FUNDING.yml

See merge request soapbox-pub/soapbox-fe!1233
2022-04-17 23:58:30 +00:00
Alex Gleason
7e208a0e99
Add FUNDING.yml 2022-04-17 18:57:22 -05:00
marcin mikołajczak
db7816d3e5 Merge branch 'status-notification-type' into 'develop'
Support 'status' notification type

See merge request soapbox-pub/soapbox-fe!1221
2022-04-14 20:24:58 +00:00
0b3509b5bd Support 'status' notification type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-04-14 22:08:53 +02:00
Alex Gleason
d99f6a8c60 Merge branch 'almereyda-develop-patch-63615' into 'develop'
README

See merge request soapbox-pub/soapbox-fe!1209
2022-04-12 22:34:19 +00:00
jon r
cf218e41ef README
Upstream changed the location of the document about the differences between the Pleroma and Mastodon APIs.
2022-04-12 22:13:37 +00:00
Alex Gleason
6c78ff1507 Merge branch 'ts-memory-limit' into 'develop'
ForkTsCheckerWebpackPlugin: increase typescript memory limit to 8GB, fixes #865

Closes #865

See merge request soapbox-pub/soapbox-fe!1207
2022-04-12 17:39:46 +00:00
Alex Gleason
7394452ad9
ForkTsCheckerWebpackPlugin: increase typescript memory limit to 8GB, fixes #865 2022-04-12 12:38:19 -05:00
Alex Gleason
61101009ed Merge branch 'develop' into 'develop'
Grammatical fix for birthday reminder text

See merge request soapbox-pub/soapbox-fe!1198
2022-04-10 19:46:25 +00:00
Sean Meininger
570fd25a70 Grammatical fix for birthday reminder text 2022-04-10 12:18:44 -07:00
marcin mikołajczak
dbdcdcc9da Merge branch 'language-pl' into 'develop'
Update Polish translation

See merge request soapbox-pub/soapbox-fe!1154
2022-03-26 22:19:36 +00:00
7f7d3ed2ee Update Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-26 23:03:14 +01:00
Alex Gleason
37c8402daf Merge branch 'filter-by-mentions' into 'develop'
Fix filtering, allow filtering by mentioned usernames

See merge request soapbox-pub/soapbox-fe!1150
2022-03-26 16:02:50 +00:00
Alex Gleason
f7425d80eb
Add test for search_index with mentions 2022-03-26 10:45:45 -05:00
ea57d1c4a7 Fix filtering, allow filtering by mentioned usernames
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-26 10:57:48 +01:00
Alex Gleason
4782afed18 Merge branch 'react-router-5' into 'develop'
Upgrade react-router-dom to v5.3

See merge request soapbox-pub/soapbox-fe!1111
2022-03-21 20:49:17 +00:00
Alex Gleason
c9cef587a6
Merge remote-tracking branch 'origin/develop' into react-router-5 2022-03-21 15:30:26 -05:00
Alex Gleason
f00cd1fd07 Merge branch 'fe-config-fix' into 'develop'
Typescript: utils/config_db.ts

See merge request soapbox-pub/soapbox-fe!1121
2022-03-21 00:56:51 +00:00
Alex Gleason
fb9c665e3e
Typescript: utils/config_db.ts 2022-03-20 19:40:08 -05:00
Alex Gleason
83a49e7d35 Merge branch 'fe-config-fix' into 'develop'
Fix Soapbox Config

Closes #864

See merge request soapbox-pub/soapbox-fe!1120
2022-03-20 23:54:59 +00:00
Alex Gleason
b3de700732
Fix Soapbox Config 2022-03-20 18:41:47 -05:00
Alex Gleason
77c7f34e4a Merge branch 'fix-862' into 'develop'
Fix calculateStatus export

Closes #862

See merge request soapbox-pub/soapbox-fe!1117
2022-03-19 22:45:37 +00:00
Alex Gleason
a59daacc04
Fix calculateStatus export 2022-03-19 17:29:46 -05:00
Alex Gleason
f6ff401bd1 Merge branch 'ts-reducers' into 'develop'
Typescript: reducers/accounts.ts, reducers/statuses.ts

See merge request soapbox-pub/soapbox-fe!1115
2022-03-19 20:20:49 +00:00
Alex Gleason
47653546de
Statuses reducer: refactor search_index 2022-03-19 15:04:28 -05:00
Alex Gleason
9d79b60134
Typescript: reducers/statuses.ts 2022-03-19 14:41:16 -05:00
Alex Gleason
b71a592f95
Typescript: reducers/accounts.ts 2022-03-19 14:22:52 -05:00
Alex Gleason
21eda6a179 Merge branch 'tailwind' into 'develop'
Add Tailwind

See merge request soapbox-pub/soapbox-fe!1114
2022-03-19 18:41:19 +00:00
Alex Gleason
09b9df7c80
Add Tailwind 2022-03-19 13:24:16 -05:00
Alex Gleason
13018cf809 Merge branch 'redux-immutable-type' into 'develop'
Improve redux-immutable type definition

See merge request soapbox-pub/soapbox-fe!1113
2022-03-19 18:10:54 +00:00
Alex Gleason
5248b20547
Improve redux-immutable type definition 2022-03-19 12:54:10 -05:00
Alex Gleason
04960163c7 Merge branch 'ts-redux' into 'develop'
TS Redux

See merge request soapbox-pub/soapbox-fe!1098
2022-03-18 21:46:49 +00:00
Alex Gleason
ed692c8bef
Fix build >:( 2022-03-18 16:23:14 -05:00
Alex Gleason
454f1e3e8d
Lint redux-immutable/index.d.ts 2022-03-18 16:09:36 -05:00
Alex Gleason
12c57e02a5
Fix Instance types 2022-03-18 16:04:08 -05:00
Alex Gleason
a81424262a
gitlab-ci: lint on ts/tsx changes 2022-03-18 15:36:15 -05:00
Alex Gleason
c420e83bff
Throw out accidental badge.tsx changes 2022-03-18 15:35:22 -05:00
Alex Gleason
c8c5a6b077
Merge remote-tracking branch 'origin/develop' into ts-redux 2022-03-18 15:33:56 -05:00
Alex Gleason
7abe7ac258 Merge branch 'ts-redux-first' into 'develop'
TS redux conversions

See merge request soapbox-pub/soapbox-fe!1099
2022-03-18 20:31:44 +00:00
Alex Gleason
e3c60647dc
tsconfig: exclude Jest files 2022-03-18 15:17:32 -05:00
Alex Gleason
3be0ddaa25
Merge remote-tracking branch 'origin/develop' into ts-redux-first 2022-03-18 13:17:19 -05:00
Alex Gleason
0daa53c03c
Fix Typescript eslint 2022-03-18 13:16:59 -05:00
Alex Gleason
8d2dd08348 Merge branch 'revert-db38d3cd' into 'develop'
Revert "Merge branch 'msw' into 'develop'"

See merge request soapbox-pub/soapbox-fe!1112
2022-03-18 17:20:27 +00:00