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

135 Commits

Author SHA1 Message Date
Moriz Wahl
b1bed00ad4 fix user model spec 2023-02-13 16:03:47 +01:00
Wolfgang Huß
a8f59a4c42 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	backend/src/constants/categories.js
#	backend/src/db/seed.js
 2022-08-31 09:02:26 +02:00
Moriz Wahl
d948067f44 add category name again to seed and init to avoid conflicts with graphql model 2022-08-22 20:47:37 +02:00
Moriz Wahl
5b7bdc0291 seed Yunite categories 2022-08-22 19:56:35 +02:00
Wolfgang Huß
5e741ead8d Overtake Moriz suggestions 2022-08-10 13:15:43 +02:00
Wolfgang Huß
0149af12d4 Cleanup 2022-08-09 16:50:28 +02:00
Wolfgang Huß
cc44ee8ebc Refactor relations ':OWNS' and ':ADMINISTERS' to ':MEMBER_OF' with properties 2022-08-03 13:12:50 +02:00
Wolfgang Huß
520598c897 Implement 'description', 'groupType', and 'actionRadius' in 'CreateGroup' 2022-08-03 11:50:56 +02:00
Wolfgang Huß
fc20143a65 Test groups creation in slugifyMiddleware 2022-08-03 07:51:29 +02:00
Wolfgang Huß
f565e5fb6a Implement 'CreateGroup' with tests 2022-08-02 16:20:11 +02:00
Wolfgang Huß
9632d0f852 Fix file name from 'Groups.js' to singular 'Group.js' 2022-08-02 09:18:30 +02:00
Wolfgang Huß
52bffa426b Fix linting 2022-08-02 09:10:02 +02:00
Wolfgang Huß
bf9dd205ca Implement GQL for groups 2022-08-02 08:26:14 +02:00
Wolfgang Huß
7ae5593f82 Implement user notifications settings 2021-09-22 14:05:10 +02:00
Wolfgang Huß
850f3c15ac Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 
# Conflicts:
#	webapp/components/DonationInfo/DonationInfo.spec.js
#	webapp/components/DonationInfo/DonationInfo.vue
#	webapp/pages/index.vue
 2021-09-16 11:30:05 +02:00
Wolfgang Huß
62de9a158e Fix as quick fix for all reminding tests 2021-07-26 11:36:42 +02:00
Wolfgang Huß
da951c6fb6 Clean up 2021-05-06 16:37:31 +02:00
Wolfgang Huß
d40dd94868 Implement showDonations in the database 
- Add to backend tests.
 2021-04-15 10:51:01 +02:00
Moriz Wahl
1c3f628fb2 count views of post teaser 2021-03-01 15:33:20 +01:00
Moriz Wahl
4862d53196 tests added for click count 2021-02-22 20:49:33 +01:00
Moriz Wahl
4a16af10ba image property type added 2021-02-04 21:01:52 +01:00
Moriz Wahl
0c141b631f factory and seeding for invite codes 2021-01-12 20:11:47 +01:00
Moriz Wahl
dd6cafed4c basic specs for inviteCodes 2021-01-11 21:25:02 +01:00
Moriz Wahl
a1967815bf further invite code 2021-01-07 13:30:11 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
roschaefer
c9caa5bf4c Fix uuid deprecations 2020-02-25 13:16:48 +01:00
ogerly
597913555e change: New Link, Learn how to setup the database 2020-02-20 23:17:20 +01:00
roschaefer
fa0e64b7cb Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie 
There was a single step definition that created a post and a comment. I
would say let's put that in two different steps.
 2020-02-01 13:33:07 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
roschaefer
fc367297e3 Get rid of different factory files 
..and fix some cypress tests
 2020-01-28 23:12:50 +01:00
roschaefer
95bfb090fd Refactor factory for posts 2020-01-28 22:43:26 +01:00
mattwr18
d6a2f2d9e3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-27 20:08:37 +01:00
mattwr18
b48b93dd0d Set up cypress test for direct reply to comment 2020-01-27 15:07:32 +01:00
mattwr18
37178fd6ba Add migration for muted relationship 2020-01-27 13:28:12 +01:00
mattwr18
f8f62cc71f Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-23 20:42:44 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature 
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2020-01-23 20:30:12 +01:00
mattwr18
28dae1f854 Update docs, follow @roschaefer suggestions 
- create command should be run with --date-format to be more human
  readable, and --template-file to use our template instead of migrate's
default
- rename migrations
- rename createdAt to migratedAt to remove ambiguity
- do not merge relationships for Location nodes as we don't want to
  create duplicate relationships
- use singular locationId as it's iterating one at a time
 2020-01-23 15:44:34 +01:00
mattwr18
8accc62f18 Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-22 15:23:11 +01:00
mattwr18
c6bfca312c Favor createdAt over timestamp 
- it's more human readable and consistent with all other nodes in
  production
 2020-01-22 13:31:48 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content 
feat: Convert block/unblock to mute/unmute
 2020-01-21 17:05:09 +01:00
roschaefer
a86b26a756 Various fixes for data migrations 
* Add unique index for `Migration`s
* Fix proper use of `next` callback. First argument is potential error.
* Update migration template
 2020-01-20 17:25:36 +01:00
roschaefer
b063847849 refactor: Make db:setup init stage of migrate 2020-01-20 11:00:52 +01:00
roschaefer
daf2c40cae Implement Neo4J store for migrate 2020-01-20 10:59:15 +01:00
roschaefer
c0e2675912 refactor(neo4j) Setup constraints with neode 2020-01-20 10:58:33 +01:00
roschaefer
178143dfb7 refactor(modules): Various import fixes 
* DRY schema stitching code
* Use same `.env` configuration file for cypress tests

That last part I couldn't improve a lot. I thought it might be possible
with cypress to import all files from a folder. But since it must be
browser compatible and our backend is not using webpack or anything,
it remains a goal unreached.

close #2773
close #2774
 2020-01-17 15:59:19 +01:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute 
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
 2020-01-08 18:04:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist 
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
 2020-01-07 18:57:35 +01:00
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content 
Blur Images
 2019-12-19 11:46:38 +01:00
roschaefer
deaf071550 Update neode 
This fixes some API changes with the update of neode.
 2019-12-17 11:38:02 +01:00