IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-17 02:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,189 Commits 5 Branches 2 Tags
Commit Graph

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
senderfm
8484704460 Fix a text description for the filter bubble 2019-06-18 10:49:20 +02:00
senderfm
0a66ad56d9 Fix Specs, lint, fix test 2019-06-18 09:58:29 +02:00
dependabot-preview[bot]
ef5a20b3df
Bump babel-eslint from 10.0.1 to 10.0.2 in /webapp 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 05:06:24 +00:00
dependabot-preview[bot]
994eecd2c2
Bump babel-eslint from 10.0.1 to 10.0.2 in /backend 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-18 05:04:09 +00:00
mattwr18
00286ef6b9
Merge pull request #843 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15 
Bump apollo-link-http from 1.5.14 to 1.5.15 in /backend
 2019-06-17 19:33:05 -03:00
Matt Rider
fa1613543c Merge branch 'dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15 2019-06-17 18:17:51 -03:00
Matt Rider
a750e66063 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-link-http-1.5.15 2019-06-17 18:17:30 -03:00
dependabot-preview[bot]
eadfbe6190
Bump apollo-link-http from 1.5.14 to 1.5.15 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.14 to 1.5.15.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.14...apollo-link-http@1.5.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 21:17:00 +00:00
mattwr18
95fc61697a
Merge pull request #842 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-5.0.0 
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /backend
 2019-06-17 18:15:13 -03:00
mattwr18
115d230181
Merge pull request #841 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.18 
Bump apollo-link-context from 1.0.17 to 1.0.18 in /backend
 2019-06-17 18:14:52 -03:00
mattwr18
ce77ec28ce
Merge pull request #838 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-5.0.0 
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /webapp
 2019-06-17 18:14:28 -03:00
mattwr18
4014fcaed7
Merge pull request #840 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.34 
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /backend
 2019-06-17 18:14:02 -03:00
mattwr18
0a7546fdb3
Merge pull request #837 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.34 
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /webapp
 2019-06-17 18:13:38 -03:00
Robert Schäfer
21506335b5 Add validations for the code 2019-06-17 22:52:58 +02:00
Robert Schäfer
0da7b906bd Start with verify code component 2019-06-17 21:11:10 +02:00
Wolfgang Huß
4e780f52dc Copy and refactoring Mentions to Tags, Started 2019-06-17 18:44:17 +02:00
Matt Rider
863060149a Add UI for adding tags to a contribution 2019-06-17 12:41:02 -03:00
Robert Schäfer
edd6a3f0c3 PW-Reset page switches password reset and verify 2019-06-17 15:20:02 +02:00
Robert Schäfer
aa6855434d Emit submitted from PasswordReset component 2019-06-17 15:20:02 +02:00
Robert Schäfer
0e3eb43276 Split PasswordResetPage into subcomponents 2019-06-17 15:20:02 +02:00
Matt Rider
35428fbaaa Add test for LocaleSwitch 2019-06-17 10:07:53 -03:00
Robert Schäfer
de9ed55738 Display nice success message on password reset 2019-06-17 14:34:03 +02:00
Robert Schäfer
a501e1145d Component test to call a mutation passes 2019-06-17 14:02:25 +02:00
Ulf Gebhardt
4dde53f67d
added coverage report text in oder to fix coverage 2019-06-17 13:30:18 +02:00
Ulf Gebhardt
98dbf801ab
Merge branch 'master' into 2019/kw24/fix_imported_img_urls 
# Conflicts:
#	backend/src/middleware/fixImageUrlsMiddleware.js
#	backend/src/middleware/fixImageUrlsMiddleware.spec.js
 2019-06-17 13:24:29 +02:00
Robert Schäfer
c4eb2178f2 Scaffold page component test for password reset 2019-06-17 12:39:36 +02:00
Grzegorz Leoniec
d3624ab493
Update README.md 2019-06-17 12:38:11 +02:00
Robert Schäfer
7228d68149 Write a nice form to reset your password 2019-06-17 12:30:39 +02:00
Robert Schäfer
5a806ca99e Remove duplicate test case 2019-06-17 12:24:14 +02:00
Ulf Gebhardt
65df4c5a20
use replace instead of substring 2019-06-17 12:16:15 +02:00
Robert Schäfer
33c969c161 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-17 11:33:28 +02:00
dependabot-preview[bot]
7458fd62e2
Bump apollo-link-http from 1.5.14 to 1.5.15 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.14 to 1.5.15.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.14...apollo-link-http@1.5.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:59:16 +00:00
dependabot-preview[bot]
4566980eaa
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.3.0 to 5.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/v4.3.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:58:59 +00:00
dependabot-preview[bot]
8ff98cbc25
Bump apollo-link-context from 1.0.17 to 1.0.18 in /backend 
Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.17 to 1.0.18.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-context@1.0.17...apollo-link-context@1.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:58:20 +00:00
dependabot-preview[bot]
dc420d4116
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.33 to 2.0.0-alpha.34.
- [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.33...v2.0.0-alpha.34)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:57:46 +00:00
dependabot-preview[bot]
1cdaef179e
Bump eslint-config-prettier from 4.3.0 to 5.0.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.3.0 to 5.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/v4.3.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:56:53 +00:00
dependabot-preview[bot]
31dde68ff2
Bump date-fns from 2.0.0-alpha.33 to 2.0.0-alpha.34 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.33 to 2.0.0-alpha.34.
- [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.33...v2.0.0-alpha.34)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-17 04:56:26 +00:00
Robert Schäfer
c9ea956f85 Test+Implement resetPassword 2019-06-16 23:32:16 +02:00
Robert Schäfer
145a8d8bf6 Check invalid email 
Sending a mail with further instructions even if the email is invalid
seems to be a good practice: A potential attacker will not now if a user
has an account under that email address. If a user does not remember the
email address, but has control over the other mail account, she will get
feedback that this mail account is incorrect.
 2019-06-15 23:01:34 +02:00
Matt Rider
01eb25eca6 Update CommentForm with vuex 2019-06-15 16:15:49 -03:00
Matt Rider
4adc450f43 Fix failing test 
- add Vuex, with editor/placeholder getter
 2019-06-15 15:53:30 -03:00
Matt Rider
e583486143 Set up editor placeholder to use Vuex 
- to make reactive
- safer than using global event buses ($root.$emit)

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-06-15 15:23:51 -03:00
Robert Schäfer
c7ee0c8121 Implement tests for requestPasswordReset 2019-06-15 16:22:28 +02:00
Robert Schäfer
e44ed7d281 Start writing a resolver for requestPasswordReset 2019-06-15 15:42:17 +02:00
mattwr18
53ce72908b
Merge pull request #833 from Human-Connection/832-fix-empty-placeholder-new-contributions 
Add placeholder for new contributions
 2019-06-15 08:52:23 -03:00
mattwr18
54ca9a6e0c
Merge pull request #831 from Human-Connection/804-turn-root-listener-off 
Turn off $root listeners in beforeDestroy
 2019-06-15 08:51:54 -03:00
Robert Schäfer
f9d25828d5 Add reset password page 2019-06-15 11:47:24 +02:00
Robert Schäfer
64c5245f5a Update date-fns manually to get passed this bug: 
```
 ERROR  Failed to compile with 16 errors

This dependency was not found:

* date-fns/addSeconds in ./plugins/vue-filters.js

To install it, you can run: npm install --save date-fns/addSeconds

These relative modules were not found:

* ../../../../_lib/isSameUTCWeek/index.js in ./node_modules/date-fns/esm/locale/be/_lib/formatRelative/index.js, ./node_modules/date-fns/esm/locale/lv/_lib/formatRelative/index.js and 4 others
* ../_lib/format/formatters/index.js in ./node_modules/date-fns/format/index.js
* ../_lib/format/longFormatters/index.js in ./node_modules/date-fns/format/index.js
* ../_lib/getTimezoneOffsetInMilliseconds/index.js in ./node_modules/date-fns/format/index.js, ./node_modules/date-fns/formatRelative/index.js
* ../_lib/protectedTokens/index.js in ./node_modules/date-fns/format/index.js
* ../_lib/toInteger/index.js in ./node_modules/date-fns/format/index.js, ./node_modules/date-fns/subMilliseconds/index.js
* ../addMilliseconds/index.js in ./node_modules/date-fns/subMilliseconds/index.js
* ../differenceInCalendarDays/index.js in ./node_modules/date-fns/formatRelative/index.js
ℹ Waiting for file changes
```
 2019-06-15 11:25:01 +02:00
Robert Schäfer
d558a4de37 Add mailserver for development 2019-06-15 11:11:15 +02:00
mattwr18
e5edf6e756
Merge pull request #720 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.21.0 
Bump tiptap from 1.20.1 to 1.21.0 in /webapp
 2019-06-14 18:08:58 -03:00