aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fix-emoji-input' into 'develop'HJ2019-06-25
|\ | | | | | | | | fix all known problems with clicks on autocomplete emojis See merge request pleroma/pleroma-fe!857
| * reviewHenry Jameson2019-06-26
| |
| * lint fixHenry Jameson2019-06-25
| |
| * fix all known problems with clicks on autocomplete emojisHenry Jameson2019-06-25
|/
* Merge branch 'fix/gallery-margin-fix' into 'develop'Shpuld Shpludson2019-06-25
|\ | | | | | | | | fix specificity that made attachments misalign See merge request pleroma/pleroma-fe!855
| * fix specificity that made attachments misalignShpuld Shpludson2019-06-25
|/
* Merge branch 'clearer-user-profile-tabs' into 'develop'HJ2019-06-25
|\ | | | | | | | | Clearer user profile tabs when status is empty See merge request pleroma/pleroma-fe!847
| * Keep statuses always enabledWyatt Benno2019-06-25
| |
| * Make scss change for tab switcher onlyWyatt Benno2019-06-21
| |
| * A small sass fix for #577Wyatt Benno2019-06-20
| |
* | Merge branch 'timeline-skip-fix' into 'develop'HJ2019-06-24
|\ \ | | | | | | | | | | | | timeline-skip-fix See merge request pleroma/pleroma-fe!850
| * | change isPinned to noIdUpdateWyatt Benno2019-06-24
| | |
| * | fix for #553Wyatt Benno2019-06-21
| |/
* | Merge branch '591' into 'develop'HJ2019-06-24
|\ \ | | | | | | | | | | | | | | | | | | Add resolve param to user search api request Closes #591 See merge request pleroma/pleroma-fe!853
| * | add resolve param to user search api requesttaehoon2019-06-24
|/ /
* | Merge branch 'fix/not-all-polls-showing-up' into 'develop'Shpuld Shpludson2019-06-22
|\ \ | | | | | | | | | | | | Fix: problems with polls state See merge request pleroma/pleroma-fe!849
| * | Fix: problems with polls stateShpuld Shpludson2019-06-22
|/ /
* | Merge branch 'fix/move-character-counter' into 'develop'Shpuld Shpludson2019-06-22
|\ \ | | | | | | | | | | | | Move character counter into the input box See merge request pleroma/pleroma-fe!848
| * | Move character counter into the input boxShpuld Shpludson2019-06-22
|/ /
* | Merge branch 'fix-token-auth-login' into 'develop'HJ2019-06-22
|\ \ | | | | | | | | | | | | Fix broken token authentication See merge request pleroma/pleroma-fe!846
| * | delete state.token instead of setting falsetaehoon2019-06-20
| | |
| * | use clientSecret in login flowtaehoon2019-06-20
| | |
| * | fix error breaking logout flowtaehoon2019-06-20
| | |
| * | make sure to clear old token when logouttaehoon2019-06-20
|/ /
* | Merge branch 'fix/polls-to-module' into 'develop'Shpuld Shpludson2019-06-20
|\ \ | | | | | | | | | | | | Move poll state handling to its own module See merge request pleroma/pleroma-fe!845
| * | Move poll state handling to its own moduleShpuld Shpludson2019-06-20
|/ /
* | Merge branch 'fix/messed-up-long-polls' into 'develop'Shpuld Shpludson2019-06-20
|\ \ | |/ |/| | | | | Fix/messed up long polls See merge request pleroma/pleroma-fe!843
| * Fix/messed up long pollsShpuld Shpludson2019-06-20
|/
* Merge branch '584' into 'develop'HJ2019-06-19
|\ | | | | | | | | | | | | Fix "Status submission box overlap and alignment issues" Closes #584 See merge request pleroma/pleroma-fe!835
| * reset margin property of form controlstaehoon2019-06-19
|/
* Merge branch 'mr-origin-740' into 'develop'HJ2019-06-18
|\ | | | | | | | | Update french translation See merge request pleroma/pleroma-fe!829
| * Update translation with review commentsDashie2019-06-18
| |
| * Update file with current en.jsonDashie2019-06-18
| |
| * Update fr.jsonSatak2019-06-18
| | | | | | added missing ,
| * Update fr.jsonSatak2019-06-18
| | | | | | stoped at line 134, more to do below
* | Merge branch 'feature/polls-attempt-2' into 'develop'Shpuld Shpludson2019-06-18
|\ \ | |/ |/| | | | | Feature/polls attempt 2 See merge request pleroma/pleroma-fe!826
| * Feature/polls attempt 2lain2019-06-18
|/
* Merge branch 'refactor-emoji-input' into 'develop'HJ2019-06-18
|\ | | | | | | | | | | | | EmojiInput refactoring Closes #565 See merge request pleroma/pleroma-fe!824
| * 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
| |