aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* changelogHenry Jameson2020-06-10
* attempt to fix that one bug with submitting on copy-pastingHenry Jameson2020-06-10
* Merge branch 'async-language-loading' into 'develop'HJ2020-06-09
|\
| * Messages: DRY things up a bit.lain2020-06-09
| * Messages: Load languages asynchronously.lain2020-06-08
* | Merge branch '572-multiple-file-drag-and-drop' into 'develop'Shpuld Shpludson2020-06-08
|\ \ | |/ |/|
| * Apply suggestion to CHANGELOG.mdlain2020-06-08
| * Update changelog.lain2020-06-08
| * Linting.lain2020-06-08
| * MediaUpload: Correctly handle multiple uploads.lain2020-06-08
| * MediaUpload: Allow drag-and-drop of multiple files at oncelain2020-06-08
|/
* Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2020-06-07
|\
| * indent 2Henry Jameson2020-06-07
| * Translated using Weblate (Italian)Ben Is2020-06-05
| * Translated using Weblate (Estonian)Evert Prants2020-06-05
| * Translated using Weblate (French)Anonymous2020-06-05
| * Translated using Weblate (French)Haelwenn (lanodan) Monnier2020-06-05
| * Translated using Weblate (Estonian)Evert Prants2020-06-05
| * Translated using Weblate (Dutch)Fristi2020-06-05
| * Translated using Weblate (Dutch)Anonymous2020-06-05
| * Translated using Weblate (Italian)Ben Is2020-06-05
| * Translated using Weblate (English)Ben Is2020-06-05
| * Translated using Weblate (Italian)Ben Is2020-06-05
| * Translated using Weblate (Spanish)Chuculate2020-06-05
| * Translated using Weblate (Italian)Ben Is2020-06-05
* | Merge branch 'fix-cropped-button-shadow' into 'develop'HJ2020-06-07
|\ \
| * | Fix the cropped button shadow in 2FA settingsKarol Kosek2020-06-06
| |/
* | Merge branch 'settings-modal' into 'develop'HJ2020-06-06
|\ \
| * | move helpers out of tabs directoryHenry Jameson2020-06-07
| * | Merge remote-tracking branch 'origin/develop' into settings-modalHenry Jameson2020-06-07
| |\ \ | |/ / |/| |
* | | Merge branch 'fix-reprooted-muted-posts' into 'develop'HJ2020-06-06
|\ \ \ | |_|/ |/| |
| * | changelogHenry Jameson2020-06-06
| * | alignment fixesHenry Jameson2020-06-06
| * | fixed case in class nameHenry Jameson2020-06-02
| * | lintHenry Jameson2020-05-26
| * | multiple fixesHenry Jameson2020-05-26
| * | fix non-mention notifsHenry Jameson2020-05-26
| * | fix reprööted posts not being muted properly. fix muted posts makingHenry Jameson2020-05-25
* | | Update CHANGELOG.mdlain2020-06-05
* | | Merge branch '851-fix-squishy-images' into 'develop'Shpuld Shpludson2020-06-05
|\ \ \
| * | | StillImage: Make it work properly in both firefox and chrome.lain2020-06-05
|/ / /
* | | Merge branch '848-change-emoji-reaction-defaults' into 'develop'Shpuld Shpludson2020-06-05
|\ \ \
| * | | ReactButton: Change the combined emoji (heart) to a simple one.lain2020-06-05
* | | | Merge branch '790-unable-to-filter' into 'develop'HJ2020-06-05
|\ \ \ \ | |/ / / |/| | |
| * | | Linting fixes.lain2020-06-05
| * | | Settings: Keep a local version of the mutedWordsStringlain2020-06-05
|/ / /
* | | Merge branch '593-doc-change' into 'develop'HJ2020-06-04
|\ \ \
| * | | Docs: Change wrong documentation.lain2020-06-04
* | | | Merge branch '748-hashtag-link-fixes' into 'develop'HJ2020-06-04
|\ \ \ \
| * | | | StatusContent: Try to get hashtag from dataset first.lain2020-06-04
| |/ / /