aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* updated preview windowHenry Jameson2018-11-27
|
* lint fixHenry Jameson2018-11-27
|
* fixed keep checkboxes working when exportingHenry Jameson2018-11-26
|
* unbreak user profilesHenry Jameson2018-11-26
|
* fix preview input text using wrong stringHenry Jameson2018-11-26
|
* fix panel link color, fix broken user profilesHenry Jameson2018-11-26
|
* Merge remote-tracking branch 'upstream/develop' into feature/theming2Henry Jameson2018-11-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (60 commits) whoops whoops DM timeline: stream new statuses update-japanese-translation Add actual user search. incorporate most translation changes from MR 368 update french translation Always show dm panel. Add direct message tab. api service url remove deploy stage remove deploy stage updated and completed German translation On logout switch to public timeline. minor modification of Chinese translation update Chinese translation Add Chinese language Fix posting. Put oauth text into description. Display OAuth login on login form button. ...
| * whoopsHenry Jameson2018-11-26
| |
| * Merge remote-tracking branch 'upstream/develop' into feature/scope_preferencesHenry Jameson2018-11-26
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: DM timeline: stream new statuses update-japanese-translation Add actual user search. incorporate most translation changes from MR 368 update french translation Always show dm panel. Add direct message tab. api service url On logout switch to public timeline. Put oauth text into description. Display OAuth login on login form button. Add login form back in. Linting. Re-activate registration, use oauth password flow to fetch token. Fix typo. Remove gonsole.logg :DD Fix linting. Move login to oauth.
| | * Merge branch 'update-japanese-translation' into 'develop'Henry2018-11-25
| | |\ | | | | | | | | | | | | | | | | Update Japanese translation See merge request pleroma/pleroma-fe!378
| | | * update-japanese-translationHakaba Hitoyo2018-11-15
| | | |
| | * | DM timeline: stream new statuseseal2018-11-25
| | | |
| | * | Add actual user search.Roger Braun2018-11-14
| | |/
| | * incorporate most translation changes from MR 368William Pitcock2018-11-14
| | |
| | * update french translationWilliam Pitcock2018-11-14
| | |
| | * 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
| | |/ / / /
| * | | | | Merge remote-tracking branch 'upstream/develop' into feature/scope_preferencesHenry Jameson2018-11-26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (36 commits) remove deploy stage remove deploy stage updated and completed German translation minor modification of Chinese translation update Chinese translation Add Chinese language Fix posting. Count spoiler text in the character count. Fixes #135. Added Irish (Gaeilge) Language Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan. simplify code adapt to destructive change of api Adds Occitan locale Updated italian translation Update oc.json Update oc.json Update of the oc.json file Actualizacion del fichièr oc.json Sort messages object by language code so that it's easier from the UI to browse them. explicitly set collapseMessageWithSubject to undefined Fall back to instance settings consistently ...
| | * | | | 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.
| | * | | | updated and completed German translationVinzenz Vietzke2018-11-12
| | | | | |
| | * | | | minor modification of Chinese translationStarmancer2018-11-09
| | | | | |
| | * | | | update Chinese translationStarmancer2018-11-09
| | | | | |
| | * | | | Add Chinese languageNebula2018-11-09
| | | |_|/ | | |/| |
| | * | | Fix posting.Roger Braun2018-11-08
| | | | |
| | * | | Count spoiler text in the character count. Fixes #135.Roger Braun2018-11-07
| | |/ /
| | * | simplify codehakabahitoyo2018-10-26
| | | |
| | * | adapt to destructive change of apiHakaba Hitoyo2018-10-26
| | |/
| | * Merge branch 'patch-1' into 'develop'Henry2018-10-25
| | |\ | | | | | | | | | | | | | | | | Updated italian translation See merge request pleroma/pleroma-fe!364
| | | * Updated italian translationsilkevicious2018-10-25
| | | |
| | * | 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
| | | |