-
- Downloads
Merge branch 'develop' into 'feature/copy-link'
# Conflicts: # static/fontello.json
No related branches found
No related tags found
Showing
- CHANGELOG.md 22 additions, 1 deletionCHANGELOG.md
- src/boot/after_store.js 3 additions, 0 deletionssrc/boot/after_store.js
- src/components/emoji_input/suggestor.js 18 additions, 6 deletionssrc/components/emoji_input/suggestor.js
- src/components/follow_request_card/follow_request_card.js 21 additions, 1 deletionsrc/components/follow_request_card/follow_request_card.js
- src/components/notification/notification.js 22 additions, 0 deletionssrc/components/notification/notification.js
- src/components/notification/notification.vue 34 additions, 12 deletionssrc/components/notification/notification.vue
- src/components/notifications/notifications.scss 34 additions, 0 deletionssrc/components/notifications/notifications.scss
- src/components/registration/registration.js 14 additions, 11 deletionssrc/components/registration/registration.js
- src/components/status/status.js 15 additions, 20 deletionssrc/components/status/status.js
- src/components/user_settings/user_settings.vue 12 additions, 0 deletionssrc/components/user_settings/user_settings.vue
- src/i18n/en.json 7 additions, 1 deletionsrc/i18n/en.json
- src/i18n/pl.json 310 additions, 10 deletionssrc/i18n/pl.json
- src/modules/config.js 2 additions, 1 deletionsrc/modules/config.js
- src/modules/statuses.js 35 additions, 2 deletionssrc/modules/statuses.js
- src/services/api/api.service.js 33 additions, 14 deletionssrc/services/api/api.service.js
- src/services/entity_normalizer/entity_normalizer.service.js 2 additions, 3 deletionssrc/services/entity_normalizer/entity_normalizer.service.js
- src/services/notification_utils/notification_utils.js 6 additions, 1 deletionsrc/services/notification_utils/notification_utils.js
- src/services/notifications_fetcher/notifications_fetcher.service.js 0 additions, 3 deletions...es/notifications_fetcher/notifications_fetcher.service.js
- static/fontello.json 12 additions, 0 deletionsstatic/fontello.json
Loading
Please register or sign in to comment