89c9448532
fix conflict
2019-04-01 22:47:37 +03:00
ae3b92ce85
Merge branch 'fix/sending-requests-when-loading' into 'develop'
...
#463 Add Promise.all to send requests when loading
Closes #463
See merge request pleroma/pleroma-fe!723
2019-04-01 19:45:08 +00:00
3b38e1b8a7
Merge branch 'patch-2' into 'develop'
...
Update Polish translation
See merge request pleroma/pleroma-fe!719
2019-04-01 19:44:11 +00:00
46de457f50
Merge branch 'develop' into feature/mobile-improvements-3
2019-04-01 22:42:06 +03:00
2879495b8a
remove window width copypasta
2019-04-01 22:41:34 +03:00
df366a586d
Merge branch '471-timeline-since-id' into 'develop'
...
#471 - fix timeline fetch with since_id
Closes #471
See merge request pleroma/pleroma-fe!722
2019-04-01 19:33:45 +00:00
3c2931529e
Merge branch 'minimal-scopes-mode' into 'develop'
...
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
See merge request pleroma/pleroma-fe!633
2019-04-01 19:32:37 +00:00
90939f198b
Fix login handling
2019-04-01 12:32:13 -07:00
c17de4b638
Merge branch '470-toggle-subject-content' into 'develop'
...
Resolve "Handling subjects/spoiler_text/cw not working properly"
Closes #470
See merge request pleroma/pleroma-fe!721
2019-04-01 18:45:24 +00:00
8fc10dc177
Add Promise.all to send requests when loading
2019-04-01 10:46:30 -07:00
d856c2745c
#471 - fix timeline fetch with since_id
2019-04-01 13:25:48 -04:00
dee9ab7bda
#470 - update button text capitalization
2019-04-01 13:04:40 -04:00
487a194f6d
#470 - handle cases without subject
2019-04-01 13:01:28 -04:00
6847e70a49
#470 - update i18n
2019-04-01 12:58:23 -04:00
748b1ed167
#470 - fix subject and content toggle issue
2019-04-01 12:54:34 -04:00
6c24ae9b0b
Merge branch 'fix/user-card-buttons' into 'develop'
...
#467 Fix/Muted and Blocked not "pressed" on User Card
Closes #467
See merge request pleroma/pleroma-fe!720
2019-04-01 15:38:14 +00:00
80277e5571
Remove useless comma
2019-04-01 07:27:12 -07:00
4a2f676f2e
Fix user card in notification
2019-04-01 07:26:13 -07:00
6828c7d74c
Update Polish translation
2019-03-31 13:50:51 +00:00
0792732822
final touches
2019-03-30 12:42:42 +02:00
4dc64438e9
aaaaggghh
2019-03-30 12:41:42 +02:00
995daf70b7
fix lint
2019-03-30 12:34:13 +02:00
9f4a9bff46
Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
...
* upstream/develop: (173 commits)
Fix: Change condition
fix typo
update store according to retweeted status
#433 - update sort by for conversation
display replies_count right after reply icon
expose replies_count from mastodon api
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
make side drawer use gesture service and fix its animations
review/remove error hiding
errata
review
#433 - sort conversation for retweets and clean up
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
Remove console log
Fix warnings in user profile routing
Add tests for gesture service, fix bug with perpendicular directions
#255 - clean up autocomplete form
#255 - clean up user settings page with self-closing html tags
...
2019-03-30 12:31:50 +02:00
e89a622005
fix formatting
2019-03-30 12:29:28 +02:00
beaf4fcf8a
fix formatting
2019-03-30 12:26:53 +02:00
bf927122df
Review
2019-03-30 12:25:23 +02:00
0117f6af9f
Merge branch 'issues/#465' into 'develop'
...
update store according to retweeted status
Closes #465
See merge request pleroma/pleroma-fe!713
2019-03-29 15:33:16 +00:00
e329a362e0
Merge branch 'fix/warnings-in-user-profile' into 'develop'
...
#461 Fix warnings about user-profile
Closes #461
See merge request pleroma/pleroma-fe!708
2019-03-29 15:32:40 +00:00
e6f9b1517b
Fix: Change condition
2019-03-28 18:43:03 -07:00
25370083b6
Merge branch '255-emoji-input' into 'develop'
...
#255 - add emoji input component
Closes #255
See merge request pleroma/pleroma-fe!706
2019-03-28 21:09:48 +00:00
c06bcf3303
add gesture to close notifications drawer
2019-03-28 22:54:45 +02:00
31010779f6
Merge branch 'develop' into feature/mobile-improvements-3
2019-03-28 22:25:40 +02:00
c829b1a5f4
Merge branch 'feat/gesture-service' into 'develop'
...
Add a gesture service for easier touch gestures
See merge request pleroma/pleroma-fe!714
2019-03-28 20:20:16 +00:00
1e2c304f76
fix typo
2019-03-28 22:11:05 +02:00
ee9aa40001
Merge branch 'issues/#466' into 'develop'
...
show replies count right after reply icon
Closes #466
See merge request pleroma/pleroma-fe!716
2019-03-28 20:09:59 +00:00
7e8c2acc98
Merge branch 'issue-433-status-reply-form' into 'develop'
...
Issue 433 status reply form
Closes #433
See merge request pleroma/pleroma-fe!674
2019-03-28 20:08:40 +00:00
8e4ddcb843
update store according to retweeted status
2019-03-28 13:20:09 -04:00
a39fc49e84
#433 - update sort by for conversation
2019-03-28 10:02:33 -04:00
e24145e233
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
2019-03-28 09:54:55 -04:00
6b5a84e2b3
display replies_count right after reply icon
2019-03-28 03:47:00 -04:00
95639fbd63
expose replies_count from mastodon api
2019-03-28 03:46:41 -04:00
e2e3a65c44
Merge branch 'fix/convos-masto' into 'develop'
...
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
Closes #460
See merge request pleroma/pleroma-fe!715
2019-03-27 20:55:24 +00:00
31a71ee3ee
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
2019-03-27 22:50:19 +02:00
86696167b7
Merge branch 'issue-457-mastodon-tag-timeline' into 'develop'
...
#457 - update tag timeline endpoint to MastoAPI
Closes #457
See merge request pleroma/pleroma-fe!707
2019-03-27 20:44:58 +00:00
0eff4bd0ac
make side drawer use gesture service and fix its animations
2019-03-27 22:44:25 +02:00
30084a1204
merge develop and resolve conflict
2019-03-27 16:41:05 -04:00
aed0943678
Merge branch 'mastoapi/actions' into 'develop'
...
transition to MastoAPI: Basic user/statuses manipulation
See merge request pleroma/pleroma-fe!669
2019-03-27 20:28:55 +00:00
66ab131bd4
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
...
* upstream/develop:
errata
review
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
correctly paginate on MastoAPI
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
wip support for follower/following, a bit broken and with regression
switch direct messages to mastoapi
switch public and TWKN to MastoAPI
undo this change since BE returns empty object for relationship, add in a separate MR
updates normalizer for proper user handling and adds support for friends tl via mastoapi
2019-03-27 22:24:38 +02:00
4d66b9cf45
Merge branch 'mastoapi/followers' into 'develop'
...
MastoAPI support for followers/friends(following)
See merge request pleroma/pleroma-fe!667
2019-03-27 20:18:44 +00:00
c2c7e12aad
review/remove error hiding
2019-03-27 22:18:43 +02:00
shpuld