aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into 'develop'eal2018-02-24
|\ | | | | | | | | Always include bio in updates, because it might be empty (optional) See merge request pleroma/pleroma-fe!209
| * Always include bio in updates, because it might be empty (optional)Ekaterina Vaartis2018-02-21
| |
* | Merge branch 'feature/user-picker-keyboard-support' into 'develop'eal2018-02-24
|\ \ | |/ |/| | | | | | | | | Add keyboard support for user/emoji picker. Closes #56 See merge request pleroma/pleroma-fe!200
| * Add keyboard support for user/emoji picker.eal2018-02-03
| | | | | | | | | | Tab cycles between candidates, shift-tab cycles backwards. Enter does the action.
* | Merge branch 'feature/forbid-posting-when-status-length-is-over-the-limit' ↵lambda2018-02-14
|\ \ | | | | | | | | | | | | | | | | | | into 'develop' Disable the status submit button when status length is over the limit See merge request pleroma/pleroma-fe!206
| * | Disable the submit button and apply error class to the characters left indicatordtluna2018-02-11
| | |
* | | Merge branch 'feature/russian-translation' into 'develop'lambda2018-02-14
|\ \ \ | |/ / |/| | | | | | | | Add Russian translation See merge request pleroma/pleroma-fe!207
| * | Add Russian translationdtluna2018-02-11
|/ /
* | Merge branch 'feature/instance-specific-panel' into 'develop'lambda2018-02-11
|\ \ | | | | | | | | | | | | add instance specific panel See merge request pleroma/pleroma-fe!202
| * | Update main.jsHakaba Hitoyo2018-02-10
| | |
| * | slove conflictHakaba Hitoyo2018-02-10
| |\ \ | |/ / |/| |
* | | Merge branch 'feature/post-length-indicator' into 'develop'lambda2018-02-09
|\ \ \ | | | | | | | | | | | | | | | | Add an indicator for characters left before hitting the limit See merge request pleroma/pleroma-fe!205
| * | | Add styles on the characters left indicatordtluna2018-02-09
| | | |
| * | | Add characters left being displayeddtluna2018-02-09
| | | |
| * | | Add textlimitdtluna2018-02-09
| | | |
| * | | Use `name` and `closed` from the backenddtluna2018-02-09
| | | |
* | | | Merge branch 'update-es-translation' into 'develop'lambda2018-02-09
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Update Spanish translation See merge request pleroma/pleroma-fe!204
| * | | Completes spanish translationAka2018-02-08
| | | |
| * | | Completes spanish translationAka2018-02-08
|/ / /
* | | Merge branch 'fix/component-list-keys' into 'develop'eal2018-02-05
|\ \ \ | | | | | | | | | | | | | | | | Add keys to all component lists. See merge request pleroma/pleroma-fe!203
| * | | Add keys to all component lists.eal2018-02-04
|/ / /
* | | Merge branch 'theme-edit-color-fields' into 'develop'eal2018-02-04
|\ \ \ | | | | | | | | | | | | | | | | HTML5 <input type="color"> for theme editing See merge request pleroma/pleroma-fe!172
| * | | updated css and stuff for color picker in stylesHenry Jameson2018-02-03
| | | |
| * | | wip, styles are a bit broken thoHenry Jameson2018-02-03
|/ / /
| * | Update App.jsHakaba Hitoyo2018-02-10
| | |
| * | debugHakaba Hitoyo2018-02-04
| | |
| * | slove-conflictHakaba Hitoyo2018-02-04
| |\ \ | |/ / |/| |
* | | Update vue version.Roger Braun2018-02-03
| |/ |/|
* | Fix typo in fav/rt fixshp2018-02-03
| |
* | Fix fav/RT buttons in notifications.eal2018-02-02
| |
* | Merge branch 'fix/chat-visibility' into 'develop'lambda2018-02-02
|\ \ | | | | | | | | | | | | Show chat only if channel is joined. See merge request pleroma/pleroma-fe!197
| * | Show chat only if channel is joined.eal2018-02-01
| | |
* | | Merge branch 'remote-follow-button' into 'develop'lambda2018-02-02
|\ \ \ | | | | | | | | | | | | | | | | Add remote follow button to local user profiles. See merge request pleroma/pleroma-fe!198
| * | | Add remote follow button to local user profiles.eal2018-02-01
| |/ /
* | | Merge branch 'fix/emoji-align' into 'develop'Shpuld Shpludson2018-02-02
|\ \ \ | | | | | | | | | | | | | | | | Align custom emoji to middle of line. See merge request pleroma/pleroma-fe!196
| * | | Align custom emoji to middle of lineeal2018-02-01
| | | |
* | | | Merge branch 'fix/show-fav-and-rt-counts' into 'develop'Shpuld Shpludson2018-02-02
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Show fav/RT counts even if not logged in. See merge request pleroma/pleroma-fe!199
| * | | Show fav/RT counts even if not logged in.eal2018-02-02
|/ / /
* | | Merge branch 'feature/normal-emoji-completion' into 'develop'lambda2018-02-01
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add completion for normal emoji. Closes #15 See merge request pleroma/pleroma-fe!169
| * | | Merge branch 'develop' into feature/normal-emoji-completioneal2018-02-01
| |\| |
| * | | Fix name clash on unicode and custom emojieal2018-02-01
| | | |
| * | | Merge branch 'develop' into feature/normal-emoji-completioneal2017-12-23
| |\ \ \
| * | | | Add completion for normal emoji.eal2017-11-20
| | | | |
* | | | | Merge branch 'develop' into 'develop'Shpuld Shpludson2018-02-01
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Completes portuguese translation, Fixes issue #58 Closes #58 See merge request pleroma/pleroma-fe!194
| * | | | Fixes issue #58aka2018-01-31
| | | | |
| * | | | Completes portuguese translationaka2018-01-31
|/ / / /
| | | * add instance specific panelhakabahitoyo2018-02-04
| |_|/ |/| |
* | | Move chat to sidebar.Roger Braun2018-01-26
| | |
* | | Merge branch 'update-ger-translation' into 'develop'eal2018-01-03
|\ \ \ | | | | | | | | | | | | | | | | update ger translation See merge request pleroma/pleroma-fe!189
| * | | update ger translationSebastian Huebner2018-01-03
|/ / /