IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,947 Commits 5 Branches 2 Tags
Commit Graph

723 Commits

Author SHA1 Message Date
mattwr18
7763083bd6
Merge pull request #925 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.1 
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in /webapp
 2019-06-27 18:18:13 -03:00
dependabot-preview[bot]
3eab153164
Bump date-fns from 2.0.0-alpha.37 to 2.0.0-beta.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.37 to 2.0.0-beta.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.37...v2.0.0-beta.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 04:24:11 +00:00
dependabot-preview[bot]
84e81f88c4
Bump graphql from 14.3.1 to 14.4.0 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.3.1 to 14.4.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.3.1...v14.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-27 04:22:55 +00:00
Ulf Gebhardt
31259b4341
Merge pull request #911 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.0.0 
Bump eslint-config-prettier from 5.0.0 to 6.0.0 in /webapp
 2019-06-26 14:06:13 +02:00
Robert Schäfer
421ee07b98
Merge pull request #913 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-promise-4.2.1 
Bump eslint-plugin-promise from 4.1.1 to 4.2.1 in /webapp
 2019-06-26 11:03:43 +02:00
dependabot-preview[bot]
fad0447312
Bump eslint-config-prettier from 5.0.0 to 6.0.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v5.0.0...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 09:03:03 +00:00
dependabot-preview[bot]
4f8122e117
Bump date-fns from 2.0.0-alpha.36 to 2.0.0-alpha.37 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.36 to 2.0.0-alpha.37.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.36...v2.0.0-alpha.37)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 04:25:08 +00:00
dependabot-preview[bot]
dba7678e5f
Bump eslint-plugin-promise from 4.1.1 to 4.2.1 in /webapp 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.1.1 to 4.2.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-26 04:24:03 +00:00
Robert Schäfer
4ea6834919
Merge pull request #881 from Human-Connection/paginage_12_entries 
Page size of 12 entries on / page
 2019-06-25 11:50:23 +02:00
Robert Schäfer
ef9b43f1da
Merge pull request #901 from Human-Connection/900-refactor-create-comments-mutation-remove-global-event-listener-update-cache 
Refactor CreateComments functionality
 2019-06-25 11:49:19 +02:00
Robert Schäfer
9b7a0f0031
Merge pull request #898 from Human-Connection/895-write-component-tests-for-update-post 
Write tests for UpdatePost, refactor tests
 2019-06-25 11:47:04 +02:00
Robert Schäfer
7140950c59
Merge pull request #903 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-5.2.3 
Bump eslint-plugin-vue from 5.2.2 to 5.2.3 in /webapp
 2019-06-25 11:45:52 +02:00
dependabot-preview[bot]
b723093c06
Bump eslint-plugin-import from 2.17.3 to 2.18.0 in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.3 to 2.18.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.3...v2.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 04:26:49 +00:00
dependabot-preview[bot]
e27fd6c0e4
Bump eslint-plugin-vue from 5.2.2 to 5.2.3 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v5.2.2...v5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-25 04:26:05 +00:00
mattwr18
dca4e34623
Merge pull request #888 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.36 
Bump date-fns from 2.0.0-alpha.35 to 2.0.0-alpha.36 in /webapp
 2019-06-24 20:15:56 -03:00
Matt Rider
6908cd6316 Fix lint 
- remove unused variable
 2019-06-24 19:11:59 -03:00
Matt Rider
c6203ad8eb Refactor CreateComments functionality 
- update apollo cache on successful mutation
- remove global event listener
- avoid refetch Post to update CommentsList
- return comment with its author from resolver
 2019-06-24 18:21:52 -03:00
Matt Rider
49fff114b3 Write tests for UpdatePost, refactor tests 2019-06-24 16:38:33 -03:00
dependabot-preview[bot]
b30b7d7d78
Bump date-fns from 2.0.0-alpha.35 to 2.0.0-alpha.36 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.35 to 2.0.0-alpha.36.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.35...v2.0.0-alpha.36)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:28:36 +00:00
dependabot-preview[bot]
be737e4dc8
Bump eslint-plugin-jest from 22.7.0 to 22.7.1 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.7.0 to 22.7.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.7.0...v22.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-24 19:28:32 +00:00
Robert Schäfer
90fe507791 Page size of 12 entries on / page 
It annoys me that there are gaps for the 3 column layout, even if there
are more records left. So, the newsfeed layout has 1 column on mobile, 2
columns on tablet, and 3 columns on a desktop pc. So we should choose a
page size which is dividable by 1,2 and 3 that is 6. I have chosen 12
which is 2*6 to avoid clicking the reload posts button so often.
 2019-06-24 21:28:06 +02:00
Matt Rider
f551e9a637 Fix failing build due to lorempixel.com being down 2019-06-22 12:01:00 -03:00
Robert Schäfer
3c36cad373
Merge pull request #868 from Human-Connection/867-fix-vue-warn-enableDeletionValue 
Add enableDeletionValue to unlock deletion
 2019-06-22 08:54:48 +02:00
Robert Schäfer
181b4b48e6
Merge pull request #829 from Human-Connection/2019/kw24/fix_imported_img_urls 
🍰 2019/kw24/fix_imported_img_urls
 2019-06-21 23:41:32 +02:00
Robert Schäfer
86e538f7eb Merge branch 'fix_broken_master' into 801_reset_password 2019-06-21 22:39:51 +02:00
Robert Schäfer
3076f9f455 Get rid of console.errors in tests of FilterMenu 2019-06-21 22:11:41 +02:00
Robert Schäfer
5125967542
Merge pull request #871 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.7.0 
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /webapp
 2019-06-21 14:33:41 +02:00
Robert Schäfer
9723bb12e3 Merge branch 'master' into 801_reset_password 2019-06-21 13:59:45 +02:00
dependabot-preview[bot]
ba9092fa75
Bump eslint-plugin-jest from 22.6.4 to 22.7.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.6.4 to 22.7.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.6.4...v22.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 09:53:14 +00:00
dependabot-preview[bot]
3f8dc10fab
Bump date-fns from 2.0.0-alpha.34 to 2.0.0-alpha.35 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.34 to 2.0.0-alpha.35.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.34...v2.0.0-alpha.35)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-21 04:28:28 +00:00
Matt Rider
7a5636fdc2 Add enableDeletionValue to unlock deletion 
- Thanks @Tirokk for pointing this out. How was this even working before?
 2019-06-20 12:07:16 -03:00
Matt Rider
8a77fcff15 Fix failing test, console.errors 2019-06-20 11:57:52 -03:00
Robert Schäfer
9ec9034ea5 Fix translatios as suggested by @Tirokk 2019-06-20 15:25:59 +02:00
Robert Schäfer
ff46740e90 Follow @mattwr18 suggetions don't enter mail twice 2019-06-20 15:13:22 +02:00
Ulf Gebhardt
0c3e53a239
Merge pull request #836 from Human-Connection/835-use-vuex-to-make-editor-placeholder-reactive 
Set up editor placeholder to use Vuex
 2019-06-19 14:59:17 +02:00
Ulf Gebhardt
8debbd03eb
Merge pull request #854 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.0.2 
Bump babel-eslint from 10.0.1 to 10.0.2 in /webapp
 2019-06-19 14:57:06 +02:00
Robert Schäfer
c85c94aa40 Splitting components, better route navigation 
This also allows us to generate a password reset link to quickly reset
your password without entering the code and email manually.
 2019-06-19 14:23:22 +02:00
Robert Schäfer
a7eced5f8e Redirect to `/' if user is authenticated 2019-06-19 13:40:08 +02:00
Robert Schäfer
217c905800 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-19 13:26:13 +02:00
dependabot-preview[bot]
a6a0ee16a0
Bump apollo-client from 2.6.2 to 2.6.3 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.2...apollo-client@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-19 04:19:09 +00:00
Robert Schäfer
304fd028f0 Leftover token=>code 2019-06-18 23:51:54 +02:00
Robert Schäfer
38327ddf71 Split password flow into different routes part 1 2019-06-18 23:49:38 +02:00
Robert Schäfer
d8eca07c21 Fix lint 2019-06-18 23:28:48 +02:00
Robert Schäfer
cc26d0be94 Handle passwordReset response on reset page 2019-06-18 22:48:53 +02:00
Robert Schäfer
506fe0fe94 Add support instructions 2019-06-18 22:35:52 +02:00
Robert Schäfer
7446464d6c Better translations 2019-06-18 19:08:59 +02:00
Robert Schäfer
ba185bcb65 Refactor backend 2019-06-18 19:03:59 +02:00
Robert Schäfer
69434cdc7f Nicer information messages 2019-06-18 16:11:05 +02:00
Alexander Friedland
5a80c6df6f
Merge pull request #855 from Human-Connection/436-Menu-in-Post-Scroll-to-Comment-section 
When you call up a post you can scroll to the comments
 2019-06-18 15:20:39 +02:00
Alexander Friedland
fbad4ce6ce
Merge pull request #856 from Human-Connection/849-Text-description-for-Filter-Bubble 
Fix a text description for the filter bubble
 2019-06-18 15:12:19 +02:00