moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,524 Commits 70 Branches 19 Tags 22 MiB
Commit Graph

1524 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
lambda a1962a610a Merge branch '153-count-cw' into 'develop' 
Resolve "PleromaFE does not count the Content Warning into Post length"

Closes #153 and #135

See merge request pleroma/pleroma-fe!371
 2018-11-07 22:15:47 +00: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
Exilat 6dd675566e Copy-Paste too fast from the Catalan file apparently. 
Now it's in good Occitan.
 2018-10-28 12:38:40 +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
Henry 2f11ec296e Merge branch 'fix-features-panel' into 'develop' 
Fix Features panel

See merge request pleroma/pleroma-fe!366
 2018-10-26 13:53:37 +00: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 20e4ec4979 Merge branch 'develop' into 'develop' 
[i18n] Adds Occitan locale [ago-file]

See merge request pleroma/pleroma-fe!365
 2018-10-25 17:25:38 +00:00
Exilat 0a261d2a7d Adds Occitan locale 2018-10-25 17:19:31 +00: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
Henry 0f30d95f3a Merge branch 'undefined' into 'develop' 
[i18n] Translation: update of the oc.json file

See merge request pleroma/pleroma-fe!363
 2018-10-25 13:02:30 +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
Henry 5f65520287 Merge branch 'sorted-messages' into 'develop' 
Sort messages object

See merge request pleroma/pleroma-fe!362
 2018-10-21 20:26:36 +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
kaniini e64af481d2 Merge branch 'hide-statistics' into 'develop' 
Add options for hiding post and user engagement statistics.

See merge request pleroma/pleroma-fe!336
 2018-10-16 14:37:32 +00: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
Henry f554edc054 Merge branch 'update-nb' into 'develop' 
Update norwegian translation

See merge request pleroma/pleroma-fe!356
 2018-10-14 08:41:27 +00: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