aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | |
| * | crt's compose box changesAstra2018-06-07
| |/
* / Update translation.Roger Braun2018-06-07
|/
* Merge branch 'feature/change-password' into 'develop'lambda2018-05-24
|\ | | | | | | | | Feature/change password See merge request pleroma/pleroma-fe!268
| * 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
|\
| * Merge branch 'i18n-fixes' into 'develop'lambda2018-05-20
| |\ | | | | | | | | | | | | | | | | | | Pass the "Collapse" label throught the translation function Closes #105 See merge request pleroma/pleroma-fe!266
| | * Pass the "Collapse" label throught the translation functionchip2018-05-19
| |/
| * Merge branch 'l10n-french-20180518' into 'develop'lambda2018-05-19
| |\ | | | | | | | | | | | | Correct small typo in french translation See merge request pleroma/pleroma-fe!265
| | * Correct typo in french translationchip2018-05-18
| |/
| * Merge branch 'develop' into 'develop'lambda2018-05-18
| |\ | | | | | | | | | | | | use es6 notation for exportFollows See merge request pleroma/pleroma-fe!263
| | * use es6 notation for exportFollowsaka2018-05-18
| | |
| * | Merge branch 'feature/follows-export' into 'develop'lambda2018-05-18
| |\| | | | | | | | | | | | | Adds an option to export follows (fixed) See merge request pleroma/pleroma-fe!261
| | * fix lintingaka2018-05-16
| | |
| | * Adds an option to export followsaka2018-05-13
| | |
| * | Make nsfw image easier to understand.Roger Braun2018-05-16
| | |
| * | Merge branch 'patch-5' into 'develop'lambda2018-05-16
| |\ \ | | | | | | | | | | | | | | | | [i18n]Update messages.js See merge request pleroma/pleroma-fe!259
| | * | Update messages.jsExilat2018-05-15
| | | |
| * | | Merge branch 'patch-7' into 'develop'lambda2018-05-16
| |\ \ \ | | |/ / | |/| | | | | | | | | | Added inputRadius french translation and improved french translation as discussed with Chip. See merge request pleroma/pleroma-fe!260
| | * | Improved french translation thanks to Chip's suggestions, added inputRadius' ↵Azurolu2018-05-16
| | | | | | | | | | | | | | | | french translation.
| | * | Added inputRadius french translation and improved french translation as ↵Azurolu2018-05-15
| |/ / | | | | | | | | | discussed with Chip.
* / / Added delete account section to user settingsSyldexia2018-05-13
|/ /
* | Merge branch 'fix/moreCssFixesAndStuff' into 'develop'lambda2018-05-13
|\ \ | |/ |/| | | | | | | | | Fix/more css fixes and stuff Closes #77 See merge request pleroma/pleroma-fe!234
| * alternate usercardHenry Jameson2018-05-12
| |
| * fixed autocomplete lacking highlightHenry Jameson2018-05-12
| |
| * fixHenry Jameson2018-05-12
| |
| * small fix + white color for user-card + opaque outline for textHenry Jameson2018-05-12
| |
| * fixed nsfw hider having very small height, some border-radii for consistencyHenry Jameson2018-05-12
| |
| * fix jumping inputbox's heightHenry Jameson2018-05-12
| |
| * Entire area around user counters are clickable now, not just the header-linkHenry Jameson2018-05-12
| |
| * i18nHenry Jameson2018-05-12
| |
| * user card no longer uncomfortably close to user name in timelineHenry Jameson2018-05-12
| |