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

123 Commits

Author SHA1 Message Date
mattwr18
d9bfad68a9 Update scenario description 
- to be more similar to other descriptions of the file
 2019-10-01 21:59:25 +02:00
mattwr18
624922b0e6 Check that reported post can be visited 
- want to verify that it is not a post not found 402
 2019-10-01 21:29:48 +02:00
mattwr18
478f6fef1c Fix query builder/test 2019-10-01 20:57:45 +02:00
mattwr18
3dee2137d4 Find annoying user by id 2019-10-01 20:05:34 +02:00
mattwr18
8aa7f376b6 Update Post query for blockedByUsers 
- Admin/Moderators see Posts even if they are blocked
 2019-10-01 17:45:09 +02:00
Wolfgang Huß
cee0a27b14 Try to fix intermitent failing Cypress test for notification 2019-09-27 16:11:25 +02:00
roschaefer
b7d70bbe90 Fix cypress tests 2019-09-20 23:21:57 +02:00
Wolfgang Huß
7bdc6b52d2 Fixed Cypress tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: ogerly <fridolin@tutanota.com>
 2019-09-04 20:19:45 +02:00
ogerly
643b931167 Merge branch 'C-1187-terms-and-conditions-confirmed-function' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 07:04:17 +02:00
ogerly
c64ff67a55 Fixed constant for terms and conditions created in folder for constant 2019-09-04 07:03:56 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
roschaefer
8c7e3708a4 Fix Report.feature 2019-09-03 21:28:29 +02:00
roschaefer
784e1fd911 Fix one more cypress test, implement a factory 2019-09-03 21:28:29 +02:00
roschaefer
4d5769fbc6 Fix cypress tests and factories 2019-09-03 21:28:29 +02:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
roschaefer
66b12090a7 Fix cypress tests 2019-08-30 16:00:32 +02:00
ogerly
27e7bf6279 Cypress tests ok ,terms and conditions after hard work ready to merge 2019-08-30 09:51:00 +02:00
Matt Rider
f6ba3cf581 Uncomment out feature steps 2019-08-30 08:00:07 +02:00
Matt Rider
cf60397477 Fix failing cypress test, add steps 
- Added step to expose the search feature was completely broken after my latest commit.
- when a user blocks another user, the search functionality just stopped working.
- reverted changes to @roschaefer hacky fix of the search functionality
 2019-08-30 07:47:57 +02:00
ogerly
f28ff69f3a Adaptation of Cypress tests, first attempt 2019-08-30 06:54:25 +02:00
roschaefer
e10629a0fe Fix imports 2019-08-29 11:45:17 +02:00
ogerly
4a4f1b4475 Tests of Cypress changes 2019-08-28 09:25:21 +02:00
Matt Rider
c2d6723837 Fix cypress test, unique category ids/slugs 2019-08-21 10:50:56 +02:00
Matt Rider
e8871f51d4 Refactor cypress tests 
- add cypress command to createCategories to DRY out the steps
- remove step from background when isn't directly related to the setup
 2019-08-21 10:00:44 +02:00
Matt Rider
c43ed33b7d Add categories for post creation Content.feature 2019-08-20 22:22:27 +02:00
Matt Rider
512bf32b0c Update cypress tests, fix broken comment reactivity 2019-08-20 21:27:00 +02:00
Matt Rider
8735045d11 Update cypress tests, post query 2019-08-20 20:13:29 +02:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
Robert Schäfer
87461c21ca
Merge pull request #1280 from Human-Connection/refactor-graphql-queries 
Refactor graphql queries
 2019-08-19 09:58:38 +02:00
Wolfgang Huß
f653bac9e1 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.spec.js
 2019-08-16 18:22:36 +02:00
roschaefer
b27a01438e Damn you're right @mattwr18 
You are right with this statement: https://github.com/Human-Connection/Human-Connection/pull/1280#discussion_r314675882
 2019-08-16 16:53:38 +02:00
roschaefer
51b734275a The name of the hashtag is now it's ID 
`name` was just a redundant attribute
 2019-08-16 01:49:29 +02:00
Matt Rider
f12e2a6e16 Add force true to click on Report User 2019-08-15 12:12:00 +02:00
mattwr18
ab6cd501fe
Merge pull request #1209 from Human-Connection/1054-blocked-users 
🍰 1054 blocked users
 2019-08-14 16:36:41 +02:00
Matt Rider
a21cf5aef6 Fix cypress test 2019-08-14 15:19:27 +02:00
Matt Rider
6099a986c9 Improve English, update case for English translations 2019-08-14 14:29:35 +02:00
Wolfgang Huß
25981e0f35 Corrected Cypress test 2019-08-14 08:55:44 +02:00
roschaefer
073185d424 All cucumbers implemented 2019-08-13 19:46:01 +02:00
roschaefer
b017203c64 Implement next cucumber scenario 2019-08-13 19:09:56 +02:00
roschaefer
fffd29e867 Sketch cucumber scenarios for blocked user feature 
.. first scenario already passing
 2019-08-13 18:20:32 +02:00
Robert Schäfer
72edf78889 Meld a chaotic commit history into one commit 
Some important commit messages:

```
    Fix youtu.be not being embedded

    And also try to maintain the old behaviour matching
    `provider.provider_url`.
```

```
    Remove confusing code comments and obsolete code

    I discovered that the behaviour of no duplicate notifications being send
    out is caused by the frontend: When the editor reads html from the
    backend, it will parse hashtags and mentions as ordinary links, not as
    their respective nodes during editing. Also, we don't have to worry
    about duplicate ids being found: The cypher statement will implicitly
    suppress duplicate notification nodes for the same user.

    So let's remove the code to avoid confusing the next developer.
```

```
    Test editor.getHTML()

    I do this because I'm not able to test the content of `this.editor` from
    a wrapper of `vue-test-utils`. If I call `this.editor.getHTML` directly
    and use it as a computed property `renderedContent` to populate a `<div
    v-html="renderedContent" />` this will not work for the embeds. So, my
    current best bet is to test the editor object isolated from a real
    component. ;(
```

```
    Add core-js as explicit dependency

    Because of build errors on Travis.

    See: https://stackoverflow.com/a/55313456

    Remove as soon as this issue is resolved:
    https://github.com/storybookjs/storybook/issues/7591

```

```
    Refactor: Keep Runtime-only builds

    See: https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
```
 2019-08-01 00:28:22 +02:00
Wolfgang Huß
0dad956c28
Merge pull request #1063 from Human-Connection/375-Sorting-II 
375 sorting (II)
 2019-07-31 14:49:37 +02:00
Matt Rider
c8a6792627 Add parent class for css selector on cypress/component 2019-07-22 06:50:58 -03:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
Alina Beck
c2887c7b90 add integration test for editing social media 2019-07-16 13:06:34 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
6f4e1b6f30 Fix cypress 2019-07-10 09:01:57 +02:00
Robert Schäfer
4207aee09d DRY up password validations 2019-07-09 22:12:40 +02:00
Matt Rider
e541d88e72 Add force true to userprofile upload 
- It was being covered by another element:
<div class="v-popover avatar-menu">...</div>
 2019-07-09 10:52:39 -03:00
Matt Rider
014de3b97b Destructure category from result 2019-07-09 07:58:15 -03:00