Commits · bcbaf5d7ee970a1bd35e05ad12f4dfbb00f4282e · Ilja / pleroma-fe

Nov 06, 2018
- Linting. · bcbaf5d7
  lain authored 6 years ago
  
  bcbaf5d7
- Re-activate registration, use oauth password flow to fetch token. · 4d9680e7
  lain authored 6 years ago
  
  4d9680e7
- Fix typo. · b6cd4ff3
  lain authored 6 years ago
  
  b6cd4ff3
Oct 26, 2018
- Merge remote-tracking branch 'origin/develop' into oauth · fbe30b49
  lain authored 6 years ago
  
  fbe30b49
- Remove gonsole.logg :DD · 0aa5fe9d
  lain authored 6 years ago
  
  0aa5fe9d
- Merge branch 'fix-features-panel' into 'develop' · 2f11ec29
  HJ authored 6 years ago
  
  Fix Features panel See merge request pleroma/pleroma-fe!366
  2f11ec29
- Fix linting. · 60b3e4f4
  lain authored 6 years ago
  
  60b3e4f4
- Move login to oauth. · 9af204b2
  lain authored 6 years ago
  
  9af204b2
- simplify code · 630c6e3e
  hakabahitoyo authored 6 years ago
  
  630c6e3e
- adapt to destructive change of api · 01aba3f9
  Hakaba Hitoyo authored 6 years ago
  
  01aba3f9
Oct 25, 2018
- Merge branch 'develop' into 'develop' · 20e4ec49
  HJ authored 6 years ago
  
  [i18n] Adds Occitan locale [ago-file] See merge request pleroma/pleroma-fe!365
  20e4ec49
- Adds Occitan locale · 0a261d2a
  Exilat authored 6 years ago
  
  0a261d2a
- Merge branch 'patch-1' into 'develop' · 7f0e140a
  HJ authored 6 years ago
  
  Updated italian translation See merge request pleroma/pleroma-fe!364
  7f0e140a
- Merge branch 'undefined' into 'develop' · 0f30d95f
  HJ authored 6 years ago
  
  [i18n] Translation: update of the oc.json file See merge request pleroma/pleroma-fe!363
  0f30d95f
- Updated italian translation · c61e658c
  silkevicious authored 6 years ago
  
  c61e658c
- Update oc.json · d1614c43
  Exilat authored 6 years ago
  
  d1614c43
Oct 24, 2018
- Update oc.json · 68d90684
  Exilat authored 6 years ago
  
  68d90684
Oct 23, 2018
- Update of the oc.json file · 8c585b02
  Exilat authored 6 years ago
  
  Actualizacion del fichièr oc.json
  8c585b02
Oct 21, 2018
- Merge branch 'instance-setting-fallback' into 'develop' · 48d64837
  HJ authored 6 years ago
  
  Fall back to instance settings consistently See merge request pleroma/pleroma-fe!361
  48d64837
- Merge branch 'sorted-messages' into 'develop' · 5f655202
  HJ authored 6 years ago
  
  Sort messages object See merge request pleroma/pleroma-fe!362
  5f655202
- Sort messages object by language code so that it's easier from the UI to browse them. · ec7b7ab4
  fadelkon authored 6 years ago
  
  ec7b7ab4
- explicitly set collapseMessageWithSubject to undefined · c02a9089
  scarlett authored 6 years ago
  
  c02a9089
- Fall back to instance settings consistently · d6ad0805
  scarlett authored 6 years ago
  
  d6ad0805
- Merge branch 'i18n/arabic' into 'develop' · 82cc37a5
  HJ authored 6 years ago
  
  Add arabic translation See merge request pleroma/pleroma-fe!360
  82cc37a5
- Adding arabic to messages.js · 13152637
  ButterflyOfFire authored 6 years ago and HJ committed 6 years ago
  
  13152637
- Adding arabic translation. · 373d6ca9
  ButterflyOfFire authored 6 years ago and HJ committed 6 years ago
  
  373d6ca9
Oct 17, 2018
- Merge branch 'catalan' into 'develop' · d81887e3
  HJ authored 6 years ago
  
  Create catalan translation See merge request pleroma/pleroma-fe!355
  d81887e3
Oct 16, 2018
- Translate not only timeago prefix, but time units. Make consistent the... · bf3e3f8b
  fadelkon authored 6 years ago
  
  Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text.
  bf3e3f8b
- Merge branch 'hide-statistics' into 'develop' · e64af481
  kaniini authored 6 years ago
  
  Add options for hiding post and user engagement statistics. See merge request pleroma/pleroma-fe!336
  e64af481
- satisfy lint · 2bb663f0
  scarlett authored 6 years ago
  
  2bb663f0
- Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics · 4cc1ed61
  scarlett authored 6 years ago
  
  4cc1ed61
Oct 14, 2018
- Add catalan require to messages.js · 0c2f4b92
  fadelkon authored 6 years ago
  
  0c2f4b92
- Merge branch 'update-nb' into 'develop' · f554edc0
  HJ authored 6 years ago
  
  Update norwegian translation See merge request pleroma/pleroma-fe!356
  f554edc0
- Update norwegian translation · 7c4790d1
  morguldir authored 6 years ago
  
  7c4790d1
Oct 13, 2018

Finish general and timeago catalan strings. Glossary: · 59dec1b4

fadelkon authored 6 years ago

* 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/ .

59dec1b4

Oct 02, 2018
- Translate some strings to catalan. Most part of block "settings" is not translated yet · f8323b72
  fadelkon authored 6 years ago
  
  f8323b72
- Add placeholder catalan translation file to be able to see the work in progress in further commits · 0beba086
  fadelkon authored 6 years ago
  
  0beba086
Sep 27, 2018

Merge branch 'i18n/no_rich_text' into 'develop' · 65c03f1a

kaniini authored 6 years ago

Less confusing description for no_rich_text_formatting

See merge request pleroma/pleroma-fe!351

65c03f1a

Sep 25, 2018
- Merge branch 'fix/i18n/instance_default' into 'develop' · 9d0bbe37
  HJ authored 6 years ago
  
  Fix instance_default in en and fr See merge request pleroma/pleroma-fe!352
  9d0bbe37
- i think it's due to my shitty js-to-json regex · 85235981
  HJ authored 6 years ago
  
  85235981