Commit Graph

597 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Astra
a759378b4d more lint fixes 2018-06-07 05:18:54 -04:00
Astra
f49229974a correct linter problems 2018-06-07 05:08:39 -04:00
Astra
92a8ca0011 crt's compose box changes 2018-06-07 05:03:50 -04:00
riking
da1112297a fix: enable translating login form placeholder 2018-06-06 23:44:11 -07:00
William Pitcock
d7d787b84c user card: show that the account is locked if it is 2018-06-07 02:16:30 +00:00
William Pitcock
7389f07115 follow requests: refactor to properly leverage vuex 2018-06-07 01:24:31 +00:00
William Pitcock
f3a27764aa add follow requests UI 2018-06-07 00:58:44 +00:00
User
32d7646db1 Fix the height of file inputs 2018-05-29 21:44:45 +02:00
User
890312a0dc Visually separate the settings items 2018-05-29 21:34:19 +02:00
William Pitcock
7a08ba43e2 user settings: enable locking/unlocking an account 2018-05-29 14:19:28 +00:00
Syldexia
5ae7fb871e Fix formatting 2018-05-21 23:01:33 +01:00
Syldexia
e0ba6a5876 Added change password to user settings 2018-05-21 23:01:09 +01:00
Roger Braun
f06fef26b1 Display visibility if available. 2018-05-20 18:28:01 +02:00
Roger Braun
959b2d9d66 Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion 2018-05-20 13:16:49 +02:00
chip
fcc1ab1d85 Pass the "Collapse" label throught the translation function 2018-05-19 20:35:14 +02:00
lambda
5da881e98d Merge branch 'develop' into 'develop'
use es6 notation for exportFollows

See merge request pleroma/pleroma-fe!263
2018-05-18 10:45:08 +00:00
aka
3c525d6a3b use es6 notation for exportFollows 2018-05-18 07:34:36 -03:00
lambda
166d9294c4 Merge branch 'feature/follows-export' into 'develop'
Adds an option to export follows (fixed)

See merge request pleroma/pleroma-fe!261
2018-05-18 07:51:00 +00:00
aka
fed8781583 fix linting 2018-05-16 19:51:52 -03:00
aka
fae7a40aeb Adds an option to export follows 2018-05-13 20:47:08 -03: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
4c3d62da04 fixed autocomplete lacking highlight 2018-05-12 15:19:53 +03:00
Henry Jameson
55aeb5b4b2 fix 2018-05-12 15:19:53 +03:00
Henry Jameson
e93ce99198 small fix + white color for user-card + opaque outline for text 2018-05-12 15:19:53 +03:00