aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add actual user search.Roger Braun2018-11-14
|
* Merge branch 'french-translation' into 'develop'kaniini2018-11-14
|\ | | | | | | | | French translation update See merge request pleroma/pleroma-fe!375
| * incorporate most translation changes from MR 368William Pitcock2018-11-14
| |
| * update french translationWilliam Pitcock2018-11-14
|/
* Merge branch 'dm-tab' into 'develop'lambda2018-11-14
|\ | | | | | | | | Direct Message tab See merge request pleroma/pleroma-fe!374
| * Always show dm panel.Roger Braun2018-11-13
| |
| * Add direct message tab.Roger Braun2018-11-13
| |
| * Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tabRoger Braun2018-11-13
| |\ | |/ |/|
* | Merge branch 'oauth' into 'develop'lambda2018-11-13
|\ \ | | | | | | | | | | | | Move login to oauth. See merge request pleroma/pleroma-fe!367
| * \ Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauthRoger Braun2018-11-10
| |\ \
| * | | On logout switch to public timeline.Roger Braun2018-11-10
| | | |
| * | | Put oauth text into description.Roger Braun2018-11-08
| | | |
| * | | Display OAuth login on login form button.Roger Braun2018-11-08
| | | |
| * | | Add login form back in.Roger Braun2018-11-07
| | | |
| * | | Linting.Roger Braun2018-11-06
| | | |
| * | | Re-activate registration, use oauth password flow to fetch token.Roger Braun2018-11-06
| | | |
| * | | Fix typo.Roger Braun2018-11-06
| | | |
| * | | Merge remote-tracking branch 'origin/develop' into oauthRoger Braun2018-10-26
| |\ \ \
| * | | | Remove gonsole.logg :DDRoger Braun2018-10-26
| | | | |
| * | | | Fix linting.Roger Braun2018-10-26
| | | | |
| * | | | Move login to oauth.Roger Braun2018-10-26
| | | | |
| | | | * api service urlRoger Braun2018-11-13
| |_|_|/ |/| | |
* | | | remove deploy stageRoger Braun2018-11-13
| | | |
* | | | remove deploy stageRoger Braun2018-11-13
| | | |
* | | | Merge branch 'patch-1' into 'develop'lambda2018-11-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [i18] Correction Occitan file See merge request pleroma/pleroma-fe!369
| * | | | Copy-Paste too fast from the Catalan file apparently.Exilat2018-10-28
| | |/ / | |/| | | | | | Now it's in good Occitan.
* | | | Merge branch 'i18n/irish' into 'develop'lambda2018-11-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added Irish (Gaeilge) Language See merge request pleroma/pleroma-fe!370
| * | | | Added Irish (Gaeilge) Languagedgold2018-11-02
| |/ / / | | | | | | | | | | | | | | | | All translations checked with tearma.ie & acmhainn.ie for language use and technical accuracy.
* | | | Merge branch 'develop' into 'develop'lambda2018-11-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | updated and completed German translation See merge request pleroma/pleroma-fe!373
| * | | | updated and completed German translationVinzenz Vietzke2018-11-12
|/ / / /
* | | | Merge branch 'develop' into 'develop'lambda2018-11-10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Added Chinese Language See merge request pleroma/pleroma-fe!372
| * | | minor modification of Chinese translationStarmancer2018-11-09
| | | |
| * | | update Chinese translationStarmancer2018-11-09
| | | |
| * | | Add Chinese languageNebula2018-11-09
|/ / /
* | | Fix posting.Roger Braun2018-11-08
| | |
* | | Merge branch '153-count-cw' into 'develop'lambda2018-11-07
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "PleromaFE does not count the Content Warning into Post length" Closes #153 and #135 See merge request pleroma/pleroma-fe!371
| * | Count spoiler text in the character count. Fixes #135.Roger Braun2018-11-07
|/ /
* | Merge branch 'fix-features-panel' into 'develop'Henry2018-10-26
|\ \ | | | | | | | | | | | | Fix Features panel See merge request pleroma/pleroma-fe!366
| * | simplify codehakabahitoyo2018-10-26
| | |
| * | adapt to destructive change of apiHakaba Hitoyo2018-10-26
|/ /
* | Merge branch 'develop' into 'develop'Henry2018-10-25
|\ \ | |/ |/| | | | | [i18n] Adds Occitan locale [ago-file] See merge request pleroma/pleroma-fe!365
| * Adds Occitan localeExilat2018-10-25
| |
* | Merge branch 'patch-1' into 'develop'Henry2018-10-25
|\ \ | | | | | | | | | | | | Updated italian translation See merge request pleroma/pleroma-fe!364
| * | Updated italian translationsilkevicious2018-10-25
| |/
* | Merge branch 'undefined' into 'develop'Henry2018-10-25
|\ \ | |/ |/| | | | | [i18n] Translation: update of the oc.json file See merge request pleroma/pleroma-fe!363
| * Update oc.jsonExilat2018-10-25
| |
| * Update oc.jsonExilat2018-10-24
| |
| * Update of the oc.json fileExilat2018-10-23
|/ | | Actualizacion del fichièr oc.json
* Merge branch 'instance-setting-fallback' into 'develop'Henry2018-10-21
|\ | | | | | | | | Fall back to instance settings consistently See merge request pleroma/pleroma-fe!361
| * explicitly set collapseMessageWithSubject to undefinedscarlett2018-10-21
| |