aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Use parents scope if available.Roger Braun2018-06-12
* Merge branch 'feature/update-de-translation' into 'develop'lambda2018-06-12
|\
| * corrected a typo and changed/shortend delete_account_error textSebastian Huebner2018-06-04
| * updated german translationSebastian Huebner2018-05-25
* | Merge branch 'feature/update-russian-translation' into 'develop'lambda2018-06-12
|\ \
| * | Update Russian translationdtluna2018-05-26
| |/
* | Merge branch 'improve-settings-ui' into 'develop'lambda2018-06-12
|\ \
| * | Fix the height of file inputsUser2018-05-29
| * | Visually separate the settings itemsUser2018-05-29
| |/
* | Merge branch 'patch-1' into 'develop'lambda2018-06-12
|\ \
| * | Update messages.jsArtik Banana2018-06-08
* | | Merge branch 'feature/locked-accounts' into 'develop'lambda2018-06-12
|\ \ \
| * | | user card: show that the account is locked if it isWilliam Pitcock2018-06-07
| * | | follow requests: refactor to properly leverage vuexWilliam Pitcock2018-06-07
| * | | add follow requests UIWilliam Pitcock2018-06-07
| * | | backend interactor service: add approveUser and denyUser functionsWilliam Pitcock2018-06-07
| * | | api: add approveUser and denyUser functionsWilliam Pitcock2018-06-07
| * | | backend interactor service: implement fetchFollowRequests()William Pitcock2018-06-06
| * | | api: add fetchFollowRequests()William Pitcock2018-06-06
| * | | user settings: enable locking/unlocking an accountWilliam Pitcock2018-05-29
| | |/ | |/|
* | | messages: rename content warning to subjectWilliam Pitcock2018-06-08
| |/ |/|
* | Merge branch 'tr-fix' into 'develop'lambda2018-06-08
|\ \
| * | Add initial translations of username placeholderriking2018-06-06
| * | fix: enable translating login form placeholderriking2018-06-06
| |/
* | Merge branch 'l10n-french-newsettings' into 'develop'lambda2018-06-08
|\ \
| * | Add French translations for the new user settingschip2018-05-26
| |/
* | Merge branch 'develop' into 'develop'lambda2018-06-08
|\ \
| * | Update messages.jsArtik Banana2018-06-07
| * | Update messages.jsArtik Banana2018-06-07
| * | Update messages.jsArtik Banana2018-06-07
| * | Update messages.jsArtik Banana2018-06-07
| * | Update messages.jsArtik Banana2018-06-07
| * | Update messages.jsArtik Banana2018-06-06
| * | Update messages.jsArtik Banana2018-06-05
| |/
* | Merge branch 'dr1ft/pleroma-fe-develop' into developRoger Braun2018-06-08
|\ \
| * | Make scope options optional, refactoring.Roger Braun2018-06-08
| * | should resolve a 3/4 thingsAstra2018-06-07
| * | more lint fixesAstra2018-06-07
| * | correct linter problemsAstra2018-06-07
| * | crt's compose box changesAstra2018-06-07
| |/
* / Update translation.Roger Braun2018-06-07
|/
* Fix formattingSyldexia2018-05-21
* Added change password to user settingsSyldexia2018-05-21
* Display visibility if available.Roger Braun2018-05-20
* Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletionRoger Braun2018-05-20
|\
| * Pass the "Collapse" label throught the translation functionchip2018-05-19
| * Correct typo in french translationchip2018-05-18
| * Merge branch 'develop' into 'develop'lambda2018-05-18
| |\
| | * use es6 notation for exportFollowsaka2018-05-18
| * | Merge branch 'feature/follows-export' into 'develop'lambda2018-05-18
| |\|