HJ
d5348c13ff
Merge branch 'issue-380-noification-unread' into 'develop'
...
#380 : fix false alarm for unread notifications
Closes #380
See merge request pleroma/pleroma-fe!614
2019-02-25 20:08:45 +00:00
dave
7dbbd8e270
#380 : simply and remove redundancy
2019-02-25 14:57:56 -05:00
dave
4e8b696797
#380 : fix false alarm for unread notifications
2019-02-25 12:12:49 -05:00
dave
662e6bda14
#390 : fixed the problem loading other user's media data
2019-02-25 10:21:17 -05:00
Shpuld Shpludson
e34e1ccdae
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
2019-02-22 14:54:12 +00:00
Henry Jameson
4136d9cdd1
bad defaults
2019-02-21 19:52:58 +02:00
taehoon
8f608e060c
Just save blocks/mutes instead of adding
2019-02-20 13:30:30 -05:00
taehoon
1fd9a1c7c0
Set blockIds and muteIds to the currentUser state only
2019-02-20 13:30:30 -05:00
taehoon
e91a94ff9c
Add mutes tab
2019-02-20 13:30:30 -05:00
taehoon
8c8a6edc78
Remove pagination support from block-list
2019-02-20 13:30:30 -05:00
taehoon
52913d8f87
Complete functionality of BlockCard
2019-02-20 13:30:30 -05:00
taehoon
a817cc7cb4
Wire up ui to real blocks api data
2019-02-20 13:30:30 -05:00
dave
5251ccd708
#364 : update ap_id error with username
2019-02-19 09:22:42 -05:00
Henry Jameson
f41341b79b
fix notifications
2019-02-14 21:43:32 +02:00
Shpuld Shpludson
b6bac4d06d
Merge branch 'fix/profile-not-loading-without-persisted-state' into 'develop'
...
Fix #324 Profiles sometimes not loading when there's no persisted state
Closes #324
See merge request pleroma/pleroma-fe!553
2019-02-11 13:34:03 +00:00
shpuld
3fb531976a
Change the async stuff to not render app before theme is loaded
2019-02-09 11:26:35 +02:00
Shpuld Shpludson
5296d41372
Merge branch 'fix/js-error-in-tag-page' into 'develop'
...
Fixed JS error in tag page
See merge request pleroma/pleroma-fe!543
2019-02-09 06:56:46 +00:00
Shpuld Shpludson
531f150dd3
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
...
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +00:00
jasper
5b52e020e3
fixing conflicts
2019-02-08 13:20:47 -08:00
jasper
ced29a6482
fixing conflicts
2019-02-08 13:18:50 -08:00
jasper
92874b6902
Fxing conflicts
2019-02-08 13:13:11 -08:00
jasper
70c05a0c08
Fix showFeaturesPanel option as instance
2019-02-08 12:17:14 -08:00
Edijs
0dc7c45f32
Code refactoring
2019-02-07 16:23:18 -07:00
Edijs
19870c0b6d
Fix issue while fetching timelines for tag page
2019-02-06 19:19:43 -07:00
Xiaofeng An
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
dev92341
f2c6dd6581
Add option to hide features panel
2019-02-05 03:57:11 -08:00
shpuld
dbb16d56e2
follows/followers pagination ready for review
2019-02-02 22:29:10 +02:00
shpuld
8ce513ed09
initial draft for follows/following pagination
2019-01-31 21:11:28 +02:00
shpuld
c7cffbb6c7
Merge branch 'develop' into feat/media-modal
2019-01-30 20:49:24 +02:00
shpuld
62e9525724
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
2019-01-29 21:04:52 +02:00
lambda
bd6c446b33
Merge branch 'fix/dont-connect-ws-when-chat-disabled' into 'develop'
...
fix #288 - Don't connect WS when chat is disabled
Closes #288
See merge request pleroma/pleroma-fe!492
2019-01-29 15:57:36 +00:00
shpuld
b042c48fa7
Fix TypeError crash when using url of an invalid user
2019-01-29 17:38:55 +02:00
shpuld
41c4d59341
Connect only after-store instead of when user gets token
2019-01-29 17:16:25 +02:00
lambda
fcd99ebc5b
Merge branch 'fix/make-user-by-name-case-insensitive' into 'develop'
...
Make userByName case-insensitive
See merge request pleroma/pleroma-fe!489
2019-01-28 19:25:25 +00:00
shpuld
a593c2cb8c
Make userByName case-insensitive
2019-01-28 21:21:11 +02:00
shpuld
ca78623b34
fix user tl clearing and give it a test
2019-01-28 20:15:00 +02:00
shpuld
51024a2c8a
Merge branch 'develop' into feat/media-modal
2019-01-28 19:02:46 +02:00
shpuld
0ab828bb30
Merge develop and fix conflict
2019-01-26 17:50:41 +02:00
William Pitcock
7b296696a3
user profile: add media timeline
2019-01-26 13:49:24 +00:00
Henry Jameson
f48e3d0db8
quickfix
2019-01-25 01:39:19 +03:00
Henry Jameson
9d0d6b86c8
this attempts converting id to number to sort them numerically, since "99" >
...
"100" while 99 < 100
2019-01-25 01:08:08 +03:00
Henry Jameson
80a7035154
removing unnecessary conversions since it should already be converted in normalizer
2019-01-17 23:57:24 +03:00
Henry Jameson
8f4fbf8571
some consistency
2019-01-17 23:01:38 +03:00
Henry Jameson
93cbb58212
fix login and favorites tab...
2019-01-17 22:11:51 +03:00
Henry Jameson
cab87744c8
Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not"
...
and some stuff to make favorites still work
This reverts commit 039a407400
.
2019-01-17 21:46:03 +03:00
Henry Jameson
5251de317d
Merge branch 'switch-to-string-ids' into favorites
...
with some changes/merge conflicts resolution
* switch-to-string-ids:
fixx?????
fix notifications?
fix lint
fix tests, removed one unused function, fix real problem that tests helped to surface
added some more explicit to string conversion since BE seem to be sending numbers and it could cause an issue.
Remove all explicit and implicit conversions of statusId to number, changed explicit ones so that they convert them to string
2019-01-17 19:16:45 +03:00
Henry Jameson
387bf794ff
fixx?????
2019-01-16 18:52:30 +03:00
shpuld
e1c3691a72
Add escape button support
2019-01-16 17:27:23 +02:00
Henry Jameson
7d15720339
fix notifications?
2019-01-16 17:30:47 +03:00