Brenden Bice
8c9bcdc6c1
rename favourite to favorite
2019-04-11 23:26:12 -04:00
Brenden Bice
0c3a922341
use promisedRequest for api call
2019-04-11 23:26:12 -04:00
Brenden Bice
85457fc917
fetch reblogged users
2019-04-11 23:26:12 -04:00
Brenden Bice
2d339cd3b8
fetch favorited users
2019-04-11 23:26:12 -04:00
dave
40e9eebf91
#436 - merge develop
2019-04-10 12:54:33 -04:00
Henry Jameson
18cb97a2bd
Fix wrong local
2019-04-10 15:02:14 +03:00
dave
d498a26af5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-09 15:42:05 -04:00
Henry Jameson
dfd89b0bbc
revert, it's still missing
2019-04-09 22:28:36 +03:00
Henry Jameson
d95fc02810
add support for pleroma-specific fields
2019-04-09 22:26:57 +03:00
Shpuld Shpludson
1e9ddcb0da
Merge branch 'fix/notification-bugs' into 'develop'
...
#474 Fix notification bugs
Closes #474
See merge request pleroma/pleroma-fe!728
2019-04-09 15:24:33 +00:00
dave
d3218807b4
#436 - merge develop
2019-04-08 21:04:59 -04:00
jasper
a1275be4c0
Separate timeline and notification
2019-04-04 09:03:56 -07:00
jasper
ea27483f27
Fix notification bugs
2019-04-03 09:04:46 -07:00
dave
8b3f037f87
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-04-02 10:07:36 -04:00
eugenijm
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
shpuld
46de457f50
Merge branch 'develop' into feature/mobile-improvements-3
2019-04-01 22:42:06 +03:00
shpuld
2879495b8a
remove window width copypasta
2019-04-01 22:41:34 +03:00
dave
21ea5adc8b
#436 - apply patch and clean up
2019-03-31 21:59:18 -04:00
dave
06fd3a9c5f
#436 - apply patch
2019-03-31 14:50:34 -04:00
dave
0db66e2905
#436 - keep original naming
2019-03-31 13:41:22 -04:00
dave
8efcfc69e8
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-03-31 11:03:43 -04:00
Shpuld Shpludson
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
dave
783cc00dd0
merge develop & resolve conflict
2019-03-29 10:11:28 -04:00
jasper
e6f9b1517b
Fix: Change condition
2019-03-28 18:43:03 -07:00
Shpuld Shpludson
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
shpuld
1e2c304f76
fix typo
2019-03-28 22:11:05 +02:00
Shpuld Shpludson
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
Brenden Bice
95639fbd63
expose replies_count from mastodon api
2019-03-28 03:46:41 -04:00
dave
30084a1204
merge develop and resolve conflict
2019-03-27 16:41:05 -04:00
Henry Jameson
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
Henry Jameson
c2c7e12aad
review/remove error hiding
2019-03-27 22:18:43 +02:00
Henry Jameson
a5e71d1dd1
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* upstream/develop:
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
switch direct messages to mastoapi
switch public and TWKN to MastoAPI
2019-03-27 22:14:26 +02:00
Henry Jameson
ff18e339cf
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* upstream/develop:
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
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:12:51 +02:00
Henry Jameson
fb2aca06de
review
2019-03-27 22:02:46 +02:00
HJ
ea50f55148
Merge branch 'develop' into 'masto-api/direct'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-27 19:48:41 +00:00
dave
578b412177
#457 - merge develop and resolve conflict
2019-03-27 11:09:30 -04:00
Henry Jameson
b3a6bec17b
Revert "Merge branch 'revert-987b5162' into 'develop'"
...
This reverts commit 96753e6a5f
, reversing
changes made to 987b5162a7
.
2019-03-27 11:17:04 +02:00
jasper
ab99d5ef95
Fix warnings in user profile routing
2019-03-26 13:35:08 -07:00
shpuld
c50e64f8ee
Add tests for gesture service, fix bug with perpendicular directions
2019-03-26 22:11:45 +02:00
dave
982be05873
#457 - update tag timeline endpoint to MastoAPI
2019-03-26 11:40:34 -04:00
dave
5fd589d5e7
merge develop & resolve conflict
2019-03-26 10:52:46 -04:00
shpuld
e23c19468a
somewhat functioning gesture service
2019-03-25 22:44:58 +02:00
HJ
04217fc660
Merge branch 'develop' into 'mastoapi/friends-tl'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-25 19:21:48 +00:00
Henry Jameson
d766059dee
correctly update relationship on follow/unfollow
2019-03-25 21:19:24 +02:00
Henry Jameson
82f077feb9
fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
2019-03-25 21:12:54 +02:00
Henry Jameson
0ffd43954e
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
...
* upstream/develop: (87 commits)
review
Update attachment normalizer
Add fallback for attachments uploaded via the other platforms
Get correct mimetype through entity_normalizer
Set default parameter
Switch to mastoapi for posting status and uploading media
Revert changes
prevent text pasting if image is pasted
remove border radius of suggested emojis
#450 - dispatch login after saved state is loaded
#448 - fix timeline fetch error when status text is null
#451 - add class to username span
No need to fetch mutes on load anymore 🙌
switch to mastoapi
switch to mastoapi
masto api sends muted property now
No need to fetch user data using old api anymore 🎉
Switch to mastoapi
reactivity fixes
less hackery, more direct usage of mastoapi
...
2019-03-25 21:12:15 +02:00
HJ
3025532ecf
Merge branch 'develop' into 'mastoapi/public-tl'
...
# Conflicts:
# src/services/api/api.service.js
2019-03-25 19:09:22 +00:00
Henry Jameson
72749834f3
Merge remote-tracking branch 'upstream/develop' into masto-api/direct
...
* upstream/develop: (40 commits)
review
Update attachment normalizer
Add fallback for attachments uploaded via the other platforms
Get correct mimetype through entity_normalizer
Set default parameter
Switch to mastoapi for posting status and uploading media
Revert changes
prevent text pasting if image is pasted
remove border radius of suggested emojis
#450 - dispatch login after saved state is loaded
#448 - fix timeline fetch error when status text is null
#451 - add class to username span
No need to fetch mutes on load anymore 🙌
switch to mastoapi
switch to mastoapi
masto api sends muted property now
No need to fetch user data using old api anymore 🎉
Switch to mastoapi
reactivity fixes
less hackery, more direct usage of mastoapi
...
2019-03-25 21:06:58 +02:00
Henry Jameson
968e6c7fe8
correctly paginate on MastoAPI
2019-03-25 21:04:52 +02:00
Henry Jameson
50960c7cfc
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
...
* upstream/develop: (87 commits)
review
Update attachment normalizer
Add fallback for attachments uploaded via the other platforms
Get correct mimetype through entity_normalizer
Set default parameter
Switch to mastoapi for posting status and uploading media
Revert changes
prevent text pasting if image is pasted
remove border radius of suggested emojis
#450 - dispatch login after saved state is loaded
#448 - fix timeline fetch error when status text is null
#451 - add class to username span
No need to fetch mutes on load anymore 🙌
switch to mastoapi
switch to mastoapi
masto api sends muted property now
No need to fetch user data using old api anymore 🎉
Switch to mastoapi
reactivity fixes
less hackery, more direct usage of mastoapi
...
2019-03-25 20:32:12 +02:00
shpuld
b13a751926
start creating gesture service
2019-03-25 20:27:44 +02:00
Henry Jameson
3b5fc88989
Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
...
* upstream/develop: (34 commits)
Update attachment normalizer
Add fallback for attachments uploaded via the other platforms
Get correct mimetype through entity_normalizer
Set default parameter
Switch to mastoapi for posting status and uploading media
Revert changes
prevent text pasting if image is pasted
remove border radius of suggested emojis
#450 - dispatch login after saved state is loaded
#448 - fix timeline fetch error when status text is null
#451 - add class to username span
No need to fetch mutes on load anymore 🙌
switch to mastoapi
switch to mastoapi
masto api sends muted property now
No need to fetch user data using old api anymore 🎉
Switch to mastoapi
Add comment
Reset statusnet_blocking of all fetched users first while refreshing block list
Add hideMutedPosts setting and wire up to post-returning endpoints
...
2019-03-25 19:54:15 +02:00
taehoon
932652e335
Update attachment normalizer
2019-03-25 12:19:33 -04:00
taehoon
6fdbc182ca
Add fallback for attachments uploaded via the other platforms
2019-03-24 21:16:57 -04:00
taehoon
909c315a44
Get correct mimetype through entity_normalizer
2019-03-24 21:16:57 -04:00
taehoon
966add1b29
Set default parameter
2019-03-24 21:16:57 -04:00
taehoon
9802344603
Switch to mastoapi for posting status and uploading media
2019-03-24 21:16:56 -04:00
HJ
01d0531699
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Transition to MastoAPI: Mute & Block and Add Mutes management tab
See merge request pleroma/pleroma-fe!611
2019-03-24 17:15:21 +00:00
Shpuld Shpludson
f86a5dc804
Merge branch 'issue-448-status-text-null' into 'develop'
...
#448 - fix timeline fetch error when status text is null
Closes #448
See merge request pleroma/pleroma-fe!700
2019-03-23 14:17:47 +00:00
dave
d70928792d
#448 - fix timeline fetch error when status text is null
2019-03-22 13:15:11 -04:00
lambda
277790e462
Merge branch '438-mastoapi-user-search' into 'develop'
...
Transition to MastoAPI: user search
Closes #438
See merge request pleroma/pleroma-fe!677
2019-03-22 11:16:25 +00:00
taehoon
a64e744c1b
switch to mastoapi
2019-03-21 21:53:24 -04:00
taehoon
8702d23a13
switch to mastoapi
2019-03-21 21:44:59 -04:00
taehoon
af85a3f244
Switch to mastoapi
2019-03-21 21:27:10 -04:00
Henry Jameson
67719e9a23
less hackery, more direct usage of mastoapi
2019-03-21 23:45:18 +02:00
Henry Jameson
307b4ba698
Merge remote-tracking branch 'upstream/develop' into mastoapi/convos
...
* upstream/develop: (47 commits)
#449 - fix auth token fetch issue
Make select tag use --inputText as text color
#444 - remote follow clean up
#444 - show `remote follow` button when logged out
Add button to save without cropping
post-merge fixes
[i18n] Update oc.json
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
...
2019-03-21 22:40:20 +02:00
taehoon
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
Henry Jameson
fe13b1b75a
Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl
...
* upstream/develop: (47 commits)
#449 - fix auth token fetch issue
Make select tag use --inputText as text color
#444 - remote follow clean up
#444 - show `remote follow` button when logged out
Add button to save without cropping
post-merge fixes
[i18n] Update oc.json
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
...
2019-03-21 22:28:29 +02:00
taehoon
333afd2138
Minor code refactoring
2019-03-21 16:26:15 -04:00
taehoon
d65422a6a5
Improve fetch error handling using a util
2019-03-21 16:26:13 -04:00
taehoon
302310a653
Remove old muting logic
2019-03-21 16:19:09 -04:00
taehoon
3255950b0e
Add mute/unmute featrue and mutes management tab
2019-03-21 16:19:03 -04:00
Henry Jameson
faef769b40
Merge remote-tracking branch 'upstream/develop' into masto-api/direct
...
* upstream/develop: (47 commits)
#449 - fix auth token fetch issue
Make select tag use --inputText as text color
#444 - remote follow clean up
#444 - show `remote follow` button when logged out
Add button to save without cropping
post-merge fixes
[i18n] Update oc.json
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
...
2019-03-21 22:11:02 +02:00
Shpuld Shpludson
66e60572bc
Merge branch 'issue-449-auto-token-fetch' into 'develop'
...
#449 - fix auth token fetch issue
Closes #449
See merge request pleroma/pleroma-fe!696
2019-03-21 16:12:33 +00:00
dave
db3b48d444
#449 - fix auth token fetch issue
2019-03-21 12:04:57 -04:00
Shpuld Shpludson
57cd6f8018
Merge branch 'feature/version-info' into 'develop'
...
Added new tab to display versions of BE/FE
Closes #397
See merge request pleroma/pleroma-fe!671
2019-03-21 15:25:59 +00:00
dave
13e727b5ee
#436 : sync notification with timeline
2019-03-18 14:42:09 -04:00
dave
060d3b0713
#436 : implement is_seen logic
2019-03-18 12:30:34 -04:00
dave
55d7bd6d4e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
2019-03-18 10:37:26 -04:00
dave
241503346f
#436 : clean up based on comment
2019-03-17 10:08:01 -04:00
Henry Jameson
4cdfd5fb86
post-merge fixes
2019-03-17 14:41:05 +02:00
Henry Jameson
30c0cafff1
Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis
...
* upstream/develop: (34 commits)
after store: fix setting postFormats field
fix user-card avatar falling into permament failed state
fix flake id users not fetching correctly
fix console error
afterStoreSetup: Move log in and theme load to afterStoreSetup.
afterStoreSetup: Handle 404 cases.
afterStoreSetup: Emoji and nodeinfo refactor.
afterStoreSetup: refactor TOS and panel fetching, handle 404s.
afterStoreSetup: refactor.
Load persistedStated with async/await.
whoops
レインせんぱいにサンキュー
fix embedded relationship card parsing
actually use embedded relationship if it's present
instead of filtering nulls, let's just not have them in the first place
#434 - fix plain text issue
Add floating post-status button on mobile
Update user settings icon to pencil
I18n: Update Czech translation
user_card.vue: Copy over .status-content img styling
...
2019-03-17 13:32:56 +02:00
dave
e5786f32a7
#436 : merge develop
2019-03-15 11:28:33 -04:00
taehoon
6e60873a3d
Switch to mastoapi for user search
2019-03-15 11:03:11 -04:00
dave
935aae054f
#436 : add is_local for statuses
2019-03-14 22:07:42 -04:00
dave
52326e6551
#436 : remove clear & dismiss UI updates
2019-03-14 11:57:24 -04:00
dave
e5e1d4c643
#436 : fix notification order, follow type link issue, duplicate key
2019-03-14 07:55:39 -04:00
dave
93a2510ede
#436 : update is_local
2019-03-13 15:43:48 -04:00
dave
78951964fb
#436 : update entity_normalizer
2019-03-13 15:34:45 -04:00
dave
2f7d890ad2
#436 : add dismiss button, disable is_seen part
2019-03-13 14:08:03 -04:00
dave
cd9a7dd488
#436 : integrate mastoAPI notifications
2019-03-12 17:16:57 -04:00
Henry Jameson
27cbe3ca65
レインせんぱいにサンキュー
2019-03-12 22:10:22 +02:00
Henry Jameson
ce8b5fcd11
fix embedded relationship card parsing
2019-03-12 21:49:03 +02:00
Henry Jameson
b9877a4323
actually use embedded relationship if it's present
2019-03-11 23:45:24 +02:00
Henry Jameson
a6a162177b
instead of filtering nulls, let's just not have them in the first place
2019-03-11 23:08:09 +02:00
Henry Jameson
4efcda1b41
Added some tests
2019-03-11 22:41:08 +02:00
Edijs
8952761370
Version links to BE/FE
2019-03-10 18:06:51 -07:00
Edijs
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
Henry Jameson
4a5aef8883
basic user and status actions implemented
2019-03-10 19:15:07 +02:00
Henry Jameson
0b1506a4c0
wip support for follower/following, a bit broken and with regression
2019-03-10 18:05:51 +02:00
Henry Jameson
49b0f0a04a
Fetching convos via MastoAPI. Had to change conversation component a bit for
...
better support, since MastoAPI doesn't have coversation ids
2019-03-09 18:33:49 +02:00
Henry Jameson
47211fb32c
emoji adder
2019-03-09 02:23:50 +02:00
Henry Jameson
4f3a220487
Since BE doesn't support fetching user by screen name over MastoAPI we'll gonna
...
just fetching it over QvitterAPI real quick :DDDDDDDDD
2019-03-08 22:40:57 +02:00
Henry Jameson
853e0bc26f
switch to mastoapi for user timeline
2019-03-08 00:50:58 +02:00
Henry Jameson
ee49409049
Partially transitioned user data to MastoAPI. Added support for fetching
...
relationship data. Upgraded code to be more resilient to nulls caused by missing
data in either APIs
2019-03-08 00:35:30 +02:00
Henry Jameson
6e2946f352
switch direct messages to mastoapi
2019-03-07 20:21:07 +02:00
Henry Jameson
8522063b2c
switch public and TWKN to MastoAPI
2019-03-07 20:16:35 +02:00
Henry Jameson
c038d0c12a
undo this change since BE returns empty object for relationship, add in a
...
separate MR
2019-03-07 20:04:29 +02:00
Henry Jameson
2e59ab738b
updates normalizer for proper user handling and adds support for friends tl via mastoapi
2019-03-07 19:49:41 +02:00
Shpuld Shpludson
c44f0a9bde
Merge branch 'fix/fetch-activities-by-last-id' into 'develop'
...
#406 Fetch activities by last id
See merge request pleroma/pleroma-fe!621
2019-03-07 05:06:43 +00:00
Shpuld Shpludson
6f903016a4
Merge branch 'fix/fetching-error-by-tag' into 'develop'
...
#402 Fix fetching error by tag
See merge request pleroma/pleroma-fe!622
2019-03-02 15:48:54 +00:00
jasper
c26f32ed92
Fix fetching error by tag
2019-03-01 10:20:25 -08:00
Shpuld Shpludson
53e104dc32
Merge branch 'issue-388-request-count-broken' into 'develop'
...
#388 : get follow request on a real-time basis
Closes #388
See merge request pleroma/pleroma-fe!619
2019-03-01 18:03:30 +00:00
dave
cccf33d6dd
#388 : update naming properly
2019-02-28 12:53:37 -05:00
taehoon
cb383df517
Fix bug to get wrapped component prop name list
2019-02-28 12:40:22 -05:00
Shpuld Shpludson
dc01f90dde
Merge branch '386-display-invalid-user-profile' into 'develop'
...
Show error message when visit profile page of invalid user
Closes #386
See merge request pleroma/pleroma-fe!606
2019-02-28 17:19:14 +00:00
jasper
4d026baf17
Fix fetching error by tag
2019-02-27 18:14:42 -08:00
jasper
9aec49bacb
Fetch activites by last id
2019-02-27 17:45:08 -08:00
Maxim Filippov
2c7406d9a8
Add OAuth Tokens management to settings
2019-02-28 04:04:26 +03:00
dave
7c6446a9de
#388 : get follow request on a real-time basis
2019-02-27 14:38:10 -05:00
taehoon
b78227456e
Better error handling
2019-02-26 12:26:04 -05:00
taehoon
e687b58091
Show error message when visit profile page of invalid user
2019-02-26 11:08:13 -05:00
dave
4e8b696797
#380 : fix false alarm for unread notifications
2019-02-25 12:12:49 -05:00
taehoon
32c112bc96
Remove pagination logic in fetchBlocks api
2019-02-20 13:30:31 -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
a817cc7cb4
Wire up ui to real blocks api data
2019-02-20 13:30:30 -05:00
Shpuld Shpludson
0e1295edea
Merge branch 'follow-requests-for-locked-accounts' into 'develop'
...
Follow Request notification count for restricted accounts
See merge request pleroma/pleroma-fe!561
2019-02-19 16:38:05 +00:00
lambda
a842cadd15
Parameter name changed.
2019-02-16 16:09:14 +00:00
eugenijm
d831b81912
Added follow requests counter to nav bar to make it visible behorehand
2019-02-15 12:49:00 +03: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 Shpludson
0e6134b32e
Merge branch 'issue-332-update-follow-tabs' into 'develop'
...
#332 - add follow/not follow button to follow list
See merge request pleroma/pleroma-fe!558
2019-02-11 13:29:58 +00:00
Edijs
fc26f1852e
Merge branch 'develop' into fix/hashtag-opening
2019-02-10 11:59:19 -07:00
dave
4b18989fef
#332 - add follow/not follow button to follow list
2019-02-09 23:05:23 -05:00
shpuld
3fb531976a
Change the async stuff to not render app before theme is loaded
2019-02-09 11:26:35 +02:00
HJ
62b3b9b8d4
Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'
...
Add admin and moderator indicators to the user profile
See merge request pleroma/pleroma-fe!519
2019-02-07 22:45:08 +00:00
Edijs
c0b833cb85
Added tag extractor method and spec
2019-02-07 14:46:10 -07:00
dave
bd24c615d1
#315 - revert changes
2019-02-07 09:59:12 -05:00
dave
3128417176
#315 - separate export and fetch follows logic
2019-02-07 09:57:16 -05:00
dave
a3a9949a21
#315 - clean up the request
2019-02-06 13:18:54 -05:00
dave
2f12ac7ea4
#315 - export all follows as CSV
2019-02-06 11:17:23 -05:00
eugenijm
648f635429
Allow to configure visibility for admin and moderator badges
2019-02-06 18:07:10 +03:00
eugenijm
c714eb2600
Add admin and moderator indicators to the user card
2019-02-06 18:04:21 +03:00
Maxim Filippov
0c5c889850
Rename "hide_following" to "hide_follows"
2019-02-06 14:21:13 +03:00
Maxim Filippov
18594569bd
Split hide_network into hide_followers & hide_followings
2019-02-06 02:59:59 +03:00
shpuld
54e7e0e31b
merge develop and fix conflicts AGAIN
2019-02-04 19:49:23 +02:00
Shpuld Shpludson
d4991d0162
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld
b614cb94e5
merge develop in
2019-02-03 10:13:09 +02:00
shpuld
dbb16d56e2
follows/followers pagination ready for review
2019-02-02 22:29:10 +02:00
eugenijm
b62d2c76e5
Use integer type of notitication ids (avoid redundant casting for getting maxId in addNewNotifications)
2019-02-02 18:40:47 +03: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
lambda
b1facdf7ad
Merge branch 'fix/timeline-too-eager-flush' into 'develop'
...
Fix #290 Add a better check for fresh TL flushing
Closes #290
See merge request pleroma/pleroma-fe!494
2019-01-30 17:51:12 +00:00
lambda
1717e70046
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
...
fix #292 dont show "load more" when bottomed out
Closes #292
See merge request pleroma/pleroma-fe!496
2019-01-30 17:49:27 +00:00
lambda
7b0e3dc471
Merge branch 'feat/make-mentions-use-internal-routing' into 'develop'
...
Fix #289 Make more user links use internal routing
Closes #289
See merge request pleroma/pleroma-fe!500
2019-01-30 17:46:18 +00:00
shpuld
15603981f8
Capture clicks on statuses to hijack mention clicks, match mention href to user somehow
2019-01-30 19:24:47 +02:00
Maxim Filippov
298cea8f6d
Split hide_network into hide_followers & hide_followings
2019-01-30 01:11:40 +03: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
shpuld
89bfc41174
Add a better check for fresh TL flushing
2019-01-29 18:40:49 +02:00
shpuld
51024a2c8a
Merge branch 'develop' into feat/media-modal
2019-01-28 19:02:46 +02:00
William Pitcock
b27ec058ca
entity normalizer: add support for opengraph cards
2019-01-28 05:50:12 +00:00
lain
e4303da372
Properly handle websocket token (fixes chat).
2019-01-27 21:38:33 +01:00
shpuld
b9142e6fac
Move following to qvitter only space
2019-01-27 16:10:55 +02:00
shpuld
4c9f3b946d
Add forgotten prop to entity normalizer
2019-01-27 08:42:34 +02:00
shpuld
0ab828bb30
Merge develop and fix conflict
2019-01-26 17:50:41 +02:00
shpuld
3978aaef84
Redo everything in the MR
2019-01-26 17:45:03 +02:00
William Pitcock
dbe0205a9c
api service: add the ability to fetch a media-only timeline
2019-01-26 13:49:24 +00:00
lambda
28d1571530
Merge branch 'hotfix/summary-html' into 'develop'
...
entity normalizer: provide summary_html property
See merge request pleroma/pleroma-fe!475
2019-01-25 10:10:27 +00:00
William Pitcock
5e68161d91
entity normalizer: provide summary_html property
...
Mastodon API returns HTML always in spoiler_text, while TwitterAPI sends both a
text version as well as an HTML version of the message subject, which we started
to use when we allowed custom emoji in message subjects.
2019-01-25 10:05:19 +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
HJ
8b7faa8106
Merge branch 'favorites-fixes' into 'develop'
...
fix reply-to tooltip being somewhat unreliable
See merge request pleroma/pleroma-fe!473
2019-01-24 18:05:09 +00:00
Maxim Filippov
958557201a
Always send "hide_network" when updating user profile
2019-01-23 19:46:35 +03:00
Henry Jameson
61c9ecd855
fix reply-to tooltip being somewhat unreliable
2019-01-23 00:10:26 +03:00
HJ
c8caa477d7
Revert "fix reply-to tooltip being somewhat unreliable"
...
This reverts commit 66dc72deb2
2019-01-22 21:08:28 +00:00
Henry Jameson
66dc72deb2
fix reply-to tooltip being somewhat unreliable
2019-01-23 00:03:33 +03:00
Henry Jameson
42f8d01b66
confusion
2019-01-21 21:41:17 +03:00
Henry Jameson
031c044297
better handling of attachments
2019-01-21 16:28:36 +03:00
Henry Jameson
d231a45644
support for extended fields (for future, doesn't work yet), fix reply bug
2019-01-19 04:10:16 +03:00
Henry Jameson
bac7154bc6
more fields for users
2019-01-17 23:57:24 +03:00
Henry Jameson
6c70e9950c
some more post fields
2019-01-17 23:57:24 +03:00
Henry Jameson
af36f4915a
support for CW/Subject. fix replies.
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
1e61c8140b
tests for the tests god! bugfixes for bugfixes throne!
2019-01-17 20:44:37 +03:00
Henry Jameson
9682ee66ce
added conversions to ids for consistency from the get-go
2019-01-17 19:23:14 +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
d7bd294666
migrated some tests to normalizer, fixed some potential bug, fixed tests to use
...
normalized naming instead of raw qvitter api objects. needs more tests tho.
2019-01-15 18:39:24 +03:00
Henry Jameson
966a9e78af
cleanup
2019-01-14 22:59:44 +03:00
Henry Jameson
fd27c78c4b
fixes, guards
2019-01-14 22:58:23 +03:00
Henry Jameson
790fcf37d2
notifications now also undergo some parsing, hypothetically could use MastoAPI
...
notifications, maybe.
2019-01-14 22:38:37 +03:00
Henry Jameson
e0fd6d12ed
user normalizer works
2019-01-14 15:30:14 +03:00
Henry Jameson
f9fb85ee42
Merge remote-tracking branch 'upstream/develop' into favorites
...
* upstream/develop:
Add Korean translation
Change emptlyTl to take userId
better fix
fixes #265 and also that thin line below gradient on chrome (UGH)
fix #262 part of user profiles not being able to load previous posts
Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-13 22:21:09 +03:00
Henry Jameson
519f49e29b
separated normalization into a another file, removed catchall and added more stuff
2019-01-13 22:14:55 +03:00
Henry Jameson
4be737b4df
moved some stuff from statuses to api service. added initial adapter (currently
...
mastoapi status -> qvitter status, would change some naming in the future)
favorites timeline works somewhat, notifications are broken because they are
fetched using same code to fetch usual timeline/using old architechture
2019-01-13 01:26:24 +03:00
Henry Jameson
039a407400
some initial work to make it possible to use "unregistered" timelines, i.e. not
...
reserving a timeline by name, instead just passing timeline object itself.
2019-01-12 23:33:45 +03:00
Henry Jameson
b18e27c6d4
fix tests, removed one unused function, fix real problem that tests helped to
...
surface
2019-01-11 03:38:23 +03:00
Henry Jameson
ef2585e32b
Remove all explicit and implicit conversions of statusId to number, changed
...
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03:00
shpuld
a8f6099be2
Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-08 23:09:03 +02:00
shpuld
16c7bd0199
merge develop, fix conflicts, fix logged out bug
2018-12-29 16:25:45 +02:00
lambda
1555a5fef3
Merge branch 'restore-routes' into 'develop'
...
Restore old routes, enable user route as fallback.
See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
shpuld
650655709d
fix conflict in user card content
2018-12-28 21:44:09 +02:00
shpuld
85c058e95c
New routes, notifications, other impovements in side drwaer
2018-12-28 21:39:54 +02:00
Maxim Filippov
85c487b933
Make "noAttachmentLinks" configurable
2018-12-27 13:25:11 +03:00
Maxim Filippov
13855f46e2
No attachment links
2018-12-27 02:37:36 +03:00
Lambda
f35dbaf064
Treat reserved users like external users in the frontend.
2018-12-26 14:50:48 +01:00
Lambda
24eba26c5b
Restore old routes, enable user route as fallback.
2018-12-25 18:43:52 +01:00
Egor Kislitsyn
c5847349e0
improve web push notifications
2018-12-25 20:43:18 +07:00
Henry Jameson
500b4bd374
fix
2018-12-25 14:28:49 +03:00
Henry Jameson
a4f0902926
small refactor, added push unsub notice for BE
2018-12-25 03:46:19 +03:00
Henry Jameson
957b2a6f7e
simplified some code, made it possible to unregister serviceworker altogether
2018-12-20 09:17:59 +03:00
Henry Jameson
5c2030e467
no more "broken favorite"
2018-12-19 01:55:53 +03:00
lambda
2f28bf95fd
Merge branch 'feature/new-user-routes' into 'develop'
...
Make domain.com/username routes work
Closes pleroma#395
See merge request pleroma/pleroma-fe!392
2018-12-18 15:26:00 +00:00
Maxim Filippov
63ad08050e
Fix oauth url
2018-12-17 21:58:16 +03:00
Maxim Filippov
2211c533dd
Merge branch 'develop' into feature/new-user-routes
2018-12-17 02:39:37 +03:00
Ekaterina Vaartis
a525df32c9
Separate captcha into the backendInteractor
2018-12-16 20:53:41 +03:00
Maxim Filippov
828b1c78f9
Implement user_profile.spec.js
2018-12-15 06:16:44 +03:00
Maxim Filippov
1341a7bb9c
Use babel polyfill in karma
2018-12-13 20:27:03 +03:00
Maxim Filippov
e4a34cc4d4
Use 'userProfileLink' to generate user-profile link
2018-12-13 19:57:11 +03:00
Rinpatch
6de4dcc7c9
Resolve merge conflict
2018-12-13 17:22:19 +03:00
Egor Kislitsyn
a8521fc8d9
Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
...
# Conflicts:
# src/i18n/en.json
# src/modules/interface.js
# src/modules/users.js
# yarn.lock
2018-12-13 18:22:15 +07:00
Egor Kislitsyn
b3455649c5
improve notification subscription
2018-12-13 18:04:09 +07:00
Maxim Filippov
7ffb7e6795
Use "-1" in indexOf
2018-12-13 13:51:47 +03:00
Maxim Filippov
24caa2cfcd
Add generateProfileLink
2018-12-13 05:00:01 +03:00
Egor Kislitsyn
02c0e15781
add checkbox to disable web push
2018-12-13 00:03:50 +07:00
Henry Jameson
a17ac74df7
revert that, it's actually used, i'm an idiot
2018-12-11 02:05:22 +03:00
Henry Jameson
90a5670661
removed unused function from color_convert
2018-12-11 01:41:19 +03:00
Henry Jameson
73aa9153d9
cleanup
2018-12-11 01:40:19 +03:00
Henry Jameson
4b25475b57
setColors -> applyTheme. For sanity. Also disabled export because nobody uses it
...
and should not use anyway.
2018-12-11 01:39:18 +03:00
Henry Jameson
fe2fe09236
fixed v2 setting as default theme
2018-12-11 01:38:20 +03:00
Rinpatch
6a00854189
Count in binary bytes and remove i18 from file size format service
2018-12-10 17:06:32 +03:00
Rinpatch
c69a8dc197
Add file size formating
2018-12-10 09:50:04 +03:00
Egor Kislitsyn
73b17d70ec
improve push notifications code
2018-12-09 19:25:43 +07:00
Egor Kislitsyn
a85d128d37
Revert "add subscribe module and fix race condition"
...
This reverts commit 07f1b8523e
.
2018-12-07 18:53:40 +07:00
Egor Kislitsyn
07f1b8523e
add subscribe module and fix race condition
2018-12-07 18:13:04 +07:00
Egor Kislitsyn
264da19f69
fix typo
2018-12-07 15:21:19 +07:00
Egor Kislitsyn
bbae2e10f3
Add configuration to enable/disable web push notifications
2018-12-07 15:15:31 +07:00
Egor Kislitsyn
ebe2a95140
improve web push notifications
2018-12-07 14:57:35 +07:00
Egor Kislitsyn
09147cacea
add service worker and push notifications
2018-12-06 20:34:00 +07:00
Henry Jameson
51cf4dc298
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop:
Fix iOS Safari from making videos play fullscreen by default
added PR comments
resolved the lint
used the deleted data param as condition in status template
Switch to "timeline" when pressing user-settings
Added user setting tooltip
made links in user bio always open in new tabs
addressed PR comments
added tooltip
Add userId property to timelines so that we don't overwrite user timeline meant for another user
Added option to auto-hide subject field when it's empty.
removes hacks from notifications storage, adds api call to let server update is_seen attribute
fixes vimium not giving retweet button a hint
Do not use underscore at the beginning of the method
Logout user on password change
Route user to the correct profile URL
Typo
Fix filetype detection
Switch to settings when touching settings
Switch to timeline on nav panel actions
2018-12-05 10:43:03 +03:00
lambda
ea28aa62f0
Merge branch 'ss-read' into 'develop'
...
Server-side read marking
See merge request pleroma/pleroma-fe!386
2018-12-03 14:47:27 +00:00
Henry Jameson
ccb1682379
Add userId property to timelines so that we don't overwrite user timeline meant
...
for another user
2018-12-03 09:29:33 +03:00
Henry Jameson
e95b6c7e53
fix
2018-12-02 15:20:25 +03:00
Henry Jameson
fad19c3c2f
fix
2018-12-02 15:10:18 +03:00
Henry Jameson
dd4deae66e
fallback for some weird case on my phone
2018-12-02 15:03:51 +03:00
Henry Jameson
b555d617e4
removes hacks from notifications storage, adds api call to let server update
...
is_seen attribute
2018-12-02 13:36:11 +03:00
Henry Jameson
bee738c815
making inset shadows work on avatars again
2018-12-02 08:47:55 +03:00
Henry Jameson
406df4399b
avatars shadows, also allows drop-shadow use
2018-11-30 16:39:53 +03:00
rinpatch
cddb173089
Fix filetype detection
2018-11-27 18:44:49 +03:00
Henry Jameson
bb39b99d65
fix panel link color, fix broken user profiles
2018-11-26 20:13:56 +03:00
Henry Jameson
a806d43f05
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop: (60 commits)
whoops
whoops
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
remove deploy stage
remove deploy stage
updated and completed German translation
On logout switch to public timeline.
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Put oauth text into description.
Display OAuth login on login form button.
...
2018-11-26 05:21:58 +03:00
Henry Jameson
1a65895bfd
initial font support
2018-11-25 21:48:16 +03:00
Henry Jameson
e8536f3d95
clean up
2018-11-25 19:15:54 +03:00
Henry Jameson
1a8d24d649
some help strings
2018-11-25 17:21:53 +03:00
Henry Jameson
b07d7d7229
reset buttons, better disabled for shadows
2018-11-23 11:36:36 +03:00
Henry Jameson
26b9f787bb
added "keep opacity" option, fixed opacity loading, fixed missing shadows not
...
affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
2018-11-23 10:17:01 +03:00
Henry Jameson
652b98b13c
fix v1->v2 transition for localstorage
2018-11-23 09:14:52 +03:00
Henry Jameson
1059d9b602
radii v1 fixes
2018-11-23 09:02:10 +03:00
Henry Jameson
29082e9aee
fixed checkbox styles, optimized default shadows
2018-11-23 00:24:16 +03:00
Henry Jameson
379144f4ab
fix for zero-state for shadow-control
2018-11-22 03:55:45 +03:00
Henry Jameson
18e0828ee7
last shadow override i wanted to make for now. also small tweak
2018-11-21 21:40:45 +03:00
Henry Jameson
b3ec3d450c
fixup! better default pleroma shadows, matches original borders more closely
2018-11-21 21:35:18 +03:00
Henry Jameson
017fa60a82
better default pleroma shadows, matches original borders more closely
2018-11-21 21:32:51 +03:00
Henry Jameson
621ab806e6
more default shadows, replaced original shadows with generated ones. maybe gotta
...
update fallbacks...
2018-11-21 21:23:07 +03:00
Henry Jameson
dc3df7bc4e
fixes
2018-11-21 18:22:05 +03:00
Henry Jameson
50562eb6b7
fix lint, for shadows, it's now possible to refer css variables as colors
2018-11-21 04:26:45 +03:00
Henry Jameson
b7fb720c19
cleanup, cold-boot issue fixed
2018-11-21 03:23:02 +03:00
Henry Jameson
73a9370710
fixed and updated roundness tab
2018-11-21 03:14:59 +03:00
Henry Jameson
cb8218c3c1
consolelog
2018-11-19 21:01:46 +03:00
Henry Jameson
56fec664a9
cleanup and optimization
2018-11-19 20:22:46 +03:00
Henry Jameson
a8180d03be
it works, now to clean it up
2018-11-19 18:15:27 +03:00
Henry Jameson
a5b4f31c12
shadow control initial stuff. not done yet tho
2018-11-19 04:40:25 +03:00
Henry Jameson
edb429e307
cleanup and fixes
2018-11-15 17:17:20 +03:00
Roger Braun
c34eebff6c
Add actual user search.
2018-11-14 20:31:06 +01:00
Henry Jameson
75f0c191dd
some initial work for user highlight v2
2018-11-14 21:53:51 +03:00
Henry Jameson
e7fe2dc9f9
collateral fixes, removed alpha control for alerts, added contrast text
...
generation for alerts, updated getTextColor to also have fallback to black/white
if resulting contrast isn't passable (only when inverting lightness!), updated
UI to use tabs.
2018-11-14 19:39:17 +03:00
Roger Braun
7f13cbc493
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tab
2018-11-13 20:21:04 +01:00
Roger Braun
ffb9d4faf5
api service url
2018-11-13 20:20:46 +01:00
Henry Jameson
1723f427f5
updates
2018-11-13 16:30:01 +03:00
Roger Braun
4d9680e797
Re-activate registration, use oauth password flow to fetch token.
2018-11-06 21:48:05 +01:00
Roger Braun
9af204b293
Move login to oauth.
2018-10-26 15:16:23 +02:00
Henry Jameson
4b7b7d9905
cleanup, documentation, contrast taking alpha into account.
2018-10-10 05:39:02 +03:00
Henry Jameson
87e98772b0
initial contrast display support
2018-10-10 00:07:28 +03:00
Henry Jameson
4d77b0c86b
Transparency works without exploding now. All nice.
2018-10-07 22:03:34 +03:00
Henry Jameson
96804d42f0
Some themeing is working!!
2018-10-07 19:59:22 +03:00
Henry Jameson
5441766c3c
fix
2018-10-04 18:27:27 +03:00
Henry Jameson
0a4b07652a
trying to fix transition
2018-10-04 18:16:14 +03:00
Henry Jameson
fb29e7c73d
more workings and even less explosions.
2018-10-03 21:21:48 +03:00
Henry Jameson
f78a5158e1
something works without exploding and i'm tired already
2018-10-02 21:43:58 +03:00
William Pitcock
1af5c8fd39
add support for disabling rich text formatting
2018-09-22 03:54:05 +00:00
Henry Jameson
419744080f
console.log cleanup
2018-09-17 19:16:58 +03:00
Henry Jameson
03f28d3fa6
Fixed "user.id is undefined" or something error more sane by properly handling
...
HTTP errors
2018-09-17 18:55:11 +03:00
William Pitcock
9a43ba73e6
add the ability to select a post's content type
2018-08-31 03:42:11 +00:00
scarlett
a7811e7bd9
Add a checkbox for marking a post's attachments as NSFW
2018-08-25 22:18:43 +01:00
kaniini
fe906cc3f0
Merge branch 'develop' into 'notifications'
...
# Conflicts:
# src/main.js
2018-08-24 23:00:56 +00:00
kaniini
14db3f279d
Merge branch 'feature/who-to-follow-panel-uses-suggestions-api' into 'develop'
...
Who to follow panel uses suggestions api
See merge request pleroma/pleroma-fe!294
2018-08-24 18:46:23 +00:00
Henry Jameson
13acdc4a00
fixed error not displaying for 500 error.
2018-08-22 15:51:03 +03:00
Henry Jameson
a196c3551a
Revert "Drop the entire thing about hidden "own" timeline since it doesn't necessarily"
...
This reverts commit 612aa56c8b
.
2018-08-21 00:21:35 +03:00
Henry Jameson
9e78c64d5e
Hide initial desktop notifications spam when FE is opened and there's a lot of
...
unseen notifications.
2018-08-20 19:58:49 +03:00
Henry Jameson
612aa56c8b
Drop the entire thing about hidden "own" timeline since it doesn't necessarily
...
contain all of the users posts (it doesn't contain DMs) even though it's "us".
Since this is a workaround anyway just fetch home timeline instead. It could end
up making more queries if user doesn't post that often.
2018-08-20 19:01:54 +03:00
Henry Jameson
23a1000298
fix post search query to have id +1 because search is exclusive
2018-08-16 18:13:31 +03:00
Henry Jameson
6454837ea4
Merge remote-tracking branch 'upstream/develop' into notifications
...
* upstream/develop: (26 commits)
Update status.vue
Update retweet_button.js
Update retweet_button.vue
Use serverside html rendering in usernames and bios if available.
Update status.vue
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
Hide all status actions if not logged in
hopefully, fix linter
Fixes broken custom emoji in autocomplete when proxying to remote BE
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
Remove trailing whitespace
Textarea is now focused when replying
the missing piece for invites system
Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are
fixed lint
cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
added ability to pick the style of highlighting
post-rebase fix, backported d7d787b84c
notifs fix
maybe i should actually add myself to contributors list?
...
2018-08-16 13:59:01 +03:00
Henry Jameson
ef04a78634
added workaround for broken favorites
2018-08-16 13:12:31 +03:00
Henry Jameson
ef515056b5
missing files and a plug for bad favs
2018-08-13 13:17:10 +03:00
lambda
ce88f351f7
Merge branch 'invites' into 'develop'
...
FE part of invites system
See merge request pleroma/pleroma-fe!297
2018-08-12 16:15:27 +00:00
Henry Jameson
63650aec29
Added support for qvitter api fetching of notifications
2018-08-12 14:14:34 +03:00
Henry Jameson
9cebb00faa
the missing piece for invites system
2018-08-05 10:01:38 +03:00
Henry Jameson
b04a9d1229
cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
2018-08-05 05:41:37 +03:00
Henry Jameson
6a81aa2745
added ability to pick the style of highlighting
2018-08-05 05:18:04 +03:00
Hakaba Hitoyo
5900bccff3
debug
2018-08-02 18:34:12 +09:00
Henry Jameson
8ccebbe156
both bugs fixed. it's reactive and no more conflicting cards
2018-07-06 20:12:09 +03:00
Henry Jameson
fa8c221f3a
moved style generator into separate file. notifications are highlighted too now.
2018-07-06 20:12:09 +03:00
Francis Dinh
d05fcfa1a8
Add unretweet support
2018-06-14 05:00:11 -04:00
lambda
6ea5cfe71e
Merge branch 'feature/locked-accounts' into 'develop'
...
Feature/locked accounts
See merge request pleroma/pleroma-fe!274
2018-06-12 16:57:18 +00:00
Astra
92a8ca0011
crt's compose box changes
2018-06-07 05:03:50 -04:00
William Pitcock
b8d0a6a0ba
backend interactor service: add approveUser and denyUser functions
2018-06-07 00:29:13 +00:00
William Pitcock
2cf28acfd1
api: add approveUser and denyUser functions
2018-06-07 00:29:01 +00:00
William Pitcock
4efb528a52
backend interactor service: implement fetchFollowRequests()
2018-06-06 22:29:02 +00:00
William Pitcock
4e64514aa9
api: add fetchFollowRequests()
2018-06-06 22:26:24 +00:00
William Pitcock
7a08ba43e2
user settings: enable locking/unlocking an account
2018-05-29 14:19:28 +00:00
Syldexia
e0ba6a5876
Added change password to user settings
2018-05-21 23:01:09 +01:00
Syldexia
327b6fb5dc
Added delete account section to user settings
2018-05-13 15:24:42 +01:00
Henry Jameson
dc33c0aaac
alternate usercard
2018-05-12 16:17:04 +03:00
Henry Jameson
a6fa913f45
Input fields separate radii
2018-05-12 15:19:53 +03:00
Henry Jameson
2b64432f9a
semi-transparent inputbox style
2018-05-12 15:19:53 +03:00
Henry Jameson
c46795c692
use semi-transparent faint color + fix
2018-05-12 15:19:53 +03:00
shpuld
a0e7803e42
change timeline min/max id updating behavior to not get stuck with 20 wrong type of activities on fetch older.
2018-04-13 22:35:55 +03:00
shpuld
ee883d0f88
Remove some commented lines and logs
2018-04-11 19:40:59 +03:00
shpuld
a1f6ef1dca
Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein.
2018-04-11 19:34:40 +03:00
Henry Jameson
cc02672e14
made alerts use red with transparent theme red. some UI improvs
2018-04-08 03:22:03 +03:00
Henry Jameson
b23bd076c3
raddi customization UI
2018-04-08 02:39:39 +03:00
Henry Jameson
65f82cf294
<select> styling (abeit somewhat not pretty code-wise), default colors for
...
default schemes.
2018-04-07 21:58:29 +03:00
Henry Jameson
33b1d85921
border-radii moved to variables, made rgbo colors use theme data, customizable
...
from settings screen.
2018-04-07 16:40:08 +03:00
Henry Jameson
acdb5e5c7a
cleanup. added fallback mechanism for IE11 and unsupported browsers.
2018-04-07 16:36:35 +03:00
Henry Jameson
aa0564406a
getting rid of baseXX, some small fixes. Seems to be usable.
2018-04-07 16:34:11 +03:00
Ekaterina Vaartis
cfde2fe439
Always include bio in updates, because it might be empty (optional)
2018-02-21 23:33:04 +03:00
eal
a058941aed
Add follow import to user settings.
2017-12-23 17:08:45 +02:00
eal
f4f63d32e2
Fix basicauth base64 encoding for unicode passwords.
2017-12-04 23:15:03 +02:00
lambda
2431d35277
Merge branch 'feature/flush-timeline-with-holes' into 'develop'
...
Clear timeline when there's holes between old and new
Closes #54
See merge request pleroma/pleroma-fe!171
2017-11-24 07:30:17 +00:00
lambda
38cab5e4b6
Merge branch 'fix/better-icon-colors' into 'develop'
...
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
See merge request pleroma/pleroma-fe!174
2017-11-24 07:29:49 +00:00
shpuld
6b773902e8
Fix mistake in flushMarker init, make startFetching behave properly with older statuses existing.
2017-11-23 13:46:37 +02:00
shpuld
10be553910
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
2017-11-22 01:00:25 +02:00
shpuld
fc1736618b
attempt to recognize when holes in timeline for various reasons, clear timeline and fetch older when showing new to get rid of holes
2017-11-21 16:12:47 +02:00
shpuld
f6b2f6eaee
Fix usercard from breaking with certain colors, clean up code structure a bit.
2017-11-20 22:45:09 +02:00
shpuld
3534a9a62f
Make defaulting to pleroma-dark work when config.json has an invalid theme. Remove logging.
2017-11-18 13:27:37 +02:00
shpuld
d65d6e5da4
Clean up, use translations, persist theme, add more presets.
2017-11-18 13:13:51 +02:00
shpuld
21b31cf599
Move custom theming from settings to style-switcher, remove usage of custom .css files, use styles.json instead.
2017-11-17 17:24:42 +02:00
shpuld
e13c8c3fd2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme
2017-11-17 02:17:47 +02:00
shpuld
44073e72fd
Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency.
2017-11-17 02:17:36 +02:00
eal
07057043d9
Use state object for user view instead of timeline.
...
Also fetch user if not in the state already.
2017-11-14 18:08:03 +02:00
shpuld
ed84c6acc0
First version with naive color extrapolation.
2017-11-14 01:37:49 +02:00
eal
608d1e6776
Add blocks.
2017-11-07 22:38:28 +02:00
eal
784eb8426c
Send credentials when fetching remote profile.
2017-11-07 00:20:51 +02:00
eal
2162ef20b0
Add emoji completion.
2017-09-19 22:43:20 +03:00
eal
9abfcb34ef
Add tag timeline view.
2017-09-17 14:26:35 +03:00
eal
298bf5cfca
Revert "Include cookie in every request"
...
This reverts commit 00589a9af1
.
Changing same-origin to the unsafer include did not fix the
bug it was supposed to.
2017-09-02 21:12:55 +03:00
eal
00589a9af1
Include cookie in every request
2017-09-02 19:29:45 +03:00
eal
2b0811dddc
Make sure options exists every time on fetch()
2017-09-02 19:29:16 +03:00
eal
522110c0bc
Set cookies on fetch
2017-08-31 11:23:17 +03:00
Shpuld Shpuldson
2bc261afba
Merge branch 'feature/follow-lists' into 'develop'
...
Feature/follow lists
See merge request !106
2017-08-23 12:40:39 -04:00
eal
ccfc2e57d0
Add follower and following views
2017-08-23 19:14:06 +03:00
Shpuld Shpuldson
d3169b057c
Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts.
2017-08-21 15:35:14 +03:00
Shpuld Shpuldson
42fb65e274
Add error message in post status form when failing to post and don't get rid of post/attachments when failing.
2017-08-20 13:16:41 +03:00
Shpuld Shpuldson
c4920f2d86
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing
2017-08-16 00:15:00 +03:00
Shpuld Shpuldson
acf3fd5d91
Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service.
2017-08-02 22:09:40 +03:00
Roger Braun
b1d9cbaebd
Add fetch polyfill.
2017-07-31 16:35:07 +02:00
Shpuld Shpuldson
3785a863cb
Update branch and fix conflicts.
2017-06-19 11:32:40 +03:00
Shpuld Shpuldson
e0e8965c08
update branch and fix merge conflicts
2017-06-15 23:25:19 +03:00
Roger Braun
48a6d2e987
Don't use too advanced features.
2017-06-12 17:35:04 +02:00
Roger Braun
2e7029b670
Display user timeline
2017-06-12 16:20:02 +02:00
Roger Braun
090148ef60
Start fetching user timelines.
2017-06-12 16:00:46 +02:00
Roger Braun
2ec7069b3c
Add user finder.
2017-05-12 18:54:12 +02:00
Roger Braun
37c10be5e2
Add basic avatar changing.
2017-04-16 13:44:11 +02:00
Roger Braun
55edd6d8c2
Restore old media upload endpoint.
2017-04-16 11:15:06 +02:00
Roger Braun
a766e886f5
Add a registration form.
2017-04-15 18:29:46 +02:00
Roger Braun
024230c7f4
Basic word position and completion service.
2017-03-15 16:22:36 +01:00
wakarimasen
d669c37f13
Remove unused fetchMentions()
2017-03-09 18:21:42 +01:00
wakarimasen
bfd530aaea
Let timeline component fetch mentions
2017-03-09 18:20:16 +01:00
Shpuld Shpuldson
7aa1f02e38
Merge branch 'feature/timeline-fetch-error' into 'develop'
...
Use one error variable for all timelines
See merge request !57
2017-03-09 08:06:59 -05:00
wakarimasen
e064d2da4d
Use one error variable for all timelines
2017-03-09 13:38:32 +01:00
shpuld
d99b9bdac1
Merged with changes in develop & fixed conflicts.
2017-03-09 12:45:12 +02:00
shpuld
6c8fc99d5a
Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses.
2017-03-09 01:09:23 +02:00
wakarimasen
7d52258378
Move rejection handler
2017-03-07 21:38:55 +01:00
wakarimasen
086dd832d3
Visual feedback on failure to fetch new statuses
2017-03-07 17:27:12 +01:00
Roger Braun
ec5d8b9833
Set colors into config so they can be used for more dynamic styles.
2017-02-22 21:14:55 +01:00
Roger Braun
9c1093b6ca
Grab mutes from server on patched servers.
2017-02-20 18:01:45 +01:00
Roger Braun
5481cf00a3
Make user profiles visible inline.
2017-02-16 15:58:49 +01:00
Roger Braun
832bd3cdd2
Fetch Public and TWKN timelines when viewed.
2017-02-16 11:17:47 +01:00
Roger Braun
f9b3f8df84
Add all_following endpoint.
2017-02-13 22:55:38 +01:00
Roger Braun
b98a6fe5bc
Fix file uploads in Chrome.
2017-01-21 00:00:05 +01:00
Roger Braun
e81b3ea245
Fix style setting in Chrome.
2017-01-20 23:59:54 +01:00
Roger Braun
b65a29aa07
Dynamic style setting.
2017-01-16 17:44:26 +01:00
Roger Braun
8f494b14f0
Add unfollowing.
2016-12-23 16:45:57 +01:00
Roger Braun
fc268c48bc
Very basic user following.
2016-12-08 09:09:21 +01:00
Jiayi Zheng
75fdc72e22
Implements feature status delete
...
Fixes issue #4
2016-12-04 18:30:00 +01:00
Roger Braun
dcb9a5fa17
Add friend list fetching.
2016-11-30 21:27:25 +01:00
Roger Braun
9681bb7bfd
Add noIdUpdate option for addNewStatuses action.
...
This fixes #11 .
2016-11-28 21:25:36 +01:00
Roger Braun
cc00eb898f
Switch from moment.js to vue-timeago.
...
Much smaller filesize for vendor.js, although we'll have to see if all
the intervals are ok.
2016-11-28 17:37:47 +01:00
Roger Braun
6c2941dba0
Basic mention support.
...
I still have to think about how to integrate them in the state system...
2016-11-26 21:09:41 +01:00
Roger Braun
56dc34977e
remove apiService from users module
2016-11-26 19:12:09 +01:00
Roger Braun
215e51f764
Move some interactions to the backendInteractor
...
The idea is that all interactions should move there, so components
don't have to pass around credentials all the time.
2016-11-26 18:57:08 +01:00
dtluna
cb940a8742
Merge branch 'develop' into 'feature/attachment-form-improvements'
...
# Conflicts:
# src/components/attachment/attachment.js
2016-11-25 21:02:53 -05:00
dtluna
4f8d476a2b
Add fileTypeService
2016-11-25 20:21:25 +03:00
Roger Braun
18c11e405a
Add status and conversation fetching to apiService.
2016-11-24 18:16:20 +01:00
Roger Braun
fd4cd6d687
Prepare apiService for base url.
2016-11-22 15:45:40 +01:00
Roger Braun
38749e6c4a
Remove commented out old api service.
2016-11-22 15:15:43 +01:00
Roger Braun
de25c46670
addNewStatuses: mutation -> action
...
This is to add the current user.
2016-11-18 22:56:20 +01:00
Jiayi Zheng
242ae8e91b
Add retweet button component
...
Expand API service for retweet
2016-11-13 16:42:56 +01:00
Roger Braun
ee009f63dd
Don't break status parsing when link class is missing.
2016-11-13 00:08:03 +01:00
Roger Braun
43eb9c022d
Fix compilation error.
2016-11-12 23:18:27 +01:00
Roger Braun
05733b6bc9
Remove attachment links, as we are already showing them.
2016-11-12 22:41:43 +01:00
Roger Braun
83e7add2c7
Add TWKN timeline.
2016-11-06 21:46:01 +01:00
Roger Braun
3bb2e91dbf
Return empty auth header when we don't have a user.
2016-11-06 20:10:45 +01:00
Roger Braun
7e2e2d3ec3
Add media upload to StatusPosterService.
2016-11-06 19:30:20 +01:00
Roger Braun
f86f0ef7f0
Add media upload to API Service.
2016-11-06 19:29:41 +01:00
Roger Braun
a5edcef24d
Remove temp data.
2016-11-06 17:48:56 +01:00
Roger Braun
e1103f04a4
Add fetching of older statuses.
2016-11-06 17:44:05 +01:00
Roger Braun
7980558461
Basic status posting.
2016-10-30 16:54:44 +01:00
Roger Braun
8630f91a13
Add favorite-button.
2016-10-30 16:12:35 +01:00
Roger Braun
7b92ca6f94
Update timestamps after fetch.
2016-10-28 15:59:49 +02:00
Roger Braun
f8d6fe41f0
Start fetching.
2016-10-28 14:26:51 +02:00
Roger Braun
945ea5e69f
Update modules.
2016-10-27 18:03:14 +02:00
Roger Braun
4c2764c747
.
2016-10-26 19:03:55 +02:00