Merge branch 'develop' into 'master'
Pending changes from develop See merge request !80
No related branches found
No related tags found
Showing
- docker-compose.localbuild.yml 22 additions, 0 deletionsdocker-compose.localbuild.yml
- package.json 2 additions, 2 deletionspackage.json
- src/app/assets/icons/cross-post.svg 12 additions, 0 deletionssrc/app/assets/icons/cross-post.svg
- src/app/assets/stylesheets/markdown.scss 9 additions, 2 deletionssrc/app/assets/stylesheets/markdown.scss
- src/app/components/cards/PostFull.jsx 85 additions, 19 deletionssrc/app/components/cards/PostFull.jsx
- src/app/components/cards/PostFull.scss 22 additions, 0 deletionssrc/app/components/cards/PostFull.scss
- src/app/components/cards/PostSummary.jsx 50 additions, 3 deletionssrc/app/components/cards/PostSummary.jsx
- src/app/components/cards/PostSummary.scss 23 additions, 1 deletionsrc/app/components/cards/PostSummary.scss
- src/app/components/elements/Author/index.jsx 28 additions, 13 deletionssrc/app/components/elements/Author/index.jsx
- src/app/components/elements/EmbeddedPlayers/index.jsx 30 additions, 8 deletionssrc/app/components/elements/EmbeddedPlayers/index.jsx
- src/app/components/elements/EmbeddedPlayers/twitch.jsx 5 additions, 1 deletionsrc/app/components/elements/EmbeddedPlayers/twitch.jsx
- src/app/components/elements/EmbeddedPlayers/twitter.jsx 222 additions, 0 deletionssrc/app/components/elements/EmbeddedPlayers/twitter.jsx
- src/app/components/elements/Icon.jsx 1 addition, 0 deletionssrc/app/components/elements/Icon.jsx
- src/app/components/elements/Reblog.jsx 7 additions, 1 deletionsrc/app/components/elements/Reblog.jsx
- src/app/components/elements/Tag.jsx 9 additions, 2 deletionssrc/app/components/elements/Tag.jsx
- src/app/components/modules/Settings.jsx 8 additions, 2 deletionssrc/app/components/modules/Settings.jsx
- src/app/components/pages/Post.jsx 10 additions, 8 deletionssrc/app/components/pages/Post.jsx
- src/app/components/pages/PostsIndex.scss 5 additions, 2 deletionssrc/app/components/pages/PostsIndex.scss
- src/app/locales/en.json 2 additions, 0 deletionssrc/app/locales/en.json
- src/app/redux/FetchDataSaga.js 41 additions, 3 deletionssrc/app/redux/FetchDataSaga.js
Loading
Please register or sign in to comment