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

64 Commits

Author SHA1 Message Date
Matt Rider
7bbbf40bcc Update seeds to create post with a category 2019-08-20 16:39:26 +02:00
Matt Rider
a000719663 Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 16:13:38 +02:00
Matt Rider
3b09c31cbb Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-19 16:55:29 +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
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
kachulio1
314dfcf413 Throw error if no categories on post creation 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-08-15 17:55:02 +03:00
Matt Rider
569ace137b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 10:14:47 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +02:00
Wolfgang Huß
825a5f235a Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-14 13:10:19 +02:00
Robert Schäfer
b63f6b0ba1 Setup blocked relationships in seeds 2019-08-13 11:05:29 +02:00
Robert Schäfer
f8b37b5c1e Remove obsolete relationship 'BLACKLISTED' 2019-08-13 11:05:29 +02:00
Robert Schäfer
2eaf66378a
Merge pull request #1133 from Human-Connection/384-emotions-on-posts 
Emotions on posts
 2019-08-09 00:37:38 +02:00
Robert Schäfer
f3e545a913 Fix bug: Only add emotions for authenticated user 2019-08-08 23:10:01 +02:00
Matt Rider
fd022c7992 Fix mentions in seeds 2019-08-08 10:19:38 +02:00
Matt Rider
b6975bde89 Add data-mention-id to seeds mentions 2019-08-08 10:07:57 +02:00
Matt Rider
cb7217f5a7 Fix bug 
- apollo query fetchPolicy set to no-cache so that it will refetch a post's emotions count on page transition
 2019-08-06 08:05:35 +02:00
Wolfgang Huß
22b9bf77fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/schema/resolvers/notifications.spec.js
 2019-08-05 10:15:20 +02:00
Matt Rider
d1d82a0051 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-02 16:55:54 +02:00
Robert Schäfer
e1bb6ed74e Fix lint 2019-08-02 01:45:36 +02:00
Matt Rider
0a98113c2d Add backend tests for RemovePostEmotions 2019-07-30 13:28:30 +02:00
Robert Schäfer
1970baaa2d Apparently neode doesn't like multiple connections 
Why? 😟
 2019-07-16 21:05:44 +02:00
Robert Schäfer
99bfd56ea7 Merge remote-tracking branch 'origin/master' into refactor_email_address 2019-07-16 20:20:21 +02:00
Wolfgang Huß
cd0c509c81 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-07-16 16:10:36 +02:00
Wolfgang Huß
b5bd77b539 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1000_find_users_by_email_address 
# Conflicts:
#	webapp/layouts/default.vue
 2019-07-16 08:44:42 +02:00
Wolfgang Huß
ff234eeed5 Preparing for Mentions of users in Comments 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 08:12:40 +02:00
Robert Schäfer
cec3eddcef Fix more test cases 2019-07-15 18:35:38 +02:00
Robert Schäfer
46589362fa Start to refactor User<->EmailAddress 2019-07-15 18:35:38 +02:00
Wolfgang Huß
688da7f705 Changed GQL schema and seed data 2019-07-15 13:39:16 +02:00
Robert Schäfer
99740e6ad6 Follow @Tirokk's suggestion and rename key=>id 2019-07-13 14:27:19 +02:00
Robert Schäfer
448f350c2e Implement paginating user view for admins 2019-07-10 21:45:37 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode 
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
 2019-07-10 14:36:42 +02:00
Wolfgang Huß
e69f292bd8 Hashtags restricted in the chars, in Editor Suggestions and Backend 
Refactor Seeding with Tag ids as Tag names.
In Frontend: Done as a suggestion with all the forbidden chars removed.
In Backend by Regex only the fitting links.
Rewrite backend test to make sure Hashtag „id“ is the name of the Hashtag.
Test for „https://www.example.org/#anchor“

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-08 19:25:57 +02:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control 
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
 2019-07-03 15:58:42 +02:00
Alexander Friedland
76388d4c4b
Merge pull request #908 from Human-Connection/785-reporting-a-user-post-or-comment 
the one-time reporting of a user, post or comment
 2019-07-03 08:44:19 +02:00
Robert Schäfer
0bc1444336 Explicitly define all comment mutations in schema 
Remove `postId` as part of the to-be-saved comment type.
 2019-07-02 15:11:21 +02:00
senderfm
6c7ee1ef42 das einmalige melden eines User, Beitrags oder Kommentars 
ist jetzt möglich
 2019-06-25 17:51:14 +02:00
Matt Rider
b84bd6fbb3 Try with imageUrl 2019-06-24 11:44:03 -03:00
Matt Rider
f551e9a637 Fix failing build due to lorempixel.com being down 2019-06-22 12:01:00 -03:00
Robert Schäfer
e3b4e9bf56 Cleaning the database checks for process.env 2019-06-04 17:33:30 +02:00
Ulf Gebhardt
a1db7fa201
corrected config include 2019-06-03 23:13:42 +02:00
Ulf Gebhardt
caa6a65f99
removed dotenv.config calls 2019-06-03 18:47:00 +02:00
Ulf Gebhardt
4fd2885b26
reference global config 2019-06-03 13:19:08 +02:00
Ulf Gebhardt
6f0447515a
- fixed several errors handling import 
- split graphql schema into parts
- which data is imported which is not - a list
 2019-05-29 15:37:28 +02:00
Ulf Gebhardt
cfd0975b24
backend linting 2019-05-23 19:23:03 +02:00
Robert Schäfer
0637d97648 Merge remote-tracking branch 'origin/master' into 2019/kw15/User_can_change_its_username_to_emptystring 2019-05-07 14:09:10 +02:00
Matt Rider
154082a251 Add authorship to commments at creation 
- Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-05-02 15:54:44 -03:00
Ulf Gebhardt
0be2891858
make email a required field for user, tests for front- & backend 2019-05-02 16:17:16 +02:00
Matt Rider
3d2a982d3f Attempt to updated comments 
- by pushing to the post.comments array, which updates the array, but doesn't rerender the comments component
- by updating the apollo store as seen here https://akryum.github.io/vue-apollo/guide/apollo/mutations.html#server-side-example and https://github.com/Akryum/vue-apollo-todos
 2019-04-18 22:14:23 -03:00
Matt Rider
fc496aec51 Merge github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-18 19:00:05 -03:00