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
10,421 Commits 5 Branches 2 Tags
Commit Graph

3734 Commits

Author SHA1 Message Date
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
Alexander Friedland
524dec1095
Merge pull request #786 from Human-Connection/764-Untranslated-Texts-in-Post-Page 
[Bug] Untranslated Texts in Post Page #764
 2019-06-18 15:07:42 +02:00
Robert Schäfer
3948cb8ace VerifyCode.spec passes 2019-06-18 13:51:30 +02:00
Robert Schäfer
559210d204 Oh, forgot, you have to add the email again 
Well, this is not good practice. If an attacker has access to the
mailbox then she knows also the email account as well. It's better to
ask the user for the unique username, e.g. `@username`.

https://stackoverflow.com/a/16018373
 2019-06-18 13:25:25 +02:00
Robert Schäfer
288e5002fd Flesh out VerifyCode.spec.js 2019-06-18 13:13:13 +02:00
Robert Schäfer
a641ab6884 Turn off autocomplete for all password fields 2019-06-18 13:01:19 +02:00
Robert Schäfer
5a781b0bc6 Copy+Paste code form Password/Change, DRY later 2019-06-18 12:58:43 +02:00
Robert Schäfer
de40499007 Move to next step after verify code 2019-06-18 12:41:58 +02:00
Robert Schäfer
8fc74b9e14 Put validation error translations together 2019-06-18 12:09:06 +02:00
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
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
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
Robert Schäfer
c4eb2178f2 Scaffold page component test for password reset 2019-06-17 12:39:36 +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
33c969c161 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-17 11:33:28 +02: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
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
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
Matt Rider
35878d3fa9 Merge branch 'dependabot/npm_and_yarn/webapp/tiptap-1.21.0' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.21.0 2019-06-14 17:24:18 -03:00
Matt Rider
ebb73c8782 Add placeholder for new contributions 2019-06-14 17:18:09 -03:00
Wolfgang Huß
23185fa29e Fix a problem in PostMutations.js which came in through merging the master 2019-06-14 20:25:25 +02:00
Wolfgang Huß
68dcbacaff Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/components/ContributionForm/index.vue
#	webapp/graphql/PostMutations.js
 2019-06-14 19:02:33 +02:00
Matt Rider
7d00b73530 Turn off $root listeners in beforeDestroy 2019-06-14 14:02:22 -03:00
Wolfgang Huß
0b0fd6e825 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/post/_id/_slug/index.vue
#	webapp/pages/profile/_id/_slug.vue
 2019-06-14 18:56:02 +02:00
mattwr18
dd627535e4
Merge pull request #795 from Human-Connection/781-language-of-contribution 
Create Posts with a specified language, or fallback
 2019-06-14 13:53:22 -03:00
Wolfgang Huß
736dc7d601 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 2019-06-14 18:46:44 +02:00
Wolfgang Huß
472bfc2a88 Used PostMutations in PostHelpers now 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-14 18:44:56 +02:00
Matt Rider
1c10e0863f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-14 13:31:39 -03:00
Matt Rider
614a7eebc1 Refactor ContributionForm to deal with posts with no languages 2019-06-14 13:30:00 -03:00
Matt Rider
57b2b6a864 Merge branch '404-delete-user-account-and-data' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:38:08 -03:00
Matt Rider
664a8b327f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:37:45 -03:00
Wolfgang Huß
3af6f4e822 Little german approvements … 2019-06-14 14:42:30 +02:00