aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* fix for #553Wyatt Benno2019-06-21
* reset margin property of form controlstaehoon2019-06-19
* Merge branch 'mr-origin-740' into 'develop'HJ2019-06-18
|\
| * Update translation with review commentsDashie2019-06-18
| * Update file with current en.jsonDashie2019-06-18
| * Update fr.jsonSatak2019-06-18
| * Update fr.jsonSatak2019-06-18
* | Feature/polls attempt 2lain2019-06-18
|/
* Merge branch 'refactor-emoji-input' into 'develop'HJ2019-06-18
|\
| * reviewHenry Jameson2019-06-18
| * reviewHenry Jameson2019-06-18
| * Update emoji-input.jsHJ2019-06-18
| * properly position the caret after replacementHenry Jameson2019-06-17
| * fix small annoyanceHenry Jameson2019-06-12
| * fixed some bugs i found, also cleaned up some stuff + documentationHenry Jameson2019-06-11
| * self-reviewHenry Jameson2019-06-10
| * LintingHenry Jameson2019-06-09
| * fix textarea not resizing properlyHenry Jameson2019-06-09
| * more bugfixes related to keybinds and nonworking stuffHenry Jameson2019-06-09
| * Some comments, added sorting for emojisHenry Jameson2019-06-09
| * fixed several bugsHenry Jameson2019-06-09
| * sortingHenry Jameson2019-06-08
| * stylesHenry Jameson2019-06-08
| * standartized autocomplete panel suggesions format, fixed some bugsHenry Jameson2019-06-08
| * Merge remote-tracking branch 'upstream/develop' into refactor-emoji-inputHenry Jameson2019-06-08
| |\
| * | slot-based emoji input/autocomplete componentHenry Jameson2019-06-07
* | | Merge branch 'fix-user-search' into 'develop'Shpuld Shpludson2019-06-18
|\ \ \
| * | | fix user searchHenry Jameson2019-06-17
* | | | Merge branch '573' into 'develop'HJ2019-06-18
|\ \ \ \
| * | | | apply font smoothing in webkit and firefoxtaehoon2019-06-17
| |/ / /
* / / / Misc fixes: Fix uploads stretching on chrome, fix warnings in consoleShpuld Shpludson2019-06-18
|/ / /
* | | Merge branch 'mastoapi-login-and-config-fixes' into 'develop'HJ2019-06-17
|\ \ \
| * | | Apply suggestion to src/services/backend_interactor_service/backend_interacto...HJ2019-06-17
| * | | Apply suggestion to src/services/api/api.service.jsHJ2019-06-17
| * | | getting and setting user background via MastoAPIHenry Jameson2019-06-16
| * | | Removed formattingOptionsEnabled in favor of relying on BE-provided list ofHenry Jameson2019-06-16
* | | | fix MFA crashing on user-settings pageHenry Jameson2019-06-16
|/ / /
* | | Merge branch 'masto-register-app-secret' into 'develop'HJ2019-06-16
|\ \ \
| * | | rename mutations according to actual property namesHenry Jameson2019-06-13
| * | | Merge remote-tracking branch 'upstream/develop' into masto-register-app-secretHenry Jameson2019-06-13
| |\ \ \
| * | | | fixHenry Jameson2019-06-13
| * | | | fixHenry Jameson2019-06-13
| * | | | fix logged out post-updateHenry Jameson2019-06-13
| * | | | fixHenry Jameson2019-06-13
| * | | | Merge remote-tracking branch 'upstream/develop' into masto-register-app-secretHenry Jameson2019-06-13
| |\ \ \ \
| * | | | | AMERICAHenry Jameson2019-06-13
| * | | | | commentsHenry Jameson2019-06-13
| * | | | | No longer sending extra data, renamed some propertiesHenry Jameson2019-06-13
| * | | | | Merge remote-tracking branch 'upstream/develop' into masto-register-app-secretHenry Jameson2019-06-13
| |\ \ \ \ \
| * | | | | | Proper clientId/secret/token caching, MastoAPI registrationHenry Jameson2019-05-22