aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/develop' into notificationsHenry Jameson2018-08-16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (26 commits) Update status.vue Update retweet_button.js Update retweet_button.vue Use serverside html rendering in usernames and bios if available. Update status.vue Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'" Hide all status actions if not logged in hopefully, fix linter Fixes broken custom emoji in autocomplete when proxying to remote BE Made it so that unfocused tab doesn't autostream posts when scrolled to the top Remove trailing whitespace Textarea is now focused when replying the missing piece for invites system Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are fixed lint cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling added ability to pick the style of highlighting post-rebase fix, backported d7d787b84cb8e36ad7f622054808f0e66c496309 notifs fix maybe i should actually add myself to contributors list? ...
| * Merge branch 'invites' into 'develop'lambda2018-08-12
| |\ | | | | | | | | | | | | FE part of invites system See merge request pleroma/pleroma-fe!297
| | * the missing piece for invites systemHenry Jameson2018-08-05
| | |
| * | Merge branch 'develop' into 'feature/accountHighlight'Henry2018-08-12
| |\ \ | | | | | | | | | | | | # Conflicts: # src/components/user_card_content/user_card_content.vue
| | * | Fixes broken custom emoji in autocomplete when proxying to remote BEHenry Jameson2018-08-06
| | |/
| * | working, somewhatHenry Jameson2018-07-06
| | |
* | | Added support for qvitter api fetching of notificationsHenry Jameson2018-08-12
| |/ |/|
* | Revert "Merge branch 'cw-clickthrough' into 'develop'"lambda2018-07-12
| | | | | | This reverts merge request !291
* | Add configuration option to enable click-through content warningsVivian Lim2018-06-28
|/
* Merge branch 'feature/locked-accounts' into 'develop'lambda2018-06-12
|\ | | | | | | | | Feature/locked accounts See merge request pleroma/pleroma-fe!274
| * add follow requests UIWilliam Pitcock2018-06-07
| |
* | Make scope options optional, refactoring.Roger Braun2018-06-08
|/
* configurable who to follow panelHakaba Hitoyo2018-05-05
|
* Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into ↵Hakaba Hitoyo2018-05-04
|\ | | | | | | feature/who-to-follow-panel-configurable
| * Add who-to-follow-panelHakaba Hitoyo2018-02-24
| |
* | lintHakaba Hitoyo2018-04-29
| |
* | lintHakaba Hitoyo2018-04-29
| |
* | redirect root by login or notHakaba Hitoyo2018-04-29
|/
* Update main.jsHakaba Hitoyo2018-02-10
|
* slove conflictHakaba Hitoyo2018-02-10
|\
| * Add textlimitdtluna2018-02-09
| |
| * Use `name` and `closed` from the backenddtluna2018-02-09
| |
* | debugHakaba Hitoyo2018-02-04
| |
* | slove-conflictHakaba Hitoyo2018-02-04
|\|
| * 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
| | | |
* | | | add instance specific panelhakabahitoyo2018-02-04
| |_|/ |/| |
* | | Move chat to sidebar.Roger Braun2018-01-26
| | |
* | | Detect backend.eal2017-12-23
| |/ |/|
* | Merge branch 'fix/gs-emoji-error' into 'develop'eal2017-12-07
|\ \ | | | | | | | | | | | | Suppress emoji fetch error on gs. See merge request pleroma/pleroma-fe!183
| * | Suppress emoji fetch error on gs.eal2017-12-07
| | |
* | | Add option for disabling chat.eal2017-12-07
| | |
* | | Move chat to own module.Roger Braun2017-12-05
| | |
* | | Basic frontend changes for chat.Roger Braun2017-12-04
|/ /
* / Make default path configurable.Roger Braun2017-11-22
|/
* Clean up, use translations, persist theme, add more presets.shpuld2017-11-18
|
* Persist streaming setting between sessions.eal2017-11-13
|
* Revert to English timeago for latin script languages.eal2017-11-09
|
* Add timeago locales.eal2017-11-08
|
* Set locale from browser settings.Roger Braun2017-11-07
|
* Prepare for i18n.Roger Braun2017-11-07
|
* Use the API endpoint for emoji completion.eal2017-10-19
|
* Actually actually fix image url.eal2017-09-19
|
* Actually fix image url.eal2017-09-19
|
* Add emoji completion.eal2017-09-19
|
* Add tag timeline view.eal2017-09-17
|
* Try logging in with the existing cookie.Roger Braun2017-09-02
|
* Add new user-settings component/route, add options to change name, bio, ↵Shpuld Shpuldson2017-08-02
| | | | avatar, banner and bg. Add those options to api service and backend interactor service.