Alex Gleason
|
309981a294
|
sw.js: Fix display of RT line in push notifications
|
2022-01-28 11:52:41 -06:00 |
|
Alex Gleason
|
e5e4105a03
|
Fix quote_visible for nested quote
|
2022-01-28 10:17:38 -06:00 |
|
marcin mikołajczak
|
7bb404207a
|
Merge branch 'quote-posts-tombstones' into 'develop'
Add quoted status tombstone
See merge request soapbox-pub/soapbox-fe!1009
|
2022-01-27 23:07:14 +00:00 |
|
Justin
|
f42754ad58
|
Apply 1 suggestion(s) to 1 file(s)
|
2022-01-27 19:56:16 +00:00 |
|
|
|
ae7f2f86a0
|
Add quoted status tombstone
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-27 17:26:39 +01:00 |
|
|
|
bf7cd98c03
|
Add 'View' action link to some notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-27 16:00:05 +01:00 |
|
Alex Gleason
|
0964fc1f4d
|
Add "demo" mode for taking screenshots
|
2022-01-26 19:37:32 -06:00 |
|
|
|
22b3986178
|
PendingStatus: Do not display PlaceholderCard if it has a quote
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-26 19:49:04 +01:00 |
|
|
|
7c790a53eb
|
Add quotes for pending statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-26 19:45:02 +01:00 |
|
|
|
6c11d2f0bf
|
Merge branch 'birthdays' of https://gitlab.com/mkljczk/soapbox-fe into birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-26 18:43:44 +01:00 |
|
|
|
b1bc544a01
|
Birthdays: Use custom header
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-26 18:43:00 +01:00 |
|
|
|
741e80d9ab
|
Birthdays: Try to fix timezones
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 23:37:40 -08:00 |
|
Alex Gleason
|
0f9e01b4a1
|
"birth date" --> "birthday", move the toggle next to the picker
|
2022-01-25 17:08:20 -06:00 |
|
|
|
8277d78f4c
|
Quote posts: Shift+Click for normal repost
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 23:00:30 +01:00 |
|
|
|
ac42b43fab
|
Birthdays: renames
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 21:10:13 +01:00 |
|
|
|
ecfef7b151
|
Merge remote-tracking branch 'soapbox/develop' into birthdays
|
2022-01-25 20:27:16 +01:00 |
|
|
|
980f5f8ae3
|
Birthdays: use maxDate
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 16:51:15 +01:00 |
|
Alex Gleason
|
d36f0f7aae
|
Merge branch 'recipients-inline' into 'develop'
Status: strip compatibility features from markup when importing
See merge request soapbox-pub/soapbox-fe!1004
|
2022-01-25 02:53:26 +00:00 |
|
Alex Gleason
|
462df83989
|
Status: strip compatibility features from markup when importing
|
2022-01-24 20:39:22 -06:00 |
|
Alex Gleason
|
35ab65efcf
|
Hide recipients inlined by ForceMentionsInContent MRF
|
2022-01-24 19:14:44 -06:00 |
|
marcin mikołajczak
|
72cc60f880
|
Merge branch 'profile-avatar-switcher' into 'develop'
Improve account headers
See merge request soapbox-pub/soapbox-fe!801
|
2022-01-25 00:00:39 +00:00 |
|
|
|
240f68a4d6
|
AccountHeader: remove .page__top__no-header
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 00:37:44 +01:00 |
|
|
|
3d2e4ab368
|
Merge remote-tracking branch 'origin/develop' into profile-avatar-switcher
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 00:37:12 +01:00 |
|
Alex Gleason
|
c3a82cb777
|
StatusContent: delete inline quote from markup
|
2022-01-24 17:31:34 -06:00 |
|
|
|
e0d7f2dd87
|
Birthdays: Accessibility improvements/fixes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 23:51:22 +01:00 |
|
|
|
bcc0e0983b
|
Birthdays: use the new route
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 23:33:16 +01:00 |
|
|
|
7da12b1526
|
Merge remote-tracking branch 'soapbox/develop' into birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 23:12:07 +01:00 |
|
Alex Gleason
|
2d5acc3236
|
Merge branch 'quote-posts' into 'develop'
Quoting poats, quoting poasts or whatever it's called
Closes #809
See merge request soapbox-pub/soapbox-fe!1002
|
2022-01-24 21:50:27 +00:00 |
|
Alex Gleason
|
bd3c74f566
|
Prevent a quoted status overriding the quote of its parent
|
2022-01-24 15:08:22 -06:00 |
|
Alex Gleason
|
aebc653bd9
|
Importer: remove the extremely stupid pushUnique function
|
2022-01-24 14:37:10 -06:00 |
|
Alex Gleason
|
93e7efba05
|
Fedibird: fall back to quote_id
|
2022-01-24 13:58:52 -06:00 |
|
Alex Gleason
|
9abeb2a324
|
Importer: handle multiple statuses from Fedibird
|
2022-01-24 13:27:13 -06:00 |
|
Alex Gleason
|
5c755c8f9b
|
Quote post performance improvements
|
2022-01-24 13:23:29 -06:00 |
|
Alex Gleason
|
9f98fcff09
|
Fedibird compatibility, because why not
|
2022-01-24 12:58:39 -06:00 |
|
|
|
af9b69271b
|
change reblogIcon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 18:47:10 +01:00 |
|
|
|
22a70a7595
|
Quote posts: Compose box improvements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 18:18:10 +01:00 |
|
|
|
fc0a5aea9c
|
Normalization, process quotes in importFetchedStatuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 16:52:15 +01:00 |
|
|
|
67006fdc34
|
Fix normal reblogging
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 16:31:55 +01:00 |
|
|
|
c5e34de79a
|
Do not use reblogIcon before initialization
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 00:18:20 +01:00 |
|
|
|
b0363607c8
|
Quote posts: do not mention anyone
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-24 00:07:26 +01:00 |
|
|
|
289cdcc776
|
Use dropdown for reposts, do not display cards for quote posts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 22:15:25 +01:00 |
|
|
|
15d4910db5
|
wip quote post composing
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 18:44:17 +01:00 |
|
|
|
c0bee9be3c
|
Display quoted posts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 17:55:03 +01:00 |
|
Alex Gleason
|
1956184290
|
Merge branch 'status-card-description-styles' into 'develop'
Limit number of lines in .status-card__description
See merge request soapbox-pub/soapbox-fe!1001
|
2022-01-23 14:55:49 +00:00 |
|
|
|
024bd40cfb
|
Limit number of lines in .status-card__description
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 13:00:01 +01:00 |
|
|
|
bae4455f8c
|
birth_date -> birthday, hide_birth_date -> show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 12:53:48 +01:00 |
|
|
|
97d09317ae
|
Modal improvements, profile information
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-22 13:08:20 +01:00 |
|
|
|
d6f0023cc9
|
Add birthday reminder notification
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-20 22:39:58 +01:00 |
|
|
|
409cb3819e
|
Show birth date field on registration page when required
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-20 00:21:40 +01:00 |
|
|
|
5e76b5afca
|
Birth dates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-19 21:47:37 +01:00 |
|
marcin mikołajczak
|
70c79ce297
|
Merge branch 'chat-no-self-reports' into 'develop'
Do not let users report their own chat messages
See merge request soapbox-pub/soapbox-fe!999
|
2022-01-19 08:19:05 +00:00 |
|
|
|
050ee1a5f0
|
Do not let users report their own chat messages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-19 09:03:04 +01:00 |
|
marcin mikołajczak
|
84acbe93c6
|
Merge branch 'account-endorsements' into 'develop'
Fix account endorsements
See merge request soapbox-pub/soapbox-fe!998
|
2022-01-18 10:56:41 +00:00 |
|
|
|
251f9a4b2c
|
Fix account endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 11:41:40 +01:00 |
|
marcin mikołajczak
|
5c862645eb
|
Merge branch 'implicit-mentions-fix' into 'develop'
Mentions regex should be case-insensitive
See merge request soapbox-pub/soapbox-fe!997
|
2022-01-17 19:41:29 +00:00 |
|
|
|
58ab54cd9e
|
Mentions regex should be case-insensitive
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-17 20:26:45 +01:00 |
|
Isabell Deinschnitzel
|
123a55305f
|
Update de.json - Reply to "und weitere Nutzer" (experimentell)
|
2022-01-16 21:34:38 +00:00 |
|
Isabell Deinschnitzel
|
ead6bc322e
|
Update de.json - "Reply to"
|
2022-01-16 15:00:09 +00:00 |
|
Isabell Deinschnitzel
|
49365b7ce0
|
Update de.json
|
2022-01-16 13:04:37 +00:00 |
|
|
|
774f0ab6b9
|
Fix typo in Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-15 20:40:58 +01:00 |
|
|
|
0647394f5f
|
Fix crash in pending_status_builder
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-15 14:29:32 +01:00 |
|
NEETzsche
|
5fed85891f
|
Support the blockers_visible option when it's available
|
2022-01-14 18:06:31 -07:00 |
|
Alex Gleason
|
c89fcb80d2
|
Revert "Merge branch 'revert-db7c7b36' into 'develop'"
This reverts merge request !989
|
2022-01-14 21:35:28 +00:00 |
|
Alex Gleason
|
0a81556ad1
|
Revert "Merge branch 'pending-replying-to' into 'develop'"
This reverts merge request !986
|
2022-01-14 21:33:53 +00:00 |
|
Alex Gleason
|
fe3e74d71d
|
Merge branch 'account-endorsements' into 'develop'
User endorsements
See merge request soapbox-pub/soapbox-fe!982
|
2022-01-14 17:49:57 +00:00 |
|
Alex Gleason
|
db7c7b3644
|
Merge branch 'pending-replying-to' into 'develop'
Add "Replying to ..." to pending statuses
Closes #804
See merge request soapbox-pub/soapbox-fe!986
|
2022-01-14 17:49:41 +00:00 |
|
|
|
454b6a6f72
|
Fix: recent change reverted view context in expanded media view link
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-14 16:46:53 +01:00 |
|
|
|
b77a934088
|
Add "Replying to ..." to pending statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-13 23:37:47 +01:00 |
|
|
|
a32a34879d
|
PinnedAccounts: add icon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-13 22:31:04 +01:00 |
|
|
|
7aef1d923b
|
Merge remote-tracking branch 'origin/develop' into account-endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-13 22:29:32 +01:00 |
|
Alex Gleason
|
15d32c3b83
|
MFA: pass scopes to MFA challenge
|
2022-01-12 12:40:40 -06:00 |
|
Alex Gleason
|
f675e7992a
|
MfaForm: improve styles and usability
|
2022-01-12 12:39:01 -06:00 |
|
Alex Gleason
|
e94acbc44f
|
MFA: setupMfa/confirmMfa, throw errors to component, don't be optimistic
|
2022-01-12 11:22:46 -06:00 |
|
|
|
0a160f4422
|
User endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-12 18:20:27 +01:00 |
|
Alex Gleason
|
c1cfd2ca2a
|
MFA login: be less sensitive about the error response
|
2022-01-12 10:52:28 -06:00 |
|
Alex Gleason
|
6c3dfe3528
|
i18n: de.json restore "Oops!"
|
2022-01-12 00:56:05 +00:00 |
|
Isabell Deinschnitzel
|
d5b6f153fa
|
Update de.json 120122
|
2022-01-12 00:40:33 +00:00 |
|
marcin mikołajczak
|
e4a181bc2d
|
Merge branch 'gallery-style-fix' into 'develop'
Fix padding on empty media gallery page
See merge request soapbox-pub/soapbox-fe!983
|
2022-01-11 22:55:22 +00:00 |
|
|
|
ed34158446
|
Fix empty media gallery (account page) style
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-11 23:42:26 +01:00 |
|
Alex Gleason
|
783e194359
|
Merge branch 'fix-login-error' into 'develop'
LoginPage: fix crash
See merge request soapbox-pub/soapbox-fe!981
|
2022-01-11 17:21:25 +00:00 |
|
Alex Gleason
|
0ceed56f99
|
LoginPage: fix crash
|
2022-01-11 11:06:43 -06:00 |
|
Alex Gleason
|
1fee3eb0ac
|
LoadingSpinner: fix two warnings
|
2022-01-11 09:50:30 -06:00 |
|
Alex Gleason
|
ac88038166
|
DevelopersChallenge: 'fizz|buzz' --> 'soap|box'
|
2022-01-10 21:31:48 -06:00 |
|
Alex Gleason
|
d2363d63bd
|
Settings: allow immediately saving a changed setting, fixes #800
|
2022-01-10 21:26:10 -06:00 |
|
Alex Gleason
|
6323c7d70e
|
eslint: enforce gaps between groups with import/order
|
2022-01-10 16:25:06 -06:00 |
|
Alex Gleason
|
966ca91e1a
|
eslint: alphabetize imports with import/order
|
2022-01-10 16:17:52 -06:00 |
|
Alex Gleason
|
2a0e2001d6
|
eslint: enforce import/order
|
2022-01-10 16:01:24 -06:00 |
|
marcin mikołajczak
|
e0322916d1
|
Merge branch 'shortcuts-fix' into 'develop'
Fix hotkeys modal 'link'
See merge request soapbox-pub/soapbox-fe!977
|
2022-01-09 16:15:51 +00:00 |
|
|
|
7121201825
|
Fix hotkeys modal 'link'
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-09 16:56:11 +01:00 |
|
marcin mikołajczak
|
0a14e9a247
|
Merge branch 'filter-bar-animation' into 'develop'
FilterBar: remove handleKeyDown
See merge request soapbox-pub/soapbox-fe!976
|
2022-01-08 23:23:19 +00:00 |
|
|
|
a960fe4d6a
|
FilterBar: or actually implement it properly
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-09 00:10:47 +01:00 |
|
|
|
90a55f2626
|
FilterBar: remove handleKeyDown
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-09 00:05:56 +01:00 |
|
marcin mikołajczak
|
e1475e0ba5
|
Merge branch 'scheduled' into 'develop'
Scheduled statuses improvements
Closes #797
See merge request soapbox-pub/soapbox-fe!974
|
2022-01-08 12:45:11 +00:00 |
|
|
|
cb856863b5
|
change icon for confirmation modal
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-08 13:29:23 +01:00 |
|
|
|
8114f7ed95
|
Do not insert pending statuses for scheduled statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-08 13:28:33 +01:00 |
|
|
|
154eab8273
|
Ask for confirmation before canceling scheduled post
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-08 13:13:19 +01:00 |
|
|
|
3c5a66648b
|
Only show scheduled status media attachments if there are any
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-08 13:01:44 +01:00 |
|
Alex Gleason
|
af556d75b6
|
Merge branch 'developers-challenge' into 'develop'
Developers: add challenge to become a developer
See merge request soapbox-pub/soapbox-fe!973
|
2022-01-08 02:05:31 +00:00 |
|
Alex Gleason
|
ef49cf911c
|
Developers: add "Leave developers" button
|
2022-01-07 19:50:13 -06:00 |
|
Alex Gleason
|
3af8313b42
|
Developers: add challenge to become a developer
|
2022-01-07 19:27:18 -06:00 |
|
marcin mikołajczak
|
4fce574c52
|
Merge branch 'placeholder-style' into 'develop'
Fix hashtag placeholder style
See merge request soapbox-pub/soapbox-fe!972
|
2022-01-07 23:27:05 +00:00 |
|
Alex Gleason
|
c80d00e67f
|
Merge branch 'reply-to-order' into 'develop'
Statuses: fix order of mentions
See merge request soapbox-pub/soapbox-fe!971
|
2022-01-07 23:23:05 +00:00 |
|
marcin mikołajczak
|
a22bf22786
|
Merge branch 'mentions-modal' into 'develop'
Fetch status context in mentions modal
See merge request soapbox-pub/soapbox-fe!969
|
2022-01-07 23:16:08 +00:00 |
|
Alex Gleason
|
93ee2a6ab7
|
Replying-to: fix order of mentions
|
2022-01-07 17:09:43 -06:00 |
|
|
|
4a2e632a07
|
Fix hashtag placeholder style
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-08 00:09:41 +01:00 |
|
Alex Gleason
|
6f702a4d0e
|
Merge branch 'developers-edit-settings' into 'develop'
Developers: add ability to edit raw settings JSON
See merge request soapbox-pub/soapbox-fe!968
|
2022-01-07 22:28:26 +00:00 |
|
marcin mikołajczak
|
928bfa9f78
|
Merge branch 'i18n-' into 'develop'
Run manage:translations, update Polish translation
See merge request soapbox-pub/soapbox-fe!970
|
2022-01-07 22:26:18 +00:00 |
|
|
|
ed0e02da04
|
Run manage:translations, update Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-07 23:13:42 +01:00 |
|
Alex Gleason
|
29521de80e
|
Gate developers pages from non-developers
|
2022-01-07 16:10:53 -06:00 |
|
|
|
f05ea0d845
|
Fix: Mentions modal doesn't fetch accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-07 23:04:48 +01:00 |
|
Alex Gleason
|
d270e92927
|
Developers: add ability to edit raw settings JSON
|
2022-01-07 15:59:50 -06:00 |
|
Alex Gleason
|
2fd5e5cd35
|
Refactor MFA setup, fixes #792
|
2022-01-07 14:26:19 -06:00 |
|
marcin mikołajczak
|
8192c93873
|
Merge branch 'mentions-modal' into 'develop'
Fix modals
See merge request soapbox-pub/soapbox-fe!962
|
2022-01-07 00:02:57 +00:00 |
|
|
|
b0477ac1e1
|
fix broken modals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-07 00:50:32 +01:00 |
|
Alex Gleason
|
782da14272
|
Add Home timeline filters to Preferences
|
2022-01-06 15:30:05 -06:00 |
|
marcin mikołajczak
|
9e198902a9
|
Merge branch 'mentions-modal' into 'develop'
Replace link to /reblogs, require authentication
See merge request soapbox-pub/soapbox-fe!960
|
2022-01-06 20:10:19 +00:00 |
|
|
|
bf3272d113
|
Replace link to /reblogs, require authentication
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 20:55:06 +01:00 |
|
marcin mikołajczak
|
e7355e88b3
|
Merge branch 'chats-styles' into 'develop'
Fix chat compose box on mobile devices
See merge request soapbox-pub/soapbox-fe!959
|
2022-01-06 18:18:13 +00:00 |
|
|
|
cdfe88af9e
|
Fix chat compose box on mobile devices
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 19:05:24 +01:00 |
|
|
|
5e31c12063
|
FilterBar: Do not trap Tab, Home/End keys
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 19:01:14 +01:00 |
|
|
|
98e11bbb37
|
Merge branch 'develop' into filter-bar-animation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 18:58:51 +01:00 |
|
marcin mikołajczak
|
df47c0c789
|
Merge branch 'mentions-modal' into 'develop'
Turn some pages into modals
See merge request soapbox-pub/soapbox-fe!958
|
2022-01-06 17:43:46 +00:00 |
|
|
|
7bc924caa2
|
FilterBar: conditional animation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 18:19:32 +01:00 |
|
marcin mikołajczak
|
831a3418f9
|
Merge branch 'just-messing-around' into 'develop'
Add headers to confirmation modals
See merge request soapbox-pub/soapbox-fe!942
|
2022-01-06 17:09:08 +00:00 |
|
|
|
95bdfb6c2f
|
FilterBar: handle resize
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 18:06:38 +01:00 |
|
|
|
f28a6c5256
|
Add max-height to the new modals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 17:52:43 +01:00 |
|
|
|
2d3784eb88
|
Minor changes, port 'Generalize “press back to close modal” to any modal and to public pages' from Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 17:45:10 +01:00 |
|
|
|
06e3b95a29
|
change label
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 16:51:34 +01:00 |
|
|
|
46ca470f01
|
Turn some pages into modals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-06 14:43:58 +01:00 |
|
|
|
149f677ab4
|
Merge remote-tracking branch 'origin/develop' into a11y
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-05 22:25:03 +01:00 |
|
|
|
b06596bbb6
|
Filter bar animation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-05 22:03:54 +01:00 |
|
Isabell Deinschnitzel
|
8fa620930b
|
Update de.json
|
2022-01-05 19:33:25 +00:00 |
|
Isabell Deinschnitzel
|
dd625a3b8a
|
Update de.json
|
2022-01-05 14:30:54 +00:00 |
|
Alex Gleason
|
4c66126c01
|
Explicit addressing: remove "Show thread" button, handle StatusReplyMentions edge cases, fixes #793
|
2022-01-04 20:28:49 -06:00 |
|
Alex Gleason
|
dc49ef9999
|
ReplyMentions: to.length --> to.size, fix bug replying to self
|
2022-01-04 20:27:58 -06:00 |
|
marcin mikołajczak
|
3dffc46fc1
|
Support explicit addressing
|
2022-01-04 20:06:08 +00:00 |
|
|
|
c36a47fd17
|
Interactions: optimistic unreblogs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-04 16:57:01 +01:00 |
|
marcin mikołajczak
|
cd4e33a8ed
|
Merge branch 'reblog-modal-styles' into 'develop'
Unset line-height for modals action bar
See merge request soapbox-pub/soapbox-fe!952
|
2022-01-03 23:24:06 +00:00 |
|
|
|
6e49cf1aca
|
Unset line-height for modals action bar
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-04 00:08:21 +01:00 |
|
|
|
1541b97e1a
|
Actually fix reblogs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-03 23:30:29 +01:00 |
|
|
|
11107c6df9
|
Merge remote-tracking branch 'origin/develop' into just-messing-around
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-03 18:52:22 +01:00 |
|
Alex Gleason
|
76a1f27b2a
|
Merge branch 'authorized-profile-actions' into 'develop'
AccountHeader: restrict privileged actions, fixes #713
Closes #713
See merge request soapbox-pub/soapbox-fe!950
|
2022-01-03 17:15:32 +00:00 |
|
Alex Gleason
|
67a9d014af
|
AccountHeader: restrict privileged actions, fixes #713
|
2022-01-03 11:10:58 -06:00 |
|
Alex Gleason
|
992f3285ae
|
Merge branch 'staff-only' into 'develop'
Restrict pages access by unauthorized users
Closes #640
See merge request soapbox-pub/soapbox-fe!949
|
2022-01-03 17:10:44 +00:00 |
|
Alex Gleason
|
52a857d296
|
Restrict pages access by unauthorized users
|
2022-01-03 10:56:17 -06:00 |
|
|
|
49d61f84e1
|
fix reblogs with confirmation modal enabled
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-03 17:27:31 +01:00 |
|
marcin mikołajczak
|
9c6f805499
|
Remote interactions modal
|
2022-01-02 20:43:53 +00:00 |
|
marcin mikołajczak
|
18e9da0a1d
|
Merge branch 'reactions-column' into 'develop'
Add column headers to some more pages
See merge request soapbox-pub/soapbox-fe!947
|
2022-01-01 23:14:32 +00:00 |
|
marcin mikołajczak
|
6174c1553b
|
Merge branch 'account-lookup' into 'develop'
Use account lookup in fetchAccountByUsername
See merge request soapbox-pub/soapbox-fe!941
|
2022-01-01 23:05:52 +00:00 |
|
|
|
bda323ea7d
|
Add column headers to some more pages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-02 00:02:11 +01:00 |
|
marcin mikołajczak
|
79909a2efd
|
Merge branch 'reactions-column' into 'develop'
Add column header to reactions page
See merge request soapbox-pub/soapbox-fe!946
|
2022-01-01 22:57:38 +00:00 |
|
|
|
4417b8010f
|
Add column header to users page in dashboard
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-01 23:45:38 +01:00 |
|
|
|
28b72dc01d
|
Add column header to reactions page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-01 23:41:25 +01:00 |
|
marcin mikołajczak
|
09ca967226
|
Merge branch 'sub-navigation-styles' into 'develop'
Another PlaceholderStatus style fix
Closes #787
See merge request soapbox-pub/soapbox-fe!945
|
2021-12-31 18:41:25 +00:00 |
|
|
|
9a2338f44b
|
Another PlaceholderStatus style fix
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-31 19:24:00 +01:00 |
|
|
|
bb1ac3e3b7
|
Add lazy load to emoji-mart
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-31 13:59:33 +01:00 |
|
|
|
809b875ae3
|
Add headlines to confirmation modals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 18:50:02 +01:00 |
|
marcin mikołajczak
|
d9735c6fa1
|
Merge branch 'report-modal-close-button' into 'develop'
Fix close button in report modal
See merge request soapbox-pub/soapbox-fe!943
|
2021-12-30 17:20:14 +00:00 |
|
|
|
182576393c
|
Fix close button in report modal
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 18:05:39 +01:00 |
|
|
|
6805e88b69
|
Use account lookup in fetchAccountByUsername
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 16:29:05 +01:00 |
|
|
|
fc3b9d62a6
|
Support account subscriptions on Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 16:13:45 +01:00 |
|
marcin mikołajczak
|
02d6574ede
|
Merge branch 'modal-styles' into 'develop'
Minor styles improvements
See merge request soapbox-pub/soapbox-fe!939
|
2021-12-30 14:46:40 +00:00 |
|
Alex Gleason
|
40c1b85314
|
Merge branch 'filters-style' into 'develop'
Slightly restyle filtered statuses
Closes #760
See merge request soapbox-pub/soapbox-fe!937
|
2021-12-30 14:27:34 +00:00 |
|
marcin mikołajczak
|
0cc4640440
|
Merge branch 'select-icon' into 'develop'
Fix dropdown icon
Closes #788
See merge request soapbox-pub/soapbox-fe!938
|
2021-12-30 12:31:02 +00:00 |
|
|
|
ab886e647c
|
Minor styles improvements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 13:25:50 +01:00 |
|
|
|
cf46c45baf
|
Fix dropdown icon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 13:15:34 +01:00 |
|
|
|
e897c39908
|
Slightly restyle filtered statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 12:31:09 +01:00 |
|
|
|
988552e29b
|
Show 'Follows you' in profile directory
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 12:08:28 +01:00 |
|
marcin mikołajczak
|
52dabed829
|
Merge branch 'account-lookup' into 'develop'
Use /lookup for username availability with Pleroma
See merge request soapbox-pub/soapbox-fe!935
|
2021-12-29 23:45:58 +00:00 |
|
|
|
b5b089ac7d
|
Use /lookup for username availability with Pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-30 00:31:09 +01:00 |
|
Alex Gleason
|
c1f36f2fc7
|
Merge branch 'sub-navigation-styles' into 'develop'
Fix: PlaceholderStatus not flush against SubNavigation
Closes #787
See merge request soapbox-pub/soapbox-fe!933
|
2021-12-28 20:14:07 +00:00 |
|
|
|
be84e439d0
|
Fix: PlaceholderStatus not flush against SubNavigation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 20:44:38 +01:00 |
|
|
|
3a7da5d8d5
|
Check username availability
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 19:11:21 +01:00 |
|
marcin mikołajczak
|
2c89008403
|
Merge branch 'profile-directory' into 'develop'
Profile directory
See merge request soapbox-pub/soapbox-fe!931
|
2021-12-26 23:01:59 +00:00 |
|
Alex Gleason
|
a6dc420b70
|
Merge branch 'profile-directory' into 'develop'
Profile directory
See merge request soapbox-pub/soapbox-fe!927
|
2021-12-26 22:23:56 +00:00 |
|
|
|
57d06414c1
|
fix styling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-26 22:49:41 +01:00 |
|
|
|
0efe6f6a00
|
Use some icon from Tabler for profile directory
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-26 22:47:19 +01:00 |
|
|
|
d5e565e766
|
Add to /settings/profile
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-26 22:44:43 +01:00 |
|
marcin mikołajczak
|
955687d719
|
Merge branch 'search-race-condition' into 'develop'
Fix another race condition in search results
See merge request soapbox-pub/soapbox-fe!929
|
2021-12-26 10:54:47 +00:00 |
|
|
|
b79e760b65
|
Fix another race condition in search results
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-26 11:39:05 +01:00 |
|
|
|
e3d2b44bdc
|
Profile directory: styles, cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-25 18:23:26 +01:00 |
|
marcin mikołajczak
|
835cdbb576
|
Merge branch 'line-awesome-fixes' into 'develop'
Fix calendar icon in post composer
See merge request soapbox-pub/soapbox-fe!928
|
2021-12-25 15:09:50 +00:00 |
|
|
|
734c6863c5
|
fix some icons
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-25 15:58:42 +01:00 |
|
|
|
a829f429f7
|
use instance title
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-25 01:17:14 +01:00 |
|
|
|
10f7339e5c
|
Profile directories, adapted from Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-22 21:22:29 +01:00 |
|
Alex Gleason
|
6143f8ddfb
|
Merge branch 'tabs-bar-links' into 'develop'
Show nav bar links when in dashboard
See merge request soapbox-pub/soapbox-fe!926
|
2021-12-20 21:56:45 +00:00 |
|
|
|
5979aa14f8
|
Show nav bar links when in dashboard
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-20 22:41:40 +01:00 |
|
Alex Gleason
|
cd236f1e1d
|
ShowablePassword: switch icons
|
2021-12-20 10:28:34 -06:00 |
|
marcin mikołajczak
|
f86fa3b508
|
Merge branch 'replace-icons' into 'develop'
fix suitcase icon stroke-width in sidebar
See merge request soapbox-pub/soapbox-fe!924
|
2021-12-19 22:57:55 +00:00 |
|
|
|
5be9d05cc3
|
fix suitcase icon stroke-width
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-19 23:43:15 +01:00 |
|
Alex Gleason
|
280210ebe5
|
Merge branch 'placeholder-attachments' into 'develop'
PendingStatus: display placeholder attachments
See merge request soapbox-pub/soapbox-fe!922
|
2021-12-18 23:25:44 +00:00 |
|
|
|
6cc20ff42a
|
PendingStatus: display placeholder attachments
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-19 00:11:14 +01:00 |
|
Alex Gleason
|
4cfa59f110
|
Merge branch 'replace-icons' into 'develop'
enlarge media modal close button
See merge request soapbox-pub/soapbox-fe!923
|
2021-12-18 16:12:35 +00:00 |
|
|
|
ea11857a64
|
enlarge media modal close button
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-18 16:57:44 +01:00 |
|
Alex Gleason
|
829744dcce
|
Merge branch 'replace-icons' into 'develop'
Change icons for federation restrictions page
See merge request soapbox-pub/soapbox-fe!921
|
2021-12-16 22:48:00 +00:00 |
|
|
|
30bc5889cd
|
Change icons for federation restrictions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-16 23:33:22 +01:00 |
|
Alex Gleason
|
9800c7db98
|
Merge branch 'replace-icons' into 'develop'
Replace LineAwesome with Tabler icons in some more places
See merge request soapbox-pub/soapbox-fe!920
|
2021-12-16 22:24:39 +00:00 |
|
|
|
951faf04bb
|
Change icon for briefcase
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-16 23:11:28 +01:00 |
|
|
|
99e3ec9ff9
|
Replace LineAwesome with Tabler icons in some more places
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-16 23:05:33 +01:00 |
|
Alex Gleason
|
ec00f23d7e
|
Merge branch 'initial-home-feed' into 'develop'
UI: fix the way initial data is loaded
See merge request soapbox-pub/soapbox-fe!918
|
2021-12-15 15:51:56 +00:00 |
|
Alex Gleason
|
165feae622
|
Update snapshots
|
2021-12-15 10:49:13 -05:00 |
|
Alex Gleason
|
55ba4bd106
|
ShowablePassword, IconButton: submit on Enter
|
2021-12-15 10:46:25 -05:00 |
|
Alex Gleason
|
e283afe191
|
UI: fix the way initial data is loaded
|
2021-12-15 10:29:07 -05:00 |
|
Alex Gleason
|
2c3d700cc6
|
Admin: fix rejectUserModal import
|
2021-12-15 10:14:34 -05:00 |
|
Alex Gleason
|
7f3d7fbc29
|
Merge branch 'showable-password' into 'develop'
Create ShowablePassword component
See merge request soapbox-pub/soapbox-fe!916
|
2021-12-15 15:07:33 +00:00 |
|
|
|
81abb7d49e
|
update snapshots
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-15 15:39:07 +01:00 |
|
|
|
a1c7da7f62
|
no point in passing type=password
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-15 15:29:25 +01:00 |
|
|
|
4274b13aa7
|
Add ShowablePassword component
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-15 15:26:34 +01:00 |
|
Alex Gleason
|
1b7c0adc58
|
Merge branch 'replace-icons' into 'develop'
Replace LineAwesome with Tabler icons in some places
See merge request soapbox-pub/soapbox-fe!915
|
2021-12-14 19:04:24 +00:00 |
|
|
|
efe74c3ddd
|
remove size prop for them
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-14 19:51:59 +01:00 |
|
|
|
68e05c803b
|
Replace LineAwesome with Tabler Icons in some places
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-14 19:48:18 +01:00 |
|
Alex Gleason
|
74d26b36ac
|
Merge branch 'awaiting-approval-modals' into 'develop'
Admin: Make account approval buttons larger, require confirmation when deleting users
See merge request soapbox-pub/soapbox-fe!914
|
2021-12-14 16:22:19 +00:00 |
|
|
|
acce32cf1b
|
Make approval buttons larger, require confirmation when deleting users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-14 17:00:20 +01:00 |
|
Alex Gleason
|
ff26336f3a
|
Merge branch 'chats-pagination' into 'develop'
use `/api/v2/pleroma/chats`
See merge request soapbox-pub/soapbox-fe!911
|
2021-12-14 15:13:11 +00:00 |
|
|
|
6a48948af7
|
Use old chats list API conditionally
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-14 13:38:59 +01:00 |
|
|
|
53497c2132
|
Chats: Create next link if not provided
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-14 13:25:08 +01:00 |
|
Alex Gleason
|
ef17a483ab
|
Suggestions: don't show suggestions if Home timeline failed
|
2021-12-13 14:25:06 -05:00 |
|
|
|
12e4c6c083
|
wip chat pagination
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-13 18:06:47 +01:00 |
|
NEETzsche
|
07fa906eaf
|
Your followers from a blocked domain will not be removed
|
2021-12-13 09:33:23 -07:00 |
|
Alex Gleason
|
72763d1495
|
Properly filter DMs from timelines
|
2021-12-12 22:34:10 -06:00 |
|
Alex Gleason
|
b706024e31
|
Merge branch 'search-race-condition' into 'develop'
Fix: Race condition in search
See merge request soapbox-pub/soapbox-fe!908
|
2021-12-12 20:30:30 +00:00 |
|
|
|
d66b2e10f2
|
Fix: Race condition in search
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-12 20:35:45 +01:00 |
|
Alex Gleason
|
01cd832680
|
Merge branch 'detailed-status-menu' into 'develop'
Don't show menu items requiring auth when not authenticated for detailed statuses
See merge request soapbox-pub/soapbox-fe!907
|
2021-12-11 21:03:29 +00:00 |
|
|
|
f52b69ebbb
|
Don't show menu items requiring auth when not authenticated for detailed statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-11 21:51:10 +01:00 |
|
Alex Gleason
|
5e7aa7b28f
|
Merge branch 'dropdown-menu-styles' into 'develop'
DropdownMenu: Decrease vertical padding
See merge request soapbox-pub/soapbox-fe!906
|
2021-12-11 18:56:31 +00:00 |
|
|
|
13716e1348
|
It looks uneven when first/last item is hovered
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-11 19:41:42 +01:00 |
|
Alex Gleason
|
7d3e5b0d7a
|
Merge branch 'dropdown-menu-styles' into 'develop'
DropdownMenu style changes
See merge request soapbox-pub/soapbox-fe!905
|
2021-12-11 18:41:38 +00:00 |
|
|
|
5b75687185
|
DropdownMenu style changes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-11 19:29:12 +01:00 |
|
|
|
6a3d70bfff
|
Update Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-11 10:22:15 +01:00 |
|
Alex Gleason
|
73208ebe4b
|
Mastodon: redirect ActivityPub ID for statuses
|
2021-12-10 16:05:28 -06:00 |
|
Alex Gleason
|
aaad79f6a5
|
Auth: logIn, don't create an unnecessary app token
|
2021-12-06 15:33:06 -05:00 |
|
Alex Gleason
|
4357b6322a
|
PullToRefresh: don't transform the loading indicator
|
2021-12-02 23:11:02 -06:00 |
|
Alex Gleason
|
0b0e7188e3
|
PullToRefresh: switch back to the old loading indicator for now
|
2021-12-02 22:37:08 -06:00 |
|
Alex Gleason
|
94f3133dd4
|
Merge branch 'ptr-improvements' into 'develop'
PullToRefresh improvements
See merge request soapbox-pub/soapbox-fe!898
|
2021-12-02 21:54:36 +00:00 |
|
Alex Gleason
|
d6bc8d8b6c
|
PullToRefresh: use iOS style spinner
|
2021-12-02 15:38:26 -06:00 |
|
Alex Gleason
|
c57d50aa4e
|
PullToRefresh: increase pull resistance and threshold
|
2021-12-02 14:11:40 -06:00 |
|
Alex Gleason
|
ed2866a1e1
|
Profile: add "Share" button as primary action to own profile
|
2021-12-01 14:08:44 -06:00 |
|
Alex Gleason
|
4c11a3041f
|
v2 Suggestions: conditionally display admin actions
|
2021-11-26 23:53:50 -06:00 |
|
Alex Gleason
|
92439137c1
|
v2 Suggestions: add AdminAPI, rearrange sidebars, check instance feature flag
|
2021-11-26 23:36:17 -06:00 |
|
Alex Gleason
|
bd9c8a8770
|
Link to manifest.json
|
2021-11-24 16:56:40 -06:00 |
|
Alex Gleason
|
665d7a1e1f
|
Merge branch 'eslint-rules' into 'develop'
eslint: add key-spacing and space-unary-ops rules
See merge request soapbox-pub/soapbox-fe!890
|
2021-11-24 18:10:46 +00:00 |
|
|
|
4e04f06142
|
eslint: add key-spacing and space-unary-ops rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-24 18:28:35 +01:00 |
|
Alex Gleason
|
b528c4aa63
|
Contexts: check for cyclical in_reply_tos and prevent stitching them with tombstones
|
2021-11-23 15:17:12 -06:00 |
|
Alex Gleason
|
b76bb097f2
|
Status: protect against infinite context loops
|
2021-11-23 15:12:50 -06:00 |
|
Alex Gleason
|
679617c877
|
Revert "MaterialStatus: stack avatars on top"
This reverts commit a9a84f6701.
|
2021-11-22 20:35:38 -06:00 |
|
Alex Gleason
|
cb4a394f09
|
Revert "MaterialStatus: improve padding for stacked avatar"
This reverts commit 33fa8d0204.
|
2021-11-22 20:35:29 -06:00 |
|
Alex Gleason
|
33fa8d0204
|
MaterialStatus: improve padding for stacked avatar
|
2021-11-22 17:07:19 -06:00 |
|
Alex Gleason
|
a9a84f6701
|
MaterialStatus: stack avatars on top
|
2021-11-22 15:01:18 -06:00 |
|
Alex Gleason
|
dbf72550dc
|
Merge branch 'fix-chat-autosuggest-input' into 'develop'
Chats: fix styling of autosuggest account in main pane
See merge request soapbox-pub/soapbox-fe!885
|
2021-11-21 18:58:15 +00:00 |
|
Alex Gleason
|
09f941a79c
|
Merge branch 'chats-attachments-icon' into 'develop'
Add icons for chat previews with attachments
See merge request soapbox-pub/soapbox-fe!884
|
2021-11-21 18:44:53 +00:00 |
|
