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

6461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02:00
mattwr18
46fd534a28
Merge pull request #1840 from Human-Connection/1205-pinned-post-for-admins 
Allow admins to pin a post
 2019-10-21 14:37:14 +02:00
Alina Beck
c2c69a2f70 update styling and wording for pinned post ribbons 2019-10-21 14:34:26 +03:00
Robert Schäfer
59e3d62bf8
Merge pull request #1968 from Human-Connection/1893-fix 
fix: Only one ellipse is displayed
 2019-10-21 13:28:12 +02:00
mattwr18
9d37099984
Merge pull request #1957 from Human-Connection/1955_refactor-reports-resolver-spec 
Refactor reports resolver spec
 2019-10-21 13:22:17 +02:00
aonomike
86907f2800 Fix code review issues 2019-10-21 13:25:56 +03:00
Mogge
8728feaa37
fix: Only one ellipse is displayed 2019-10-21 11:33:26 +02:00
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
mattwr18
3a78af3efb
Merge pull request #1965 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.0.4 
build(deps-dev): bump @vue/cli-shared-utils from 3.12.0 to 4.0.4 in /webapp
 2019-10-21 09:42:43 +02:00
mattwr18
945c2447d8
Merge pull request #1963 from Human-Connection/dependabot/docker/neo4j/neo4j-3.5.12-enterprise 
build(deps): bump neo4j from 3.5.11-enterprise to 3.5.12-enterprise in /neo4j
 2019-10-21 09:40:52 +02:00
mattwr18
38ffa86c24
Merge pull request #1960 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.4.0 
build(deps-dev): bump cypress-file-upload from 3.3.4 to 3.4.0
 2019-10-21 09:40:12 +02:00
mattwr18
797520aaef
Merge pull request #1959 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.5.1 
build(deps): bump date-fns from 2.5.0 to 2.5.1 in /backend
 2019-10-21 09:39:33 +02:00
mattwr18
9a9768616c
Merge pull request #1958 from Human-Connection/dependabot/npm_and_yarn/faker-9fd8d7d 
build(deps-dev): bump faker from `10bfb9f` to `9fd8d7d`
 2019-10-21 09:38:58 +02:00
dependabot-preview[bot]
fa5ce6edca
build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.12.0 to 4.0.4.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.0.4/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 04:24:49 +00:00
dependabot-preview[bot]
484917d922
build(deps): bump neo4j in /neo4j 
Bumps neo4j from 3.5.11-enterprise to 3.5.12-enterprise.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 04:23:31 +00:00
dependabot-preview[bot]
03b75bea6c
build(deps-dev): bump cypress-file-upload from 3.3.4 to 3.4.0 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.3.4 to 3.4.0.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.3.4...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-21 04:22:33 +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
dependabot-preview[bot]
3ea174a42f
build(deps-dev): bump faker from 10bfb9f to 9fd8d7d 
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 04:21:40 +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
e37736500a Move comment to above relevant code 2019-10-18 19:05:00 +02: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
73002cf694
Merge pull request #1946 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.4 
build(deps): bump tiptap-extensions from 1.28.3 to 1.28.4 in /webapp
 2019-10-18 16:33:25 +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
86d8f833ee
Merge pull request #1942 from Human-Connection/fix_frontend_tests 
fix: console warnings during frontend tests
 2019-10-18 16:28:14 +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
1fce840efb
locale 
change language to locale
 2019-10-18 12:16:32 +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
Alexander Friedland
0b5c1f831d
locale 
change language to locale
 2019-10-18 11:52:48 +02:00
Alexander Friedland
bfb3923023
locale 
change language to locale
 2019-10-18 11:50:42 +02:00
Alexander Friedland
18fe54e095
Update Registration.js 
change language to locale
 2019-10-18 11:49:14 +02:00
mattwr18
6d63434751
Merge pull request #1951 from Human-Connection/update-version-to-0.1.5 
Update to version 0.1.5
 2019-10-18 11:39:20 +02:00
mattwr18
bb053afcad Update to version 0.1.5 2019-10-18 11:05:34 +02:00