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

4279 Commits

Author SHA1 Message Date
mattwr18
3163f6c9b1
Merge pull request #1853 from Human-Connection/219-add-createDate-follow-shout 
Added createdAt date for follow and shout
 2019-10-21 10:13:20 +02:00
dependabot-preview[bot]
20e3ec1965
build(deps): bump faker from 10bfb9f to 9fd8d7d in /backend 
Bumps [faker](https://github.com/Marak/faker.js) from `10bfb9f` to `9fd8d7d`.
- [Release notes](https://github.com/Marak/faker.js/releases)
- [Commits](10bfb9f467...9fd8d7d37b)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 07:40:49 +00:00
dependabot-preview[bot]
8317348e58
build(deps): bump @sentry/node from 5.7.0 to 5.7.1 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.7.0...5.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 07:39:17 +00:00
dependabot-preview[bot]
f6099e838b
build(deps): bump date-fns from 2.5.0 to 2.5.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.5.0 to 2.5.1.
- [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.5.0...v2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 04:22:09 +00:00
Kapil Jain
aaa1fea582 Implemented review comments - moved new tests in their own 'it' blocks. 2019-10-20 11:12:54 -04:00
Kapil Jain
58e3429c31 Implemented review comments - moved new tests in their own 'it' blocks. 2019-10-20 10:52:20 -04:00
aonomike
4e42017afa Refactor tests for querying reported resources 2019-10-19 15:50:48 +03:00
aonomike
08adff74bf Refactor tests for reporting a tag 2019-10-19 15:08:26 +03:00
aonomike
55abe975d9 Refactor tests for reporting a comment 2019-10-19 14:57:10 +03:00
aonomike
58d1ce6515 Refactor tests for reporting a post 2019-10-19 14:27:51 +03:00
aonomike
28f0431ffa Refactor tests for reporting a user 2019-10-19 13:34:54 +03:00
aonomike
bcb880db5e Start refactor of authenticated user path 
- Refactor report invlid resource
- Start refactor of valid resource path
 2019-10-19 12:51:16 +03:00
aonomike
cf5042d9a4 Refactor report resolver spec 
- Set up the apollo server testing
- Refactor unauthenticated path for the mutation
 2019-10-19 11:35:36 +03:00
mattwr18
7e40295129 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 19:03:45 +02:00
mattwr18
8872dc16cf Follow @Tirokk's PR review suggestions 
- add type :User to match
- remove unneeded outdated pinPost
 2019-10-18 18:27:20 +02:00
mattwr18
6853ac284d
Merge pull request #1943 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.7.7 
build(deps): bump metascraper-soundcloud from 5.7.6 to 5.7.7 in /backend
 2019-10-18 16:31:34 +02:00
mattwr18
9f70012556 Fix lint 2019-10-18 15:55:47 +02:00
mattwr18
7f2adfaa9e Add back missing locale to type User 2019-10-18 15:20:06 +02:00
mattwr18
ddf8b657be Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 15:17:03 +02:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings 
Language will be saved in the database of the user during registration
 2019-10-18 15:11:04 +02:00
mattwr18
be0c8044e8 Return pinnedAt date from pinPost resolver/clean up 
- it's good to return the pinnedAt date for ordering
- move test to a better describe block
- remove unneeded outdated variables from graphql/PostQuery UpdatePost
- fix indentation in Post.gql
- fix pinnedAt to return pinned.createdAt, not post.createdAt

Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-10-18 15:10:26 +02:00
Alexander Friedland
f6e87b87ff
locale 
change language to locale
 2019-10-18 12:54:55 +02:00
Alexander Friedland
a6108f6a00
locale 
change language to locale
 2019-10-18 12:15:21 +02:00
Alexander Friedland
abaa9b7759
locale 
change language to locale
 2019-10-18 12:14:11 +02:00
Alexander Friedland
713feb4347
locale 
change language to locale
 2019-10-18 12:13:01 +02:00
Alexander Friedland
6d1bf2c3e8
locale 
change language to locale
 2019-10-18 12:10:44 +02:00
Alexander Friedland
3346048e3e
locale 
change language to locale
 2019-10-18 11:53:29 +02:00
dependabot-preview[bot]
81e21ced91
build(deps): bump metascraper-soundcloud from 5.7.6 to 5.7.7 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.7.6 to 5.7.7.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-18 04:16:28 +00:00
Kapil Jain
dad9626656 fixed lint errors 2019-10-17 20:20:01 -04:00
Kapil Jain
202316e0a3 Fixed formatting 2019-10-17 19:45:39 -04:00
mattwr18
411bbabcd5 Add profilePagePostsQuery to deal with bug 
- we do not want to add pinnedPosts to every user's profile page
 2019-10-18 00:42:44 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up 
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
 2019-10-18 00:01:46 +02:00
mattwr18
8b27250393 Fix vue warning webapp, try to find source of cypress failure 
- clean up
 2019-10-17 22:44:44 +02:00
mattwr18
973912fb87 Add tests for unpinPost, refactor 
- following @roschaefer's PR review suggestions
- simplify UpdatePost by using pinPost/unpinPost
- did not remove filtering because attempting to have two queries caused
problems as well to do with duplicate records, etc... and it's working
now
 2019-10-17 21:51:41 +02:00
Kapil Jain
f6e70bee25 fix conflicts with merge 2019-10-17 15:17:54 -04:00
mattwr18
cbeecce775 Prefer persistent pinnedPost filter in backend 2019-10-17 17:56:16 +02:00
mattwr18
36f6be9e36 Support unpinning Post 2019-10-17 17:56:16 +02:00
mattwr18
dd55d11739 Add backend test for PostOrdering 2019-10-17 17:56:16 +02:00
mattwr18
f1243c6df0 Add createdAt attribute to PINNED and test 2019-10-17 17:56:16 +02:00
mattwr18
0007533b8c Add tests that admin can pin anyone's post/limit 1 pinned post 2019-10-17 17:56:16 +02:00
mattwr18
64f9d02c1a Start refactoring backend to pin posts on update 
- we want to give the admins the ability to create posts, then pin them
later, or pin other admins posts, etc...
 2019-10-17 17:56:15 +02:00
aonomike
56d88d6e84 Resolve failing test 2019-10-17 17:56:15 +02:00
aonomike
ab06e8a91f Add relationship for pinned posts and user 
- The CreateUser mutation now returns the user who pinned a post and so we can see the user who pinned the post
 2019-10-17 17:56:15 +02:00
mattwr18
774581f2e0 Allow admins to create a post as pinned 
- at the moment, it is created as a property of Post, but will be
refactored to create a relationship[:PINNED] from the admin to the Post

- Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2019-10-17 17:56:15 +02:00
Wolfgang Huß
72290e1c8a Add ascendant ordering as enum to ReportOrdering 2019-10-17 10:16:27 +02:00
Wolfgang Huß
681733bb0f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1924-moderators-reports-list-sort-desc 2019-10-17 10:05:13 +02:00
Alexander Friedland
cca1e2c04a
remove change 2019-10-17 09:44:26 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
Kapil Jain
6b72772bbb Added tests for SHOUT and FOLLOW relationships to make sure they have "createdAt" date. 2019-10-16 22:47:02 -04:00
ogerly
dd2efad937 fix lint 2019-10-16 15:02:17 +02:00