Commit Graph

1248 Commits

Author SHA1 Message Date
kaniini fe906cc3f0 Merge branch 'develop' into 'notifications'
# Conflicts:
#   src/main.js
2018-08-24 23:00:56 +00:00
scarlett da96294866 Don't hide replies when inConversation. 2018-08-24 21:46:45 +01:00
scarlett 60b115320f Fix indentation 2018-08-24 20:19:22 +01:00
scarlett 50b3bd22e6 Remove old implementation of isReply. 2018-08-24 20:08:49 +01:00
scarlett 296ab54301 Add settings for changing the visibility of replies in the timeline. 2018-08-24 20:04:26 +01: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
kaniini 0429963e63 Merge branch 'easy-japanese' into 'develop'
Easy Japanese translation

See merge request pleroma/pleroma-fe!305
2018-08-24 18:45:22 +00:00
kaniini 71576947ed Merge branch 'feature/update-russian-translation' into 'develop'
Update Russian translations

See merge request pleroma/pleroma-fe!313
2018-08-24 18:43:54 +00:00
kaniini b0568ca5c3 Merge branch 'center-bios' into 'develop'
Centre-align profile bios.

See merge request pleroma/pleroma-fe!311
2018-08-24 18:42:09 +00:00
dtluna 81c04fac17 Update Russian translations 2018-08-24 21:21:14 +03:00
tsukada-ecsec dfc5f170c6 update 2018-08-24 18:46:14 +09:00
Henry Jameson 13acdc4a00 fixed error not displaying for 500 error. 2018-08-22 15:51:03 +03:00
tsukada-ecsec 0647c1bb72 debug 2018-08-22 15:15:15 +09:00
tsukada-ecsec 54166c3ad3 update settings 2018-08-22 11:47:36 +09:00
tsukada-ecsec 41256045f2 revert main.js 2018-08-22 11:38:04 +09:00
scarlett 2596f22814 Centre-align profile bios. 2018-08-21 19:16:03 +01: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
William Pitcock 95e6bccec5 Revert "Unify button styles and use min-width"
This reverts commit 8f79193883.
2018-08-20 18:06:29 +00:00
Henry Jameson b97db4912d error display 2018-08-20 20:45:54 +03:00
Henry Jameson f9b0a95969 removed style for rounding bottom part of notifications because there's now
always "load more" footer
2018-08-20 20:08:21 +03:00
Henry Jameson 3ccea3442e fix custom emoji in username, fix gif avatar not being animated when hovering on
the notification
2018-08-20 20:05:12 +03:00
Henry Jameson 35b912bce4 Merge remote-tracking branch 'upstream/develop' into notifications
* upstream/develop: (23 commits)
  Rename expandCW to collapseMessageWithSubject.
  fix indent
  Add support for configurable CW clickthrough.
  Merge upstream
  fix lint issues
  allow default visibility scope to be configured
  Revert "storing entire config instead of each separate thing of it, so that future"
  fixes hella ton of annoyances with file upload display
  using custom ascend value as suggested here: https://github.com/fontello/fontello/issues/513#issuecomment-237551101 helped.
  disable hinting because it breaks alignment on some icons (namely - locks)
  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
  Configurable video looping, option to not to loop silent videos. Updated localization strings.
  added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
  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.
  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
  fix potential stretched spurdo
  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.
  Add validation of the imported theme and the corresponding warning message
  Unify button styles and use min-width
  Add German localization for theme import/export
  ...
2018-08-20 20:04:54 +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 fa66385c5b Updated localization files 2018-08-20 19:06:04 +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
ensra 3ec8e43a97 Rename expandCW to collapseMessageWithSubject.
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +01:00
ensra 671db023da fix indent 2018-08-20 03:08:39 +01:00
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
Sebastian Huebner 45478d4bed
i18n/messages.js: changed Folgende back to Follower 2018-08-15 10:29:19 +02:00
Henry Jameson d2ec70c323 added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click 2018-08-15 11:20:40 +03:00
Sebastian Huebner 1dddce5624 updated german translation 2018-08-15 10:18:16 +02: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 af47d51cd1 Merge branch 'develop' into 'patch-1'
# Conflicts:
#   src/i18n/messages.js
2018-06-08 13:30:49 +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
Artik Banana da444e85ee Update messages.js 2018-06-07 19:56:25 +00:00
Roger Braun 72d7693f56 Update translation. 2018-06-07 19:53:08 +02: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 21868a7f91 Add initial translations of username placeholder 2018-06-06 23:52:28 -07: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
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
Artik Banana 8a49174171 Update messages.js 2018-06-06 17:43:36 +00:00
Artik Banana dd437222d0 Update messages.js 2018-06-05 09:09:30 +00:00
Sebastian Huebner fb0f9f99af corrected a typo and changed/shortend delete_account_error text 2018-06-04 10:58:05 +02: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
chip 256ff7db6a Add French translations for the new user settings
Add French translations for the new user settings :
- Password change
- Follows export
- Account deletion
2018-05-26 21:56:59 +02:00
dtluna 3a227cb3b4 Update Russian translation 2018-05-26 12:16:22 +03:00
Sebastian Huebner 5b699bb7fb updated german translation 2018-05-25 11:23:31 +02: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
chip 8bd561c285 Correct typo in french translation 2018-05-18 21:39:21 +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
pizzaiolo 9b86fc4dcd cleaning up some translations that broke the building 2018-05-17 13:24:48 +00:00
aka fed8781583 fix linting 2018-05-16 19:51:52 -03:00
Roger Braun 954e6e0763 Make nsfw image easier to understand. 2018-05-16 13:01:17 +02:00
pizzaiolo c8cdfda01c fix trailing comma 2018-05-16 10:56:46 +00:00
lambda c9e14d7eab Merge branch 'patch-5' into 'develop'
[i18n]Update messages.js

See merge request pleroma/pleroma-fe!259
2018-05-16 10:54:40 +00:00
Azurolu fc2bb10444 Improved french translation thanks to Chip's suggestions, added inputRadius' french translation. 2018-05-16 01:42:54 +00:00
Azurolu 1487474c18 Added inputRadius french translation and improved french translation as discussed with Chip. 2018-05-15 11:17:32 +00:00
Exilat 1ff089a175 Update messages.js 2018-05-15 05:14:59 +00: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
Henry Jameson fc1283da83 fixed nsfw hider having very small height, some border-radii for consistency 2018-05-12 15:19:53 +03:00
Henry Jameson 57e91bc783 fix jumping inputbox's height 2018-05-12 15:19:53 +03:00
Henry Jameson 15a7151ade Entire area around user counters are clickable now, not just the header-link 2018-05-12 15:19:53 +03:00
Henry Jameson 61fd0b65d9 i18n 2018-05-12 15:19:53 +03:00
Henry Jameson f1478935da user card no longer uncomfortably close to user name in timeline 2018-05-12 15:19:53 +03:00
Henry Jameson bc85e5f0c1 Further usercard readibility. Made it visible which "tab" is actiavated - should
be enough to hint user that you can click "following" / "followers". Fixes #77
2018-05-12 15:19:53 +03:00
Henry Jameson a6fa913f45 Input fields separate radii 2018-05-12 15:19:53 +03:00
Henry Jameson 008b36dc24 gave text some shadow-outline to make it more readable on white backgrounds +
fixed weird layout (WHY)
2018-05-12 15:19:53 +03:00
Henry Jameson e23986e239 unnecessary styles removed (fixes transparent color userstyle) 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
pizzaiolo 7187a8f2dc Update and fix messages.js (pt, eo) 2018-05-06 21:25:32 +00:00
hakabahitoyo 36b1c09831 add space 2018-05-06 11:33:53 +09:00
Hakaba Hitoyo d9d6a497d9 debug 2018-05-05 01:02:39 +09:00
Hakaba Hitoyo 2471b71aab osa-compatible who to follow provider 2018-05-05 00:53:40 +09:00
hakabahitoyo 0691af1367 debug 2018-05-05 00:43:18 +09:00
Hakaba Hitoyo 2ade177d5a configurable who to follow panel 2018-05-05 00:20:19 +09:00
Hakaba Hitoyo 77ffa89464 Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable 2018-05-04 23:50:14 +09:00
lambda 68cb614db9 Merge branch 'develop' into 'develop'
Added a complete Esperanto translation.

See merge request pleroma/pleroma-fe!240
2018-04-29 14:52:39 +00:00
lambda bff20a29b7 Merge branch 'nb' into 'develop'
Add Norwegian localization

See merge request pleroma/pleroma-fe!241
2018-04-29 14:52:01 +00:00
lambda 805410b933 Merge branch 'feature/redirect-root-by-login-or-not' into 'develop'
Redirect root by login ro not login

See merge request pleroma/pleroma-fe!251
2018-04-29 14:51:15 +00:00
Roger Braun 462eeb90b9 Add message preset functionality. 2018-04-29 16:44:08 +02:00
Hakaba Hitoyo 150b815407 lint 2018-04-29 18:09:49 +09:00
Hakaba Hitoyo b1d1c7cfc4 lint 2018-04-29 18:07:40 +09:00
Hakaba Hitoyo 2a6721ea56 redirect root by login or not 2018-04-29 17:55:23 +09:00
Roger Braun 3ffb17c0ae Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading 2018-04-27 09:59:31 +02:00
Hakaba Hitoyo bb92798b74 Collapse chat by default 2018-04-24 07:48:30 +00:00
Roger Braun 935b7745ea Fix nsfw in notifications again. 2018-04-23 19:22:28 +02:00
Roger Braun 39026f8bc3 Fix repeat nsfw hiding. 2018-04-23 19:07:47 +02:00
lambda 9557ec59a8 Update timeline.js 2018-04-22 20:16:28 +00:00
csaurus 59f98aecd9 Stop blink from loading more statuses with every scroll. 2018-04-22 16:12:34 -04:00
Hakaba Hitoyo 033170212f merge 2018-04-22 00:48:06 +09:00
morguldir 741cd8cb67 Add Norwegian localization 2018-04-21 02:19:55 +02:00
Tirifto dcf07253bc Added Esperanto to the list of language codes. 2018-04-21 01:24:33 +02:00
Tirifto acf96f207d Added a complete Esperanto translation. 2018-04-21 01:03:29 +02:00
Exilat ef4e052ede Small Update messages.js [OC] 2018-04-19 04:57:36 +00:00
Shpuld Shpludson cb240a3e95 Merge branch 'patch-5' into 'develop'
Translated the latest update to french

See merge request pleroma/pleroma-fe!237
2018-04-17 16:52:19 +00:00
eal 7ad837f506 Fix follow import typo. 2018-04-17 15:03:10 +00:00
shpuld 9c90a24133 Merge branch 'fix/no-nsfw-in-repeats' into develop 2018-04-16 18:24:31 +03:00
shpuld 573f01650b Copy parent status nsfw into retweeted_status 2018-04-16 18:19:42 +03:00
shpuld ce0b551c59 some ugly hack to prevent the jump in form height when you input first character 2018-04-16 17:52:43 +03:00
Azurolu 58ae14f184 Update messages.js 2018-04-15 20:44:52 +00:00
Azurolu e9891354df Translated the latest update to french 2018-04-15 18:42:00 +00:00
Azurolu 13d9f12cf3 Update messages.js 2018-04-15 18:14:29 +00:00
Shpuld Shpludson 8a7ed79fd3 Merge branch 'fix/additionalInputboxHeightUpdates' into 'develop'
Fix/additional inputbox height updates

See merge request pleroma/pleroma-fe!235
2018-04-15 17:33:58 +00:00
Henry Jameson e9e37a034c fml 2018-04-15 20:30:06 +03:00
Henry Jameson e1dce2c5af better approach 2018-04-15 19:05:16 +03:00
Henry Jameson 600b2d5bbd Added resizing inputbox on focus so that replying to The Discourse™ is less painful 2018-04-15 18:38:10 +03:00
Shpuld Shpludson 6ef2385d14 Merge branch 'patch-3' into 'develop'
Update messages.js: Added "streaming" french translation and corrected typo.

See merge request pleroma/pleroma-fe!221
2018-04-15 05:12:07 +00:00
shpuld 208b2ed125 Additional check to make console shut up 2018-04-15 00:06:00 +03:00
shpuld e88bb1a23e I broke timelines again, fixed now again (hopefully). 2018-04-14 22:13:28 +03:00
shpuld 3488141fdd Whoops, broke older statuses accidentally 2018-04-14 17:18:07 +03:00
shpuld fb7a5af303 Merge branch 'fix/add-back-timeline-id-overlap' into develop 2018-04-14 16:40:28 +03:00
shpuld dff27357d4 remove +1/-1 from min/max id checking 2018-04-14 16:33:53 +03:00
shpuld fa8fa2d330 Force oembeds to use 100% width 2018-04-14 15:45:38 +03:00
shpuld c3bea8dfd1 Fix rt heading alignment again 2018-04-14 14:28:20 +03:00
shpuld 1a2bd28f53 Merge branch 'develop' into fix/status-heading-alignment-issues 2018-04-14 14:26:07 +03:00
shpuld 424e9166d9 Fix alignment issues in status heading and repeat info 2018-04-14 14:24:05 +03:00
Shpuld Shpludson 9587c6dac1 Merge branch 'fix/better-timeline-min-max-id-behavior' into 'develop'
Fix/better timeline min max id behavior

See merge request pleroma/pleroma-fe!233
2018-04-14 09:52:54 +00:00
shpuld 3153bb5b05 Also fix wrong color in user card 2018-04-14 10:24:39 +03:00
shpuld 96692454a0 change external link icon, move chat from side panel to floating, hide own bio, prevent body/app from scrolling horizontally. 2018-04-14 10:19:09 +03:00
shpuld 1db9b1e1ad Fix long names in notifications too 2018-04-14 08:59:55 +03:00
shpuld 121f7424dc Fix overflowing long maes in statuses and repeats. 2018-04-14 07:44:59 +03:00
shpuld ab2546ab38 Fix timeline error not using correct styling while at it 2018-04-13 23:04:31 +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
dtluna e168837f24 Update Russian l10n 2018-04-13 17:01:02 +03:00
dtluna a7ec41d726 Update Russian l10n 2018-04-13 16:57:28 +03:00
Roger Braun a30f90c768 Update polish translation (thanks, roka!) 2018-04-13 10:29:28 +02:00