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

4261 Commits

Author SHA1 Message Date
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
ogerly
97dad41b27 Set language will be saved in the database of the user during registration 2019-10-16 15:01:07 +02:00
Wolfgang Huß
30f268525f Add Cypher statement for ordering 
- minor db manipulation text change
 2019-10-16 13:32:45 +02:00
dependabot-preview[bot]
8d5e0b0e2c
build(deps): bump date-fns from 2.4.1 to 2.5.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.1 to 2.5.0.
- [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.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 10:18:30 +00:00
Robert Schäfer
84af40e0df
Merge pull request #1916 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.4 
build(deps-dev): bump nodemon from 1.19.3 to 1.19.4 in /backend
 2019-10-16 12:16:03 +02:00
Wolfgang Huß
a705f6a017
Merge pull request #1797 from Human-Connection/1707-reporting-with-specific-information 
🍰 Reporting with specific information
 2019-10-16 11:54:29 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00
Wolfgang Huß
7067867f76 Changed mentioned file in comment 2019-10-16 09:25:50 +02:00
dependabot-preview[bot]
51ef7a7c8c
build(deps-dev): bump nodemon from 1.19.3 to 1.19.4 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.3...v1.19.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 07:00:48 +00:00
dependabot-preview[bot]
5e5f6ec1cc
build(deps): bump dotenv from 8.1.0 to 8.2.0 in /backend 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.1.0 to 8.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.1.0...v8.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-16 06:58:30 +00:00
mattwr18
e8c6941142 Follow @roschaefer's PR review suggestions 
- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
 2019-10-15 20:28:25 +02:00
dependabot-preview[bot]
a42a910ac7
build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.17.0 to 22.19.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.17.0...v22.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 12:01:43 +00:00
dependabot-preview[bot]
319de54265
build(deps): bump node from 12.11.1-alpine to 12.12.0-alpine in /backend 
Bumps node from 12.11.1-alpine to 12.12.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-15 07:06:25 +00:00
mattwr18
a3f4282bae
Merge pull request #1868 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.6.4 
build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4 in /backend
 2019-10-15 08:23:50 +02:00
dependabot-preview[bot]
c8fdaef729
build(deps): bump apollo-server from 2.9.5 to 2.9.6 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.5...apollo-server@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 21:54:45 +00:00
mattwr18
02def215b7
Merge pull request #1870 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.6 
build(deps-dev): bump apollo-server-testing from 2.9.5 to 2.9.6 in /backend
 2019-10-14 23:52:40 +02:00
mattwr18
df090944bf
Merge pull request #1871 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.7.0 
build(deps): bump @sentry/node from 5.6.2 to 5.7.0 in /backend
 2019-10-14 21:28:27 +02:00
dependabot-preview[bot]
30c3cf3e1d
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.5 to 2.9.6.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.5...apollo-server-testing@2.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 19:28:23 +00:00
dependabot-preview[bot]
01c9e083eb
build(deps-dev): bump @babel/cli from 7.6.3 to 7.6.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.3 to 7.6.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.3...v7.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 19:27:36 +00:00