Commit Graph

1728 Commits

Author SHA1 Message Date
Starmancer 4c5073a66c minor modification of Chinese translation 2018-11-09 14:29:14 +08:00
Starmancer 819e9ce6a3 update Chinese translation 2018-11-09 14:15:55 +08:00
Nebula e1d21512a9 Add Chinese language 2018-11-09 05:42:32 +00:00
Roger Braun 2c2c4452b9 Fix posting. 2018-11-08 19:34:59 +01:00
Roger Braun 1de382f026 Put oauth text into description. 2018-11-08 19:27:19 +01:00
Roger Braun a04795d723 Display OAuth login on login form button. 2018-11-08 16:12:05 +01:00
Roger Braun 6f668df697 Count spoiler text in the character count. Fixes #135. 2018-11-07 17:20:33 +01:00
Roger Braun 50264410f5 Add login form back in. 2018-11-07 16:56:12 +01:00
Roger Braun bcbaf5d7ee Linting. 2018-11-06 21:51:22 +01:00
Roger Braun 4d9680e797 Re-activate registration, use oauth password flow to fetch token. 2018-11-06 21:48:05 +01:00
Roger Braun b6cd4ff32a Fix typo. 2018-11-06 21:47:11 +01:00
dgold 4f258b4940
Added Irish (Gaeilge) Language
All translations checked with tearma.ie & acmhainn.ie for language use
and technical accuracy.
2018-11-02 20:08:11 +00:00
Roger Braun fbe30b4922 Merge remote-tracking branch 'origin/develop' into oauth 2018-10-26 16:13:05 +02:00
Roger Braun 0aa5fe9d0d Remove gonsole.logg :DD 2018-10-26 16:05:27 +02:00
Roger Braun 60b3e4f40f Fix linting. 2018-10-26 15:20:39 +02:00
Roger Braun 9af204b293 Move login to oauth. 2018-10-26 15:16:23 +02:00
hakabahitoyo 630c6e3e44 simplify code 2018-10-26 15:08:51 +09:00
Hakaba Hitoyo 01aba3f9c6 adapt to destructive change of api 2018-10-26 10:13:53 +09:00
Henry 7f0e140a4f Merge branch 'patch-1' into 'develop'
Updated italian translation

See merge request pleroma/pleroma-fe!364
2018-10-25 13:03:49 +00:00
silkevicious c61e658c1d Updated italian translation 2018-10-25 09:36:15 +00:00
Exilat d1614c432f Update oc.json 2018-10-25 05:54:35 +00:00
Exilat 68d90684c4 Update oc.json 2018-10-24 05:50:49 +00:00
Exilat 8c585b0291 Update of the oc.json file
Actualizacion del fichièr oc.json
2018-10-23 19:19:11 +00:00
Henry 48d6483700 Merge branch 'instance-setting-fallback' into 'develop'
Fall back to instance settings consistently

See merge request pleroma/pleroma-fe!361
2018-10-21 21:01:22 +00:00
fadelkon ec7b7ab49c Sort messages object by language code so that it's easier from the UI to browse them. 2018-10-21 22:18:38 +02:00
scarlett c02a9089e1 explicitly set collapseMessageWithSubject to undefined 2018-10-21 19:42:38 +01:00
scarlett d6ad08050a Fall back to instance settings consistently 2018-10-21 18:04:23 +01:00
Henry 82cc37a55e Merge branch 'i18n/arabic' into 'develop'
Add arabic translation

See merge request pleroma/pleroma-fe!360
2018-10-21 12:43:30 +00:00
ButterflyOfFire 131526373f Adding arabic to messages.js 2018-10-21 15:38:56 +03:00
ButterflyOfFire 373d6ca990 Adding arabic translation. 2018-10-21 15:37:44 +03:00
Henry Jameson 7b657fcccd added contrasts for rgbo 2018-10-21 15:25:21 +03:00
Henry d81887e34f Merge branch 'catalan' into 'develop'
Create catalan translation

See merge request pleroma/pleroma-fe!355
2018-10-17 18:36:35 +00:00
fadelkon bf3e3f8b9a Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text. 2018-10-16 18:11:49 +02:00
scarlett 2bb663f0f6 satisfy lint 2018-10-16 14:15:04 +01:00
scarlett 4cc1ed6171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics 2018-10-16 14:09:29 +01:00
fadelkon 0c2f4b925e Add catalan require to messages.js 2018-10-14 11:25:20 +02:00
morguldir 7c4790d1bc Update norwegian translation 2018-10-14 06:22:04 +02:00
fadelkon 59dec1b43f Finish general and timeago catalan strings. Glossary:
* bio: presentació
* timeline: flux [d'entrades]
* post/status: entrada
* settings: configuració
* user: usuari/a
* users: usuàries
* background: fons de pantalla
* banner: fons de perfil
* follower: seguidor/a
* follow: contacte/a qui segueixo
* avatar: avatar
* [visibility] scope: abast de la publicació

Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ .
2018-10-13 18:17:00 +02:00
Henry Jameson 4b7b7d9905 cleanup, documentation, contrast taking alpha into account. 2018-10-10 05:39:02 +03:00
Henry Jameson 87e98772b0 initial contrast display support 2018-10-10 00:07:28 +03:00
Henry Jameson 4d77b0c86b Transparency works without exploding now. All nice. 2018-10-07 22:03:34 +03:00
Henry Jameson 96804d42f0 Some themeing is working!! 2018-10-07 19:59:22 +03:00
Henry Jameson 5441766c3c fix 2018-10-04 18:27:27 +03:00
Henry Jameson 0a4b07652a trying to fix transition 2018-10-04 18:16:14 +03:00
Henry Jameson fb29e7c73d more workings and even less explosions. 2018-10-03 21:21:48 +03:00
Henry Jameson f78a5158e1 something works without exploding and i'm tired already 2018-10-02 21:43:58 +03:00
fadelkon f8323b72ae Translate some strings to catalan. Most part of block "settings" is not translated yet 2018-10-02 20:33:07 +02:00
fadelkon 0beba08618 Add placeholder catalan translation file to be able to see the work in progress in further commits 2018-10-02 20:31:02 +02:00
kaniini 65c03f1a0b Merge branch 'i18n/no_rich_text' into 'develop'
Less confusing description for no_rich_text_formatting

See merge request pleroma/pleroma-fe!351
2018-09-27 21:24:23 +00:00
Henry Jameson b66d7901f1 forgot to actually handle the instance config. this part needs a rewrite... 2018-09-25 16:31:06 +03:00
Henry Jameson d5e82625d3 lint fix 2018-09-25 15:21:47 +03:00
Henry Jameson ef968d8e1e now it actually works 2018-09-25 15:16:26 +03:00
Henry Jameson 6165b7366a Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop:
  i think it's due to my shitty js-to-json regex
2018-09-25 14:48:02 +03:00
Henry Jameson 455cd0d028 settings for scope/subject 2018-09-25 14:47:02 +03:00
Henry Jameson 85235981d1 i think it's due to my shitty js-to-json regex 2018-09-25 14:30:05 +03:00
Henry Jameson 11f1bac502 Less confusing description 2018-09-25 14:01:01 +03:00
Haelwenn (lanodan) Monnier 8cb62fae70
src/i18n/fr.json: More accurate translation 2018-09-24 16:55:19 +02:00
hakabahitoyo 86528d84e2 update Japanese translation 2018-09-23 10:27:05 +09:00
William Pitcock 2f674eb13d update french translation 2018-09-22 04:46:09 +00:00
William Pitcock 1af5c8fd39 add support for disabling rich text formatting 2018-09-22 03:54:05 +00:00
Henry Jameson 1c2f0029e4 Merge remote-tracking branch 'upstream/develop' into betterStorage
* upstream/develop:
  More languages
  added usage
  a tool to check what's missing from a language
  all other languages which do not have MRs related to them separated
  seems to be working
2018-09-21 12:14:20 +03:00
Henry Jameson a61ad0544a small thing to display instance-provided default 2018-09-20 17:21:11 +03:00
Henry Jameson 537b1ff2d8 Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop:
  Update Hebrew translation
  fixed autocomplete
  Debug
2018-09-20 16:12:00 +03:00
Henry Jameson 419744080f console.log cleanup 2018-09-17 19:16:58 +03:00
Henry Jameson 03f28d3fa6 Fixed "user.id is undefined" or something error more sane by properly handling
HTTP errors
2018-09-17 18:55:11 +03:00
Henry Jameson e53f238278 undo rename because it makes less sense now. 2018-09-17 18:54:48 +03:00
Henry Jameson 9467462ef0 made FE work even without either api or static config 2018-09-17 18:54:08 +03:00
Henry Jameson 40a175389a Removed warning. Added support for working without static/config.json 2018-09-17 18:00:56 +03:00
Henry Jameson 394153380d more missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson 136add8a2f fix some missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson 1245d7917f translations 2018-09-17 17:51:39 +03:00
Henry Jameson 580aae1b54 Added more stuff that's actually being added to instanceConfig, simplified the whitelist. 2018-09-17 17:51:39 +03:00
Henry Jameson 82fa5d08c4 more refactoring 2018-09-17 17:51:39 +03:00
Henry Jameson 2db991fc7f some recategorization of options... 2018-09-17 17:51:39 +03:00
Henry Jameson f1c16327b6 Initial version 2018-09-17 17:51:39 +03:00
kaniini 7887e42fca Merge branch 'fixAutocomplete' into 'develop'
Fixes broken autocomplete for users

See merge request pleroma/pleroma-fe!344
2018-09-13 19:30:28 +00:00
Artik Banana 9b95c4c7b5 Update Hebrew translation 2018-09-12 16:16:55 +00:00
Henry c94b9796ae Merge branch 'debug-who-to-follow-panel' into 'develop'
Small debug for Who to follow panel

See merge request pleroma/pleroma-fe!342
2018-09-12 08:53:13 +00:00
Henry Jameson 89f9b3a468 fixed autocomplete 2018-09-12 11:46:02 +03:00
Henry Jameson 0c14dd9575 More languages 2018-09-09 18:54:23 +03:00
Henry Jameson 28a26ceab7 Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop:
  fix lint
  Revert "Revert "Update messages.js""
  i18n/messages.js: changed Folgende back to Follower
  updated german translation
  updated german translation
  cleaning up some translations that broke the building
  fix trailing comma
  Update and fix messages.js (pt, eo)
2018-09-09 18:44:03 +03:00
Henry 4bff6f12ed Merge branch 'feature/update-de-translation' into 'develop'
updated german translation

See merge request pleroma/pleroma-fe!293
2018-09-09 15:41:24 +00:00
Hakaba Hitoyo 207c188c16 Debug 2018-09-09 15:22:55 +00:00
Henry dda0effd65 Merge branch 'pizzaiolo/pleroma-fe-patch-1' into 'develop'
Update and fix messages.js (pt, eo)

See merge request pleroma/pleroma-fe!341
2018-09-09 13:27:19 +00:00
Henry Jameson aea00310c6 fix lint 2018-09-09 16:01:44 +03:00
Henry 8455936cd6 Merge branch 'develop' into 'develop'
Update the Occitan language - Fixed Linting

See merge request pleroma/pleroma-fe!339
2018-09-09 12:58:09 +00:00
Henry Jameson 0656e0ef32 Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop: (21 commits)
  use prime number step for Who to follow panel
  fix
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  remove formatting options
  Remove outdated settings
  features panel i18n
  features panes supports chat & gopher
  fix collapse link being too small
  small fix for non-square gif avatars
  Fixed collapseMessageWithSubjectLocal always using instance-provided config.
  Fix last place with usercard having wrong width
  Fixed non-masked image looking weird in chrome.
  Kinda went back to using align-items: stretch. Fixed error message floating.
  Simplified image sensitivity label
  show features panel only if not login
  update
  debug
  update
  debug
  ...
2018-09-09 15:55:43 +03:00
kaniini ed6abeacad Merge branch 'post-polish-fixes' into 'develop'
Post polish fixes

See merge request pleroma/pleroma-fe!333
2018-09-09 11:59:49 +00:00
kaniini 369fd648f6 Merge branch 'remove-outdated-settings' into 'develop'
Remove outdated settings

See merge request pleroma/pleroma-fe!335
2018-09-09 11:56:34 +00:00
kaniini eb93034a40 Merge branch 'simplify-sensitivity-label' into 'develop'
Simplified image sensitivity label

See merge request pleroma/pleroma-fe!334
2018-09-09 11:55:49 +00:00
Hakaba Hitoyo 3a17252929 use prime number step for Who to follow panel 2018-09-09 14:34:51 +09:00
Henry Jameson 5726be6830 fix 2018-09-08 05:16:25 +03:00
Artik Banana 78e12bc812 Revert "Revert "Update messages.js""
This reverts commit 385484566a
2018-09-07 16:51:25 +00:00
Henry 2eab0cb115 Merge branch 'feature/features-panel' into 'develop'
Features panel

See merge request pleroma/pleroma-fe!331
2018-09-07 16:37:24 +00:00
Henry 385484566a Revert "Update messages.js"
This reverts commit 5e1f0d9416
2018-09-07 16:22:59 +00:00
Artik Banana 5e1f0d9416 Update messages.js
Update the Occitan language - Fixed Linting
2018-09-07 16:18:01 +00:00
Henry Jameson e6adddbba6 added usage 2018-09-06 22:10:41 +03:00
Henry Jameson dbd010abd4 a tool to check what's missing from a language 2018-09-06 21:59:20 +03:00
Henry Jameson b4a5fddea8 all other languages which do not have MRs related to them separated 2018-09-06 21:29:39 +03:00
Henry Jameson 9f84f4ea05 seems to be working 2018-09-06 19:39:56 +03:00
hakabahitoyo 8b94ea28ec remove formatting options 2018-09-04 14:50:02 +09:00
hakabahitoyo dbf24e1fbf Remove outdated settings 2018-09-04 11:15:00 +09:00
Hakaba Hitoyo 49ab19c342 features panel i18n 2018-09-04 10:59:02 +09:00
Hakaba Hitoyo 65115bfc7f features panes supports chat & gopher 2018-09-04 10:44:25 +09:00
scarlett 145929207e Revert "Don't only include whitespace conditionally, to fix the fade."
This reverts commit 8dc85b057e.
2018-09-04 02:00:12 +01:00
scarlett 8dc85b057e Don't only include whitespace conditionally, to fix the fade. 2018-09-04 01:19:59 +01:00
scarlett 5a59eb4efa Don't hide the bio. 2018-09-04 01:10:22 +01:00
scarlett 699ee0891d Changeable defaults for hideUserStats and hidePostStats 2018-09-04 00:48:14 +01:00
scarlett bdcbd110e4 Add option for hiding post statistics (e.g. repeats, favs) 2018-09-04 00:41:52 +01:00
scarlett dcb7e1ecf4 Add option for disabling counts (followers, statuses) in user profiles. 2018-09-04 00:32:25 +01:00
Henry Jameson dc0b47e8bd fix collapse link being too small 2018-09-03 23:30:07 +03:00
Henry Jameson f9eb9e0b70 small fix for non-square gif avatars 2018-09-03 22:49:46 +03:00
Henry Jameson 6e64324d37 Fixed collapseMessageWithSubjectLocal always using instance-provided config. 2018-09-03 22:40:45 +03:00
Henry Jameson d4f9d21857 Fix last place with usercard having wrong width 2018-09-03 22:23:53 +03:00
Henry Jameson 08b044c365 Fixed non-masked image looking weird in chrome. 2018-09-03 22:18:59 +03:00
Henry Jameson a6047e0ad5 Kinda went back to using align-items: stretch. Fixed error message floating. 2018-09-03 22:12:18 +03:00
Henry Jameson 36101abc22 Simplified image sensitivity label 2018-09-03 18:52:07 +03:00
Dingdreher 900aaefb98 Update users.js 2018-09-03 12:01:05 +00:00
hakabahitoyo fa477dd41f show features panel only if not login 2018-09-03 16:02:06 +09:00
hakabahitoyo 38b683b30c update 2018-09-03 15:57:22 +09:00
Hakaba Hitoyo 049e2397b1 update 2018-09-03 15:23:09 +09:00
hakabahitoyo 07ef43c7b5 debug 2018-09-03 14:55:40 +09:00
Hakaba Hitoyo 52fe01e4d8 mock features panel 2018-09-03 14:43:10 +09:00
Shpuld Shpludson 20b0ffc0b9 Merge branch 'imvomitingasicodethisshit' into 'develop'
Made showing format selection optional and default to false

See merge request pleroma/pleroma-fe!329
2018-09-01 05:57:58 +00:00
Henry Jameson d6240c25cf small fix 2018-08-31 17:24:46 +03:00
Henry Jameson 17f30190e0 Made showing format selection optional and default to false 2018-08-31 17:00:41 +03:00
shpuld 77e8933b2e Fix mistakes 2018-08-31 16:13:43 +03:00
shpuld 384c80e238 Change styles a bit, make pre-formatted blocks not overflow but scroll 2018-08-31 16:04:52 +03:00
shpuld f07e6b271c Add styles for h1/2/3/4/5 tags in status html 2018-08-31 15:11:27 +03:00
William Pitcock f9bfe2ea37 post status form: styling fixes for content-type selector, align icons with selector 2018-08-31 04:23:06 +00:00
kaniini 958acbab8d Merge branch 'polish' into 'develop'
Another one of those MR that fixes many many small-to-medium things

Closes #92, #75, #122, #52, #72, and #87

See merge request pleroma/pleroma-fe!324
2018-08-31 04:10:17 +00:00
meireikei 2e37e8cf39 Pass user id to fetchFriends
It looks like the API that fetchFriends expects was changed, to require
an ID.
2018-08-31 04:07:25 +00:00
kaniini e71b0411aa Merge branch 'post-button-labels' into 'develop'
Add labels to post buttons

See merge request pleroma/pleroma-fe!323
2018-08-31 04:04:44 +00:00
William Pitcock cabcb5c81b i18n: make "plain text" translatable 2018-08-31 03:42:12 +00:00
William Pitcock 9a43ba73e6 add the ability to select a post's content type 2018-08-31 03:42:11 +00:00
Henry Jameson 8c07e63f77 fix 2018-08-31 04:39:07 +03:00
Henry Jameson 46d8b55d44 Merge remote-tracking branch 'upstream/develop' into polish
* upstream/develop:
  i18n: make "plain text" translatable
  add the ability to select a post's content type
2018-08-31 04:20:40 +03:00
Henry Jameson e99534ef71 added option for logo in navbar to follow color scheme of the rest of the site
also fixed potential mess-up between api/static configs
2018-08-31 04:06:00 +03:00
William Pitcock 20a67e6809 i18n: make "plain text" translatable 2018-08-31 00:44:25 +00:00
William Pitcock 38e3c2493d add the ability to select a post's content type 2018-08-31 00:42:42 +00:00
Henry Jameson 63fdad8703 fix 2018-08-30 22:59:52 +03:00
Henry Jameson 1461a52ade vodka translations 2018-08-30 20:45:50 +03:00
Henry Jameson 065d1c7f49 fix 2018-08-30 20:16:36 +03:00
Henry Jameson 3b9cb1384a fix 2018-08-30 19:53:13 +03:00
Henry Jameson fa4c4c9122 fixed #87 2018-08-30 18:23:43 +03:00
Henry Jameson fa1116249d fixup! panel styling cleanup 2018-08-30 17:13:54 +03:00
Henry Jameson 507d5bc444 fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing. 2018-08-30 16:27:35 +03:00
Henry Jameson 1246463f96 fixes broken nsfw hider in notifications 2018-08-30 16:21:10 +03:00
Henry Jameson fb7f65481e restored "progress" cursor indicator for loading nsfw images 2018-08-30 16:11:31 +03:00
Henry Jameson e58221fb87 fixed #72 2018-08-30 16:02:53 +03:00
Henry Jameson b0e0686c7f Added ability to hide certain types of notifications 2018-08-28 21:21:29 +03:00
Henry Jameson 66a22762c2 fixup! Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-28 16:22:49 +03:00
Henry Jameson da362b2b88 minor style tweaks 2018-08-28 16:20:04 +03:00
Henry Jameson 330288b4cd panel styling cleanup 2018-08-28 16:14:32 +03:00
Henry Jameson c3b27ab4c2 moved replies filtering to "filter" category in settings, made it more consistent 2018-08-28 15:47:42 +03:00
Henry Jameson cff4177bf3 settings page update 2018-08-28 15:38:07 +03:00
Henry Jameson b48a3210a3 tabs for settings 2018-08-28 14:28:05 +03:00
Henry Jameson 8e560676f1 allow multiple file upload 2018-08-28 14:05:03 +03:00
Henry Jameson 68d15f665e Show lock icon instead of hiding repeat button, tusky-style. Added hint
explaining what's going on. Fixes favorite button jumping left and right
depending on post visibility
2018-08-28 13:42:44 +03:00
Henry Jameson 226849b26e Added logic to process reply to favorite request and update likes counter
accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
2018-08-27 23:15:58 +03:00
Henry Jameson fd604dfd2a fixed still-image not preserving original aspect ratio and resolution. 2018-08-27 22:40:30 +03:00
Henry Jameson eacbd9b500 Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-27 22:22:25 +03:00
Ekaterina Vaartis d2640d4bb5 Add titles to source/expand buttons 2018-08-27 12:55:46 +03:00
Ekaterina Vaartis 14c1704ea1 Add titles to post visibility icons 2018-08-27 12:55:46 +03:00
scarlett 74a6df8a55 Match users using startsWith instead of match. 2018-08-26 13:51:21 +01:00
scarlett b68ebf3056 Match emoji using startsWith instead of match. 2018-08-26 13:50:36 +01:00
kaniini bc4f09b775 Merge branch 'serverside-frontend-configuration-2' into 'develop'
serverside-frontend-configuration-2

See merge request pleroma/pleroma-fe!312
2018-08-26 06:20:19 +00:00
scarlett 54ac0dfefd Preserve subject in replies. 2018-08-26 01:50:11 +01:00
kaniini a7c6007d54 Merge branch 'attachment-collapse' into 'develop'
When a post with a subject is collapsed, hide its attachments.

See merge request pleroma/pleroma-fe!316
2018-08-26 00:02:32 +00:00
kaniini 5bb5ef43ef Merge branch 'language-override' into 'develop'
Make interface language configurable from settings

Closes #36

See merge request pleroma/pleroma-fe!315
2018-08-26 00:01:33 +00:00
scarlett 52ce86ed57 Don't use nsfw clickthrough if the post is collapsed by default. 2018-08-26 00:21:54 +01:00
Hakaba Hitoyo c6913e3909 correct /static/config.json decoding 2018-08-26 07:01:56 +09:00
Hakaba Hitoyo 8b9e973a55 save /api/statusnet/config.json connection 2018-08-26 07:00:23 +09:00
Hakaba Hitoyo a3cc78115c rename apiStatusnetConfigSitePleromafe to apiConfig 2018-08-26 06:56:52 +09:00
Hakaba Hitoyo a81c3b1324 fix typo 2018-08-26 06:54:03 +09:00
scarlett a7811e7bd9 Add a checkbox for marking a post's attachments as NSFW 2018-08-25 22:18:43 +01:00
scarlett d50440d802 When a post with a subject is collapsed, hide its attachments. 2018-08-25 20:33:44 +01:00
Ekaterina Vaartis c1e4bfa90f Make interface language configurable from settings
The locale can now be configured in settings and is stored in
Vuex. The changes are applied immidiately after selection. The list of
languages is taken from the messages file, which contains all the
available locales (and a new value, `interfaceLanguage`, to control
the translation of this option in the options menu)

Closes #36
2018-08-25 13:29:49 +03:00
William Pitcock 30a6b7be5b attachment: add support for rendering alt text on images 2018-08-25 00:32:10 +00:00
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
William Pitcock f4ee222e3c make nsfw censor image configurable 2018-04-22 09:10:10 -05: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
Exilat a2f478a769 [i18n] OC: new strings 2018-04-13 05:17:04 +00:00
shpuld dc0fd8177c Fix status preview loader having different offset from the actual stats preview 2018-04-12 20:03:03 +03:00
shpuld 8db70ffa85 Fix missing border radii and read button text color 2018-04-12 19:51:33 +03:00
lambda 7ccbec217a Merge branch 'feature/update-de-translation' into 'develop'
updated german translation

See merge request pleroma/pleroma-fe!230
2018-04-12 15:48:26 +00:00
lambda de4664a2ac Merge branch 'patch-2' into 'develop'
[i18n] Update OC: colour settings.

See merge request pleroma/pleroma-fe!227
2018-04-12 15:47:51 +00:00
Sebastian Huebner 1e48a2a402
updated german translation 2018-04-12 17:40:15 +02:00
imncls 168c3b04cf
Add missing Japanese translation and Update some Japanese translation 2018-04-12 23:43:43 +09:00
Exilat ad0fd9f8f2 Update messages.js 2018-04-12 04:57:57 +00:00
Exilat e23f43cafc [i18n] Update OC: colour settings.
Update messages.js
2018-04-12 04:56:56 +00:00
shpuld 974702efc6 aha, found another bug in oembed text 2018-04-11 19:47:03 +03:00
shpuld ee883d0f88 Remove some commented lines and logs 2018-04-11 19:40:59 +03:00
shpuld a1f6ef1dca Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein. 2018-04-11 19:34:40 +03:00
Francis Dinh 52d72599ee Forgot to fix other tabs 2018-04-11 04:29:46 -04:00
Francis Dinh 11a89ee06d Replace tab indentation with spaces 2018-04-11 04:28:27 -04:00
Francis Dinh 3d8d941d89 Make autocomplete case insensitive 2018-04-11 04:23:13 -04:00
Shpuld Shpludson 748e01d3e9 Merge branch 'feature/chat-styling-and-hiding' into 'develop'
Feature/chat styling and hiding

See merge request pleroma/pleroma-fe!224
2018-04-11 03:37:42 +00:00
Shpuld Shpludson 020d2f83f9 Merge branch 'feature/rewrite-status-and-notifications-and-preview' into 'develop'
Rewrite status and notifications and preview, graceful handling of linkless attachments

See merge request pleroma/pleroma-fe!223
2018-04-11 03:37:25 +00:00
Shpuld Shpludson daa018aecf Merge branch 'feature/link-to-remote-user-profile-page' into 'develop'
Add link to original (remote) user profile page

See merge request pleroma/pleroma-fe!219
2018-04-11 03:35:13 +00:00
shpuld 2258c9c1e7 Make collapsed-state hide chat and not the wrong way around 2018-04-11 00:20:42 +03:00
shpuld 49aa2d5fb7 cleanup 2018-04-11 00:19:28 +03:00
shpuld f69a12a912 Make chat collapsable and expandable, make chat look a tiny bit nicer (still works like crap when it comes to scrolling) 2018-04-11 00:17:05 +03:00
shpuld 896fea7dbd Fixes from review 2018-04-10 22:12:59 +03:00
shpuld da1a222cab Add back the status animation 2018-04-10 19:58:25 +03:00
shpuld a327d83e62 Add target _blank to attachment links. 2018-04-10 19:44:57 +03:00
shpuld 6a5116c349 Fixes to notification style issues mostly 2018-04-10 19:25:24 +03:00
shpuld 8835c98529 Merge hj's css overhaul and fix conflicts 2018-04-10 00:28:24 +03:00
Shpuld Shpludson 716e37d95c Merge branch 'cssOverhaul' into 'develop'
Transition to CSS-variables for themes and stuff.

See merge request pleroma/pleroma-fe!217
2018-04-09 20:29:06 +00:00
shpuld c214197cee Separate notification into its own component, fix follow notification type 2018-04-09 20:44:37 +03:00
shpuld ec2a719f0d some cleanup 2018-04-09 19:45:42 +03:00
shpuld f4f9b3fa26 small fixes 2018-04-09 19:43:31 +03:00
Henry Jameson bf2d4516d5 small fix for still-gifs 2018-04-09 02:10:04 +03:00
Henry Jameson bc8ae96cac indent fix (my editor screws up here) 2018-04-08 14:46:36 +03:00
Henry Jameson 4bbc3ada5d fix some incorrect radii 2018-04-08 14:45:12 +03:00
imncls b6a608b447
Improve some Japanese translation 2 2018-04-08 19:11:46 +09:00
imncls b97ef22a32
Improve some Japanese translation 2018-04-08 19:07:08 +09:00
imncls 01c56547d0
Add missing Japanese translation and Update some Japanese translation 2018-04-08 18:58:33 +09:00
Henry Jameson 38d366f9aa some more improvements. changed the way user-card is layout, but should look the
same, except that longer user names should be properly ellipsis-ed.
2018-04-08 04:23:43 +03:00
Henry Jameson 59a05081c5 some styles fixes 2018-04-08 03:43:07 +03:00
Henry Jameson cc02672e14 made alerts use red with transparent theme red. some UI improvs 2018-04-08 03:22:03 +03:00
Henry Jameson 2e95193559 localisations and stuff 2018-04-08 02:52:15 +03:00
Henry Jameson b23bd076c3 raddi customization UI 2018-04-08 02:39:39 +03:00
Henry Jameson 65f82cf294 <select> styling (abeit somewhat not pretty code-wise), default colors for
default schemes.
2018-04-07 21:58:29 +03:00
Henry Jameson 529643d35a indents 2018-04-07 19:30:27 +03:00
Henry Jameson 94195024e6 another post-rebase fix 2018-04-07 16:55:51 +03:00
Henry Jameson 5ded84e982 post-rebase fix 2018-04-07 16:48:49 +03:00
Henry Jameson 3df7c1977f fixes 2018-04-07 16:40:08 +03:00
Henry Jameson 33b1d85921 border-radii moved to variables, made rgbo colors use theme data, customizable
from settings screen.
2018-04-07 16:40:08 +03:00
Henry Jameson acdb5e5c7a cleanup. added fallback mechanism for IE11 and unsupported browsers. 2018-04-07 16:36:35 +03:00
Henry Jameson aa0564406a getting rid of baseXX, some small fixes. Seems to be usable. 2018-04-07 16:34:11 +03:00
Azurolu 986dbab3d2 Update messages.js: Added "streaming" french translation and corrected typo. 2018-04-07 03:28:23 +00:00
hakabahitoyo 02bfea4af3 Change color 2018-04-04 15:04:44 +09:00
Hakaba Hitoyo c72cc431ec Add link to original (remote) user profile page 2018-04-04 05:45:01 +00:00
Roger Braun 936ca1a38c Merge branch 'Exilat_a_Tolosa/pleroma-fe-patch-1' into develop 2018-04-03 18:21:57 +02:00
Exilat 845bdb3dfb Update messages.js 2018-04-03 16:06:28 +00:00
Exilat f62646c2f0 Update messages.js 2018-04-03 16:05:32 +00:00
lambda 6f9ff6edcf Merge branch 'patch-1' into 'develop'
Update messages.js for pt fix

See merge request pleroma/pleroma-fe!214
2018-04-03 09:15:45 +00:00
lambda e4b2fdf124 Merge branch 'stillGifs' into 'develop'
Still gifs

See merge request pleroma/pleroma-fe!193
2018-04-03 09:14:42 +00:00
lambda 214dd1f6d1 Merge branch 'fix/typerror-in-delete-button' into 'develop'
fix typeError in delete_button.js

See merge request pleroma/pleroma-fe!215
2018-04-03 09:13:44 +00:00
Exilat 8cb95be4df Update messages.js 2018-04-02 19:21:39 +00:00
Exilat 146538c126 Update messages.js 2018-04-02 18:48:01 +00:00
Exilat 83dbb81acd Update messages.js 2018-04-02 18:46:56 +00:00
Exilat 362cde1c03 Update messages.js
Occitan language added + corrections in French
2018-04-02 09:27:04 +00:00
hakabahitoyo ef67bd693e using router-link in who-to-follow-panel 2018-03-28 18:18:36 +09:00
hakabahitoyo 5a97cfb959 who-to-follow-panel using internal user link 2018-03-28 17:45:35 +09:00
Hakaba Hitoyo caad818009 using internal link to users 2018-03-28 16:56:47 +09:00
Hakaba Hitoyo 96426425b8 refactoring 2018-03-28 15:57:11 +09:00
Hakaba Hitoyo 6b6b740684 Merge remote-tracking branch 'origin/feature/who-to-follow-panel' into feature/who-to-follow-panel-2 2018-03-28 14:55:12 +09:00
qwexvf 0a62341135
fix typeError in delete_button.js
not a big thing just fixes a typeError.
2018-03-20 22:33:43 +09:00
Daniel Cobalto d57dec6fb4 Update messages.js for pt fix 2018-03-20 01:24:20 +00:00
Sebastian Huebner f6fb592ba1
updated german translation 2018-03-12 11:11:07 +01:00
dtluna bfb2d481bb Add i18n for User Timeline 2018-03-12 03:59:03 +03:00
Henry Jameson 0c4dc26808 after nine years of development, hopefully, it has been worth the weight 2018-03-12 02:31:33 +03:00
Henry Jameson 5efd8a4aa6 fixes 2018-03-12 01:30:27 +03:00
Henry Jameson 55bc1a3414 fixed stretched spurdo in notifications, misc fixes, detect gif by extension for now 2018-03-12 01:30:27 +03:00
Henry Jameson 3257991f41 unfinished fetch() version that doesn't work 2018-03-12 01:30:27 +03:00
Henry Jameson b10787d23c first ver 2018-03-12 01:30:27 +03:00
Hakaba Hitoyo b32573138b Add who-to-follow-panel 2018-02-24 23:04:44 +09:00
eal cd3bf461db Merge branch 'develop' into 'develop'
Always include bio in updates, because it might be empty (optional)

See merge request pleroma/pleroma-fe!209
2018-02-24 08:37:08 +00:00
eal cbd113f762 Merge branch 'feature/user-picker-keyboard-support' into 'develop'
Add keyboard support for user/emoji picker.

Closes #56

See merge request pleroma/pleroma-fe!200
2018-02-24 08:08:41 +00:00
Ekaterina Vaartis cfde2fe439 Always include bio in updates, because it might be empty (optional) 2018-02-21 23:33:04 +03:00
lambda e45cb91e24 Merge branch 'feature/forbid-posting-when-status-length-is-over-the-limit' into 'develop'
Disable the status submit button when status length is over the limit

See merge request pleroma/pleroma-fe!206
2018-02-14 08:06:11 +00:00
dtluna 586faf6317 Add Russian translation 2018-02-11 18:59:17 +03:00
dtluna 591dadad13 Disable the submit button and apply error class to the characters left indicator 2018-02-11 17:07:29 +03:00
Hakaba Hitoyo fe1044dfdf Update main.js 2018-02-10 01:25:51 +00:00
Hakaba Hitoyo ebd8300e36 slove conflict 2018-02-10 10:17:58 +09:00
Hakaba Hitoyo f23940a153 Update App.js 2018-02-10 01:09:49 +00:00
lambda b0f248c483 Merge branch 'feature/post-length-indicator' into 'develop'
Add an indicator for characters left before hitting the limit

See merge request pleroma/pleroma-fe!205
2018-02-09 16:13:16 +00:00
dtluna dcbbd7c53e Add styles on the characters left indicator 2018-02-09 18:22:29 +03:00
dtluna 6c424c355c Add characters left being displayed 2018-02-09 17:51:04 +03:00
dtluna e49cf7b67a Add textlimit 2018-02-09 16:37:32 +03:00
dtluna e2248bcf4f Use `name` and `closed` from the backend 2018-02-09 16:02:26 +03:00
Aka 402f8ead69 Completes spanish translation 2018-02-08 00:51:33 -03:00
Aka 474c13003a Completes spanish translation 2018-02-08 00:46:50 -03:00
eal e647bb22bb Add keys to all component lists. 2018-02-04 17:26:46 +02:00
Hakaba Hitoyo 5dd4631860 debug 2018-02-04 08:43:31 +09:00
Hakaba Hitoyo 013f11497f slove-conflict 2018-02-04 08:36:10 +09:00
Henry Jameson 338245eb63 updated css and stuff for color picker in styles 2018-02-03 22:23:38 +03:00
Henry Jameson 71bdbdf146 wip, styles are a bit broken tho 2018-02-03 21:15:43 +03:00
hakabahitoyo 95cba854f3 add instance specific panel 2018-02-04 00:27:33 +09:00
eal 88c8818deb Add keyboard support for user/emoji picker.
Tab cycles between candidates, shift-tab cycles backwards.
Enter does the action.
2018-02-03 16:59:47 +02:00
Roger Braun d97e6777ba Update vue version. 2018-02-03 15:47:51 +01:00
shp 06265078d8 Fix typo in fav/rt fix 2018-02-03 10:18:53 +02:00
eal f3f0155d60 Fix fav/RT buttons in notifications. 2018-02-02 12:27:31 +02:00
lambda 8010c42768 Merge branch 'fix/chat-visibility' into 'develop'
Show chat only if channel is joined.

See merge request pleroma/pleroma-fe!197
2018-02-02 07:31:17 +00:00
lambda 97854eec58 Merge branch 'remote-follow-button' into 'develop'
Add remote follow button to local user profiles.

See merge request pleroma/pleroma-fe!198
2018-02-02 07:30:58 +00:00
Shpuld Shpludson f2f9343d2a Merge branch 'fix/emoji-align' into 'develop'
Align custom emoji to middle of line.

See merge request pleroma/pleroma-fe!196
2018-02-02 05:38:57 +00:00
eal 664a55fc79 Show fav/RT counts even if not logged in. 2018-02-02 00:45:29 +02:00
eal 689afecb65 Add remote follow button to local user profiles. 2018-02-01 21:30:49 +02:00
eal 043e14d5cb Show chat only if channel is joined. 2018-02-01 19:18:47 +02:00
lambda 3ff39f9b39 Merge branch 'feature/normal-emoji-completion' into 'develop'
Add completion for normal emoji.

Closes #15

See merge request pleroma/pleroma-fe!169
2018-02-01 16:26:43 +00:00
eal 36e68fba96 Merge branch 'develop' into feature/normal-emoji-completion 2018-02-01 18:19:36 +02:00
eal 90175a1872 Fix name clash on unicode and custom emoji 2018-02-01 18:12:23 +02:00
eal fe2e5ba6f0 Align custom emoji to middle of line 2018-02-01 17:18:51 +02:00
aka 84b0d54cd0 Fixes issue #58 2018-01-31 14:48:09 -03:00
aka 33d828d048 Completes portuguese translation 2018-01-31 01:02:36 -03:00
Roger Braun 92289e545a Move chat to sidebar. 2018-01-26 15:11:34 +01:00
Sebastian Huebner 235c1c2651
update ger translation 2018-01-03 11:40:30 +01:00
eal b67c506062 Merge branch 'develop' into feature/normal-emoji-completion 2017-12-23 19:52:16 +02:00
eal a058941aed Add follow import to user settings. 2017-12-23 17:08:45 +02:00
eal 8f3926a096 Detect backend. 2017-12-23 11:31:43 +02:00