ensra
1121f32c48
Add support for configurable CW clickthrough.
2018-08-20 02:59:06 +01:00
kaniini
9982376f9a
Merge branch 'feature/theme-export-import' into 'develop'
...
Theme import & export
Closes #119
See merge request pleroma/pleroma-fe!290
2018-08-20 00:03:35 +00:00
kaniini
702dfcec10
Merge branch 'develop' into 'fixes-and-tweaks'
...
# Conflicts:
# src/i18n/messages.js
2018-08-19 23:59:15 +00:00
Foxhkron
56ddeec8f3
Merge upstream
2018-08-19 01:23:03 +02:00
William Pitcock
fe06beae18
fix lint issues
2018-08-18 17:06:07 +00:00
William Pitcock
61d40f40ae
allow default visibility scope to be configured
2018-08-18 17:06:06 +00:00
Henry Jameson
99f849bd8c
Revert "storing entire config instead of each separate thing of it, so that future"
...
This reverts commit 18117c3bfa
.
b/c something else uses same field but i want to fix that in another MR
2018-08-18 13:56:45 +03:00
Henry Jameson
0b6f9c62a1
fix
2018-08-18 13:41:23 +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
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
627e227076
fixes hella ton of annoyances with file upload display
2018-08-15 14:53:40 +03:00
Henry Jameson
d94b77b863
fix for timeago being ass when post has replies. added hover colors for
...
clickable icons on the right side. Reverted line-height to its original value
2018-08-15 13:02:39 +03:00
Henry Jameson
0e5b74e3dd
Configurable video looping, option to not to loop silent videos. Updated
...
localization strings.
2018-08-15 12:51:21 +03:00
Henry Jameson
d2ec70c323
added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
2018-08-15 11:20:40 +03:00
Henry Jameson
87eee191b8
Made pausing TL updating configurable. Added styles for disabled checkboxes.
...
Shuffled settings a bit b/c all the settings are in "Attachments" section
depsite the fact not all of them are attachments-related.
2018-08-13 17:07:45 +03:00
Henry Jameson
18117c3bfa
storing entire config instead of each separate thing of it, so that future
...
options won't be lost during reloads because developer forgot to update that
list of settings to be persisted
2018-08-13 16:17:00 +03:00
Henry Jameson
d417cb35bb
fix potential stretched spurdo
2018-08-13 15:36:10 +03:00
Henry Jameson
4d112b70fd
fixed custom emoji in nickname. changed icons on right side to be more
...
streamlined. adjusted CSS so that all text in header of post is on same
baseline and all icons/images are middle-aligned.
2018-08-13 14:46:28 +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
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
Hakaba Hitoyo
d1b3d7e90f
debug
2018-08-11 14:54:30 +09:00
Hakaba Hitoyo
e2dae87772
update
2018-08-11 14:50:40 +09:00
Hakaba Hitoyo
b7d1bb39e0
update
2018-08-11 14:35:04 +09:00
Hakaba Hitoyo
23cfec4332
Update messages.js
2018-08-10 07:04:25 +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
Hakaba Hitoyo
6cc1083287
フォロワーはインポートできない。
2018-08-09 07:30:22 +00:00
Hakaba Hitoyo
f8834ba1fb
Update messages.js
2018-08-09 07:20:35 +00:00
Hakaba Hitoyo
3398303c9b
Update messages.js
2018-08-09 06:59:23 +00: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
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
hakabahitoyo
5e47c59615
debug
2018-08-02 19:16:48 +09:00
Hakaba Hitoyo
19e310fc67
lint
2018-08-02 18:38:43 +09:00
Hakaba Hitoyo
5900bccff3
debug
2018-08-02 18:34:12 +09:00
Hakaba Hitoyo
bcd499c372
who to follow panel uses /api/v1/suggestions
2018-08-02 17:57:00 +09:00
lambda
17f6eb18e7
Revert "Merge branch 'cw-clickthrough' into 'develop'"
...
This reverts merge request !291
2018-07-12 07:20:39 +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
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
Ole Bertram
2a87e29180
Add validation of the imported theme and the corresponding warning message
2018-07-04 14:25:40 +02:00
Ole Bertram
8f79193883
Unify button styles and use min-width
...
This seemed to be the same across multiple components anyway.
Switched to min-width to allow for buttons with longer text, e.g.
from other languages.
2018-07-04 13:49:31 +02: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
Vivian Lim
ab86e87e85
Also hide attachments behind clickthrough.
2018-06-28 23:39:01 -07:00
Vivian Lim
65edcaf4b9
Differentiate content warning block if it is on lightbg
2018-06-28 23:39:01 -07:00
Vivian Lim
b3e122d31f
Carry forward content warnings in replies
2018-06-28 23:39:01 -07:00
Vivian Lim
0554cac113
Add click-to-show content warnings on posts
2018-06-28 23:39:01 -07:00
Ole Bertram
fdc64cfa8a
Add German localization for theme import/export
2018-06-28 03:28:33 +02:00
Ole Bertram
d2b79856c6
Add theme import feature
2018-06-28 03:28:23 +02:00
Ole Bertram
f36984c4a4
Refactor theme settings state initialization
2018-06-28 02:07:50 +02:00
Ole Bertram
29f69de240
Add theme export feature
2018-06-28 01:23:19 +02:00
lambda
c07adb7121
Merge branch 'patch-1' into 'develop'
...
Update messages.js / tiny typofix in fr version
See merge request pleroma/pleroma-fe!288
2018-06-25 06:07:47 +00:00
goofy
c2f6227092
Update messages.js / tiny typofix in fr version
2018-06-24 14:18:43 +00:00
Haelwenn (lanodan) Monnier
6da86599a9
src/i18n/messages.js: French Translation for Post Scope UI tooltips
...
Co-authored-by: goofy
2018-06-24 16:14:47 +02:00
Ole Bertram
44428e8b09
Add warning/info text on appriopriate status scopes
2018-06-23 22:10:15 +02:00
Ole Bertram
05bc6fa8e8
Add title text with description to scope icons
2018-06-23 22:09:13 +02:00
Francis Dinh
556eb4b8a3
add unretweet action to statuses.js
2018-06-14 17:17:36 -04:00
Francis Dinh
d05fcfa1a8
Add unretweet support
2018-06-14 05:00:11 -04:00
Roger Braun
d4f5b3feec
Use parents scope if available.
2018-06-12 19:28:48 +02:00
lambda
7707048bff
Merge branch 'feature/update-de-translation' into 'develop'
...
updated german translation
See merge request pleroma/pleroma-fe!269
2018-06-12 17:09:02 +00:00
lambda
0683e37fa4
Merge branch 'feature/update-russian-translation' into 'develop'
...
Update Russian translation
See merge request pleroma/pleroma-fe!270
2018-06-12 17:03:24 +00:00
lambda
97ae186aaa
Merge branch 'improve-settings-ui' into 'develop'
...
Improve user settings ui
See merge request pleroma/pleroma-fe!273
2018-06-12 17:01:35 +00:00
lambda
5d59028ef7
Merge branch 'patch-1' into 'develop'
...
Hebrew Translation of "placeholder"
See merge request pleroma/pleroma-fe!278
2018-06-12 16:57:47 +00: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
William Pitcock
c155110eed
messages: rename content warning to subject
2018-06-08 18:47:21 +00:00
Artik Banana
d766125eca
Update messages.js
2018-06-08 14:08:07 +00:00
lambda
71dcf120ed
Merge branch 'tr-fix' into 'develop'
...
Translate username input placeholder
See merge request pleroma/pleroma-fe!275
2018-06-08 13:34:07 +00:00
lambda
278321db48
Merge branch 'l10n-french-newsettings' into 'develop'
...
Add French translations for the new user settings
See merge request pleroma/pleroma-fe!271
2018-06-08 13:33:00 +00:00
lambda
e2c5e4eb46
Merge branch 'develop' into 'develop'
...
Hebrew Translation
See merge request pleroma/pleroma-fe!277
2018-06-08 13:28:57 +00:00
Roger Braun
8c2a0191a5
Merge branch 'dr1ft/pleroma-fe-develop' into develop
2018-06-08 15:26:13 +02:00