Commit Graph

1164 Commits

Author SHA1 Message Date
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 fa66385c5b Updated localization files 2018-08-20 19:06:04 +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 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 61d40f40ae allow default visibility scope to be configured 2018-08-18 17:06:06 +00: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 693eb4b717 cleanup, updated broken favorites look + localization strings 2018-08-16 13:41:45 +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
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
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
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
Henry Jameson 9cebb00faa the missing piece for invites system 2018-08-05 10:01:38 +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 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 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
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 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
Astra ca95a108e3 should resolve a 3/4 things 2018-06-07 17:33:06 -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
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 f3a27764aa add follow requests UI 2018-06-07 00:58:44 +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
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 e0ba6a5876 Added change password to user settings 2018-05-21 23:01:09 +01:00
Roger Braun 959b2d9d66 Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion 2018-05-20 13:16:49 +02:00
chip 8bd561c285 Correct typo in french translation 2018-05-18 21:39:21 +02: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
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 61fd0b65d9 i18n 2018-05-12 15:19:53 +03:00
Henry Jameson a6fa913f45 Input fields separate radii 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
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
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
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 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
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
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 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 f4f9b3fa26 small fixes 2018-04-09 19:43:31 +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 2e95193559 localisations and stuff 2018-04-08 02:52:15 +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
Azurolu 986dbab3d2 Update messages.js: Added "streaming" french translation and corrected typo. 2018-04-07 03:28:23 +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
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
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
dtluna 586faf6317 Add Russian translation 2018-02-11 18:59:17 +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 689afecb65 Add remote follow button to local user profiles. 2018-02-01 21:30:49 +02:00
aka 33d828d048 Completes portuguese translation 2018-01-31 01:02:36 -03:00
Sebastian Huebner 235c1c2651
update ger translation 2018-01-03 11:40:30 +01:00
eal a058941aed Add follow import to user settings. 2017-12-23 17:08:45 +02:00
Sebastian Huebner 64b1b6bcb4
linting again 2017-12-08 17:31:17 +01:00
Sebastian Huebner 15a5d9ef50
linting 2017-12-08 17:28:13 +01:00
Sebastian Huebner 6ce18b58bd
update ger translation 2017-12-08 17:24:06 +01:00
Roger Braun fbee80474b Basic frontend changes for chat. 2017-12-04 19:08:33 +01:00
Sebastian Huebner 6940aa1992
updated ger translation 2017-11-19 19:42:54 +01:00
shpuld d65d6e5da4 Clean up, use translations, persist theme, add more presets. 2017-11-18 13:13:51 +02:00
Sebastian Huebner a9829b8735
updated german translation 2017-11-15 10:36:59 +01:00
lambda 8fdedb4c79 Merge branch 'french-update' into 'develop'
Update french translation.

See merge request pleroma/pleroma-fe!146
2017-11-13 12:23:41 +00:00
lambda 9681f58949 Update messages.js 2017-11-13 12:20:26 +00:00
shpuld 46f23b7de7 Add an option to automatically show new posts when scrolled to the top, also add fade-in animation for posts. 2017-11-13 01:06:48 +02:00
Aka 1390513de0 Adds Portuguese translation 2017-11-11 01:21:49 -03:00
Roger Braun b19fe6e004 Update french translation. 2017-11-10 10:52:10 +01:00
lambda bbd80c54bf Merge branch 'ro-translation' into 'develop'
Romanian translation

See merge request pleroma/pleroma-fe!142
2017-11-09 05:32:15 +00:00
Roger Braun 80ccc2ac27 Add spanish translation.
Thanks, Aemon!
2017-11-09 06:30:49 +01:00
Tibike 510015b044 Corrected the const en to const ro for romanian 2017-11-09 02:49:37 +02:00
Tibike e8f325f345 Added romanian translations 2017-11-09 02:28:33 +02:00
Tibike b35ef607c4 Added missing hungarinan translations 2017-11-09 01:53:53 +02:00
obrez bce37767f2 Update Estonian translation 2017-11-08 19:30:33 +02:00
naf 26d27165d6 add japanese translation 2017-11-08 22:10:13 +09:00
Roger Braun 23d1354046 Update polandish. 2017-11-08 13:41:11 +01:00
lambda 7d84147500 Merge branch 'fix/missing-localization-strings' into 'develop'
Fix #37: Missing localization strings

Closes #37

See merge request pleroma/pleroma-fe!133
2017-11-08 11:03:51 +00:00
obrez a7b2d76347 Add Estonian translation 2017-11-08 12:44:33 +02:00
shpuld 191bbe76a8 Add a bunch of missed localization strings, update english and finnish to match. 2017-11-08 12:34:15 +02:00
Roger Braun 5dca57cc05 Add Polish translation.
Thanks, Roka!
2017-11-08 09:57:51 +01:00
Roger Braun 62a3c63082 Unify statuses/notices. 2017-11-08 09:31:52 +01:00
Roger Braun cadd42c1b2 Merge branch 'develop' into tibike/pleroma-fe-hu-translation 2017-11-08 09:13:35 +01:00
Roger Braun c65974c8c8 Fix typo. 2017-11-08 09:12:48 +01:00
Roger Braun 483fef731a Fix typo. 2017-11-08 09:10:32 +01:00
Roger Braun 32cb5e1a48 Add italian translation.
Thank, Eidon!
2017-11-08 09:09:34 +01:00
Roger Braun 38bd0dbfcd Add french translation.
Thanks, azu!
2017-11-08 09:05:10 +01:00
Tibike d6c89a9c09 Added Hungarian translation 2017-11-08 02:14:18 +02:00
eal 608d1e6776 Add blocks. 2017-11-07 22:38:28 +02:00
lambda 7ab7ac7be6 Merge branch 'feature/ger-translation' into 'develop'
Add DE translation

See merge request pleroma/pleroma-fe!128
2017-11-07 17:50:39 +00:00
Roger Braun 5cf972b348 Update ja translation. 2017-11-07 18:44:43 +01:00
Sebastian Huebner 0320f03cd2
make linter happy 2017-11-07 18:43:28 +01:00
Sebastian Huebner 8a3118d1a7 added ger translation 2017-11-07 18:37:51 +01:00
Roger Braun 33ad62bf72 Japanese is ja. 2017-11-07 18:34:12 +01:00
Roger Braun 71395ebca2 Add japanese translation.
Thanks, https://knzk.me/@imncls!
2017-11-07 18:20:40 +01:00
Shpuld Shpludson f89f120c44 Add fi to localization. 2017-11-07 16:55:08 +00:00
Roger Braun 7516cd859f Prepare for i18n. 2017-11-07 15:14:37 +01:00