Commit Graph

1270 Commits

Author SHA1 Message Date
Roger Braun 9f64c96721 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauth 2018-11-10 11:00:09 +01:00
Roger Braun cf581b7d5a On logout switch to public timeline. 2018-11-10 10:43:25 +01:00
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 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
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