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
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

1511 Commits

Author SHA1 Message Date
Matt Rider
7d9e6623ea Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-20 12:28:26 -03: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
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
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
senderfm
0a66ad56d9 Fix Specs, lint, fix test 2019-06-18 09:58:29 +02:00
Robert Schäfer
edd6a3f0c3 PW-Reset page switches password reset and verify 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
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
f9d25828d5 Add reset password page 2019-06-15 11:47:24 +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
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
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
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ß
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
Matt Rider
5266de2c62 Set dropdown with language of post if exists 
follow `PR` review by @Tirokk
 2019-06-13 17:29:33 -03:00
Matt Rider
306da8a4e3 Revert _slug.vue to master 2019-06-13 16:05:20 -03:00
Matt Rider
3c3db87c1b Add back deleted translations 
- mistakenly deleted when working through merge conflict
 2019-06-13 15:34:45 -03:00
Wolfgang Huß
482ac1572b Refactored and created the tests of DeletePostCallback 
Created a folder `utils` for PostHelpers.js.
Fixed a new incoming problem of the master with deleting Posts on the User Profile.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-13 19:23:13 +02:00
Robert Schäfer
b8c5db48a6 Implement prefix of image urls with a filter 
Fix #820

Ok, so after I would have to use the same method in three different
locations (`<ds-card>` expects an `image` attribute but cannot render
entire components) I decided to implement the prefix of image urls with
a filter rather than a component. The downside of this is that we have
to add the filter on a lot of component tests. The benefit is less
components and hopefully less complexity.
 2019-06-13 16:56:41 +02:00
Matt Rider
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03:00
Matt Rider
70567857e8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-12 15:51:38 -03:00
Matt Rider
83c7773d1b Add checkboxes to delete posts/comments 
- fix tests
- rename files/directory to DeleteData to be more accurate
 2019-06-12 15:07:16 -03:00
Wolfgang Huß
cd0074ec86 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js
#	webapp/pages/profile/_id/_slug.vue
 2019-06-12 18:22:50 +02:00
Wolfgang Huß
1339734281 Rename DeleteModal to ConfirmModel and write some refactor some tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 18:02:50 +02:00
Wolfgang Huß
8eb089d218 Rename event deletePost to removePostFromList 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 15:58:23 +02:00
Wolfgang Huß
1c6016ddcc Refactored the PostHelpers to an imported lib instead a mixin 2019-06-12 09:05:43 +02:00
Matt Rider
4407d6648a Add component tests, translations 2019-06-11 15:47:10 -03:00
Robert Schäfer
5eaac8b077 Document loading spinner implementation with test 
Because it's slightly odd how I avoid a duplicate loading spinner, I
 thought this is a good target for a test.
 2019-06-11 18:48:01 +02:00
Robert Schäfer
d1364e4aed Merge remote-tracking branch 'origin/master' into 402-userprofil-tab-click-function 2019-06-11 17:41:17 +02:00
Matt Rider
507890a7aa Add CSS styling to danger message box 
- lost the CSS when removed buefy
 2019-06-10 14:11:44 -03:00
Matt Rider
1c506bd21c Merge in master, follow PR review suggestions 
- @roschaefer suggested to 'Ask the user to type in the name of the resource that should be destroyed'
- he also showed concern for setting `wrapper.setData({ deleteEnabled: true })`, this commit allows interaction in the component tests with the input field that sets deleteEnabled to true if it matches the resource that should be destroyed
- this `PR` also removes the use of buefy and it's underlying bulma since we don't need a switch or check boxes
- german translations have also been added
 2019-06-10 13:36:08 -03:00
Matt Rider
a110a067fa Add teaser image to contribution form 2019-06-08 14:24:55 -03:00
Robert Schäfer
15b7043d00 Write a test for "load more" button 
The crucial test is still missing: Write a test to check that no more
than one loading spinner is visible all the time.

@Tirokk FYI I wrote a page component test and made sure that the test
will also fail if the implementation is broken.
 2019-06-08 01:50:08 +02:00
Matt Rider
70aa77bd2e Get user deletion working from UI 2019-06-07 13:37:59 -03:00
Wolfgang Huß
b2e1873ade Refactored to modalData for Delete Comment and Posts 
The error is gone with this.
 2019-06-07 18:04:12 +02:00
Matt Rider
fcb5ab8f1e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-07 12:14:12 -03:00
Robert Schäfer
9384f85ebf Use jest's expectation matchers if possible 
@Tirokk jest has a lot of assertion matchers that will give you better
error messages than the default ones:
https://jestjs.io/docs/en/expect.html#tohavelengthnumber
 2019-06-07 16:53:30 +02:00
Robert Schäfer
94ea9c9530 Fix lint 2019-06-07 13:48:59 +02:00
Robert Schäfer
7ab6ce4ed2 Fix typo in translation keys 2019-06-07 13:10:04 +02:00