Commit graph

959 commits

Author SHA1 Message Date
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
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
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
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
lambda
17f6eb18e7 Revert "Merge branch 'cw-clickthrough' into 'develop'"
This reverts merge request !291
2018-07-12 07:20:39 +00: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
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
Roger Braun
d64293506c Make scope options optional, refactoring. 2018-06-08 15:25:48 +02:00
Astra
d62e702994 should resolve a 3/4 things 2018-06-07 17:31:43 -04:00
Artik Banana
72d9322c02 Update messages.js 2018-06-07 20:37:06 +00:00
Artik Banana
24eddeb3e1 Update messages.js 2018-06-07 20:28:43 +00:00
Artik Banana
da0dcdaaf8 Update messages.js 2018-06-07 20:28:16 +00:00
Artik Banana
17aa44862b Update messages.js 2018-06-07 20:20:20 +00:00