aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* src/i18n/messages.js: French Translation for Post Scope UI tooltipsHaelwenn (lanodan) Monnier2018-06-24
| | | | Co-authored-by: goofy
* Merge branch 'feature/status-scope-improvements' into 'develop'lambda2018-06-24
|\ | | | | | | | | Improve Post Scope UI See merge request pleroma/pleroma-fe!286
| * Add warning/info text on appriopriate status scopesOle Bertram2018-06-23
| |
| * Add title text with description to scope iconsOle Bertram2018-06-23
|/
* Merge branch 'feature/unrepeats' into 'develop'lambda2018-06-19
|\ | | | | | | | | | | | | Add unretweet support Closes #103 See merge request pleroma/pleroma-fe!284
| * add unretweet action to statuses.jsFrancis Dinh2018-06-14
| |
| * Add unretweet supportFrancis Dinh2018-06-14
|/
* Use parents scope if available.Roger Braun2018-06-12
|
* Merge branch 'feature/update-de-translation' into 'develop'lambda2018-06-12
|\ | | | | | | | | updated german translation See merge request pleroma/pleroma-fe!269
| * 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 translation See merge request pleroma/pleroma-fe!270
| * | Update Russian translationdtluna2018-05-26
| |/
* | Merge branch 'improve-settings-ui' into 'develop'lambda2018-06-12
|\ \ | | | | | | | | | | | | Improve user settings ui See merge request pleroma/pleroma-fe!273
| * | Fix the height of file inputsUser2018-05-29
| | |
| * | Visually separate the settings itemsUser2018-05-29
| |/
* | Merge branch 'patch-1' into 'develop'lambda2018-06-12
|\ \ | | | | | | | | | | | | Hebrew Translation of "placeholder" See merge request pleroma/pleroma-fe!278
| * | Update messages.jsArtik Banana2018-06-08
| | |
* | | Merge branch 'feature/locked-accounts' into 'develop'lambda2018-06-12
|\ \ \ | | | | | | | | | | | | | | | | Feature/locked accounts See merge request pleroma/pleroma-fe!274
| * | | user card: show that the account is locked if it isWilliam Pitcock2018-06-07
| | | |
| * | | follow requests: refactor to properly leverage vuexWilliam Pitcock2018-06-07
| | | |
| * | | config: fix typoWilliam 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
| | |/ | |/|
* | | Merge branch 'i18n/change-content-warning-to-subject' into 'develop'lambda2018-06-12
|\ \ \ | |_|/ |/| | | | | | | | messages: rename content warning to subject See merge request pleroma/pleroma-fe!280
| * | messages: rename content warning to subjectWilliam Pitcock2018-06-08
|/ /
* | Merge branch 'tr-fix' into 'develop'lambda2018-06-08
|\ \ | | | | | | | | | | | | Translate username input placeholder See merge request pleroma/pleroma-fe!275
| * | 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 settings See merge request pleroma/pleroma-fe!271
| * | Add French translations for the new user settingschip2018-05-26
| |/ | | | | | | | | | | | | Add French translations for the new user settings : - Password change - Follows export - Account deletion
* | Merge branch 'develop' into 'develop'lambda2018-06-08
|\ \ | | | | | | | | | | | | Hebrew Translation See merge request pleroma/pleroma-fe!277
| * | 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
| | |
| * | Merge branch 'develop' of https://git.pleroma.social/dr1ft/pleroma-fe into ↵Astra2018-06-07
| |\ \ | | | | | | | | | | | | develop
| | * | should resolve a 3/4 thingsAstra2018-06-07
| | | |
| * | | should resolve a 3/4 thingsAstra2018-06-07
| |/ /
| * | more lint fixesAstra2018-06-07
| | |
| * | correct linter problemsAstra2018-06-07
| | |