Henry Jameson
3afe65352b
removed notification-relevant test because the functionality they are testing do
...
not exist anymore. Gotta write more tho...
2018-08-16 14:07:06 +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
2018-08-16 13:59:01 +03:00
Henry Jameson
decc209fdc
fix lint
2018-08-16 13:57:16 +03:00
Henry Jameson
693eb4b717
cleanup, updated broken favorites look + localization strings
2018-08-16 13:41:45 +03:00
Henry Jameson
e8f7491003
fixed favoriting from notification column
2018-08-16 13:20:29 +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
lambda
25be51e2c1
Merge branch 'feature/accountHighlight' into 'develop'
...
Account highlight
See merge request pleroma/pleroma-fe!285
2018-08-12 16:14:35 +00:00
Henry
27adde9887
Merge branch 'develop' into 'feature/accountHighlight'
...
# Conflicts:
# src/components/user_card_content/user_card_content.vue
2018-08-12 12:05:08 +00:00
Henry Jameson
d085cc8584
undo test condition
2018-08-12 14:15:09 +03:00
Henry Jameson
63650aec29
Added support for qvitter api fetching of notifications
2018-08-12 14:14:34 +03:00
lambda
db6ff4824a
Merge branch 'feature/focus_reply_form' into 'develop'
...
Focus textarea when clicking "reply"
See merge request pleroma/pleroma-fe!298
2018-08-12 10:48:08 +00:00
lambda
a64fbe661f
Merge branch 'fixSelectOptionStyling' into 'develop'
...
Fixes selects having unreadable text on some browsers/OSes.
Closes #123
See merge request pleroma/pleroma-fe!296
2018-08-12 10:47:19 +00:00
lambda
e21f78e519
Merge branch 'doNotAutoFetchOnUnfocusedTab' into 'develop'
...
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
See merge request pleroma/pleroma-fe!299
2018-08-12 10:45:36 +00:00
lambda
eeddceee6b
Merge branch 'fixRelativeEmojis' into 'develop'
...
Fixes broken custom emoji in autocomplete when proxying to remote BE
See merge request pleroma/pleroma-fe!300
2018-08-12 10:44:39 +00:00
lambda
01c5bae594
Merge branch 'feature/emoji-in-profiles' into 'develop'
...
Use serverside html rendering in usernames and bios if available.
See merge request pleroma/pleroma-fe!304
2018-08-12 10:40:57 +00:00
lambda
fba757f595
Merge branch 'fix/remove-retweet-button-on-private-and-direct-posts' into 'develop'
...
Do not show retweet button if post is followers-only or a DM
See merge request pleroma/pleroma-fe!303
2018-08-12 10:32:40 +00:00
Toromino
895ef525d2
Update status.vue
2018-08-09 16:47:08 +00:00
Toromino
01652fc252
Update retweet_button.js
2018-08-09 16:46:18 +00:00
Toromino
316692ee85
Update retweet_button.vue
2018-08-09 16:45:52 +00:00
eal
876f7633fe
Use serverside html rendering in usernames and bios if available.
2018-08-09 12:52:34 +03:00
Toromino
e60fde233b
Update status.vue
2018-08-08 14:39:22 +00:00
dtluna
5cfc247c6b
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
...
This reverts merge request !301
2018-08-06 09:08:50 +00:00
dtluna
63f072f702
Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'
...
Hide all status actions if not logged in
See merge request pleroma/pleroma-fe!301
2018-08-06 09:01:57 +00:00
dtluna
da36cd11e8
Hide all status actions if not logged in
2018-08-06 11:57:27 +03:00
Henry Jameson
d5efa10946
hopefully, fix linter
2018-08-06 09:52:07 +03:00
Henry Jameson
976444064f
Fixes broken custom emoji in autocomplete when proxying to remote BE
2018-08-06 09:45:22 +03:00
Henry Jameson
d3d5a84868
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
2018-08-06 07:58:34 +03:00
Toromino
88a81406e3
Remove trailing whitespace
2018-08-05 19:41:34 +00:00
Toromino
fd484a1a62
Textarea is now focused when replying
2018-08-05 19:17:11 +00:00
Henry Jameson
9cebb00faa
the missing piece for invites system
2018-08-05 10:01:38 +03:00
Henry Jameson
3373d28701
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
2018-08-05 09:18:04 +03:00
Henry Jameson
3d72c2b964
fixed lint
2018-08-05 05:44:02 +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
lambda
32fd108e97
Merge branch 'revert-88c9ab44' into 'develop'
...
Revert "Merge branch 'cw-clickthrough' into 'develop'"
See merge request pleroma/pleroma-fe!292
2018-07-12 07:28:48 +00:00
lambda
17f6eb18e7
Revert "Merge branch 'cw-clickthrough' into 'develop'"
...
This reverts merge request !291
2018-07-12 07:20:39 +00:00
lambda
88c9ab4452
Merge branch 'cw-clickthrough' into 'develop'
...
Add click-to-show content warnings on posts
See merge request pleroma/pleroma-fe!291
2018-07-12 05:52:54 +00:00
Henry Jameson
d886ab752c
post-rebase fix, backported d7d787b84c
2018-07-06 20:19:02 +03:00
Henry Jameson
38d5226ad1
notifs fix
2018-07-06 20:14:39 +03:00
Henry Jameson
5f25b40540
maybe i should actually add myself to contributors list?
2018-07-06 20:14:39 +03:00
Henry Jameson
0714391aba
UI update
2018-07-06 20:14:36 +03:00
Henry Jameson
398eaaf79b
fixed the UI
2018-07-06 20:12:09 +03: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
Henry Jameson
f911182a2f
working, somewhat
2018-07-06 20:12:09 +03:00
Henry Jameson
148e691199
initial vers
2018-07-06 20:12:09 +03:00
Vivian Lim
158342fc39
Fix lint warnings
2018-06-29 00:10:17 -07:00
Vivian Lim
b0cf050797
Add configuration option to enable click-through content warnings
2018-06-28 23:39:55 -07:00
