ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,773 Commits 117 Branches 1,511 Tags
Commit Graph

3773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
0e3eb43276 Split PasswordResetPage into subcomponents 2019-06-17 15:20:02 +02: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
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
5a806ca99e Remove duplicate test case 2019-06-17 12:24:14 +02:00
Robert Schäfer
33c969c161 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-17 11:33:28 +02: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
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
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
4cc810205a Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.21.0 2019-06-14 17:22:46 -03:00
Matt Rider
ebb73c8782 Add placeholder for new contributions 2019-06-14 17:18:09 -03:00
Robert Schäfer
869383be25
Merge pull request #830 from Human-Connection/2019/kw23/import_images_improvements 
2019/kw24/import_images_improvements
 2019-06-14 21:15:37 +02:00
Wolfgang Huß
60bbd3f408
Merge pull request #763 from Human-Connection/734-authorization-problem-disabling-post 
Authorisation problem when disabling a post
 2019-06-14 20:45:02 +02: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
mattwr18
b5fb7cb34b
Merge pull request #740 from Human-Connection/404-delete-user-account-and-data 
Delete my User Account functionality
 2019-06-14 13:45:30 -03: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
Ulf Gebhardt
bc83e6bfd9
configurable output folder, local .env file to override config and define local environment 2019-06-14 14:13:41 +02:00
Robert Schäfer
aee0403cc7
Merge pull request #823 from Human-Connection/343_whitelist_all_queries_and_mutations 
Whitelist queries/mutations, fix tests
 2019-06-14 13:22:00 +02:00
Robert Schäfer
0b9601d382
Merge pull request #825 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-alpha.33 
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.33 in /backend
 2019-06-14 11:45:57 +02:00
Robert Schäfer
d8621c6a31
Merge pull request #828 from Human-Connection/821-follow_up 
Follow up on #820
 2019-06-14 11:41:00 +02:00
Robert Schäfer
0fc7061333 Disable broken cucumber tests for now 
@Mastercuber the justification for simply disabling the tests is that
the entire implemntation for the follow activities is wrong. It's still
using the `AddUserFollowedBy` auto-generated mutation. The mutation that
is actually used when you do a follow or unfollow are called `follow`
and `unfollow` - these are custom mutations implemented by ourselves.

So the proper fix for these tests would be to refactor the entire
ActivityPub implementation. Since there is a pending PR already I
decided not to go down the rabbit hole and simply tag the failing
sceario as "work-in-progress" (@wip).
 2019-06-14 11:33:32 +02:00
Wolfgang Huß
58b36372b9 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js

Defined missing `$filter.truncate` which made console errors in the webapp Jest test.
 2019-06-14 11:11:22 +02:00
Wolfgang Huß
45bd1299ce Rewrote the PostHelpers and put them in a utils folder 2019-06-14 10:37:43 +02:00
Robert Schäfer
e602786ef8
Merge pull request #826 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.1.4 
Bump cypress-file-upload from 3.1.3 to 3.1.4
 2019-06-14 10:28:39 +02:00
Robert Schäfer
eb4b05e431 Add relevant permissions to let cypress tests pass 2019-06-14 10:14:48 +02:00
dependabot-preview[bot]
2bab4d5563
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.33 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.33.
- [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.31...v2.0.0-alpha.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 08:04:36 +00:00
Robert Schäfer
53f85c6ca4
Merge pull request #827 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.33 
Bump date-fns from 2.0.0-alpha.32 to 2.0.0-alpha.33 in /webapp
 2019-06-14 10:02:30 +02:00
Robert Schäfer
76e0d7ef06 Follow up on #820 
I forgot the most important part: Proxy teaser image urls.
 2019-06-14 09:59:46 +02:00
Robert Schäfer
354d8787b0 Merge remote-tracking branch 'origin/master' into 343_whitelist_all_queries_and_mutations 2019-06-14 09:45:54 +02:00
dependabot-preview[bot]
c394faa898
Bump cypress-file-upload from 3.1.3 to 3.1.4 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.1.3...v3.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 07:45:03 +00:00
Robert Schäfer
638be23d5a
Merge pull request #813 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.12.0 
Bump cypress-cucumber-preprocessor from 1.11.2 to 1.12.0
 2019-06-14 09:43:14 +02:00