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
Mogge
62261f4b92
Merge pull request #3954 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/object-path-0.11.5 
[Security] Bump object-path from 0.11.4 to 0.11.5 in /backend
 2020-11-20 21:01:44 +01:00
Mogge
19126c032a
Merge pull request #3955 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/migrate-1.7.0 
Bump migrate from 1.6.2 to 1.7.0 in /backend
 2020-11-20 20:53:22 +01:00
Mogge
e2f4b99561
Merge pull request #3961 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/jquery-3.5.1 
[Security] Bump jquery from 3.4.1 to 3.5.1 in /backend
 2020-11-20 20:36:39 +01:00
dependabot-preview[bot]
f7fdcc975b
[Security] Bump dot-prop from 4.2.0 to 4.2.1 in /backend 
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 19:31:03 +00:00
dependabot-preview[bot]
43df22208a
Bump prettier from 2.0.4 to 2.2.0 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.4 to 2.2.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.4...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 19:22:54 +00:00
Mogge
f1953385fa
Merge pull request #3983 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/apollo-server-2.14.2 
[Security] Bump apollo-server from 2.11.0 to 2.14.2 in /backend
 2020-11-20 20:00:33 +01:00
Mogge
588caf2f5d
Merge pull request #3982 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/node-fetch-2.6.1 
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /backend
 2020-11-20 19:59:33 +01:00
dependabot-preview[bot]
6445ad2e08
Bump migrate from 1.6.2 to 1.7.0 in /backend 
Bumps [migrate](https://github.com/visionmedia/node-migrate) from 1.6.2 to 1.7.0.
- [Release notes](https://github.com/visionmedia/node-migrate/releases)
- [Changelog](https://github.com/tj/node-migrate/blob/main/History.md)
- [Commits](https://github.com/visionmedia/node-migrate/compare/v1.6.2...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:48:36 +00:00
Mogge
f67ebe7005
Merge pull request #3960 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-author-5.14.22 
Bump metascraper-author from 5.11.8 to 5.14.22 in /backend
 2020-11-20 19:46:23 +01:00
dependabot-preview[bot]
d2d226cf0a
[Security] Bump jquery from 3.4.1 to 3.5.1 in /backend 
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.1. **This update includes security fixes.**
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:34:22 +00:00
dependabot-preview[bot]
6a0675c5c1
[Security] Bump apollo-server from 2.11.0 to 2.14.2 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server) from 2.11.0 to 2.14.2. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server@2.14.2/packages/apollo-server)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:28:32 +00:00
dependabot-preview[bot]
fe1ea862a6
[Security] Bump node-fetch from 2.6.0 to 2.6.1 in /backend 
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 18:28:32 +00:00
dependabot-preview[bot]
6052a5957f
[Security] Bump apollo-server-express from 2.12.0 to 2.14.2 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-express) from 2.12.0 to 2.14.2. **This update includes a security fix.**
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-express@2.14.2/packages/apollo-server-express)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 15:07:33 +00:00
dependabot-preview[bot]
0a3275309d
Bump metascraper-author from 5.11.8 to 5.14.22 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.11.8 to 5.14.22.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.8...v5.14.22)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 15:01:27 +00:00
dependabot-preview[bot]
cd97a30c8e
[Security] Bump object-path from 0.11.4 to 0.11.5 in /backend 
Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.4 to 0.11.5. **This update includes a security fix.**
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-11-20 15:01:17 +00:00
Ademílson F. Tonato
7f345c3140 fix: update based on code-review suggestions 2020-11-16 15:27:17 +01:00
Moriz Wahl
dafb280494 linting 2020-11-16 14:01:12 +01:00
Moriz Wahl
71f4e2bd6e snapshot changed / facebook link stays the same for testing purposes 2020-11-16 13:21:20 +01:00
Moriz Wahl
5cfb73572e further rebranding 2020-11-16 09:43:15 +01:00
Wolfgang Huß
a94d7188be Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read-test 2020-11-12 15:37:38 +01:00
Moriz Wahl
128e1f06cc logos changed. SVG should be in better quality 2020-11-10 14:41:09 +01:00
Moriz Wahl
ecb0bb3766 Starting rebranding to ocelot.social 2020-11-10 12:08:44 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
ogerly
f498ba8c65 fix: new mapbox token 2020-11-05 15:38:13 +01:00
Wolfgang Huß
844da649f0 Fix node version to 'node:12.19.0-alpine3.10' 
- Changed from 'node:lts-alpine' to 'node:12.19.0-alpine3.10'.
 2020-11-03 13:02:24 +01:00
Wolfgang Huß
ae4f53e09c Correct backend test 
- And added some empty lines for nice formating.
 2020-11-02 15:50:21 +01:00
Wolfgang Huß
13c70903e1 Change docker repository to develop-backend 
- nitro-backend  —>  develop-backend
 2020-10-28 10:59:36 +01:00
Moriz Wahl
48cf0a6816 comments are sorted by createdAt 2020-10-26 11:40:25 +01:00
Moriz Wahl
c4b436f6cb spinner added to download button, only the posts written by the user are exported 2020-10-26 10:43:22 +01:00
Ademílson F. Tonato
1df69c90fd feat: add tests for mark all as read (backend) 2020-10-24 19:38:45 +01:00
Ademílson F. Tonato
0bffede021 feat: add mutation for new functionality (mark-all-as-read) 
- Add mutation for markAllAsRead (notifications)
- Add method to the schema that returns a list of all notifications
- Add permissions rules to invoke this method (isAuthenticated)

See #2660
 2020-10-24 11:29:09 +01:00
Wolfgang Huß
c99cb16a6b v0.6.3 2020-10-16 12:42:43 +02:00
Wolfgang Huß
3f453c6888
Merge pull request #3954 from Human-Connection/export-user-data 
feat: Export User Data Update
 2020-10-16 11:31:41 +02:00
Moriz Wahl
14de48ecd7 deleted or disabled post are not available for user data download. 2020-10-16 11:00:58 +02:00
Wolfgang Huß
63207320b4 v0.6.2 2020-10-15 17:00:46 +02:00
Moriz Wahl
106e2713d6 simplefied cypher, cleanDatabase after specs 2020-10-14 15:26:00 +02:00
Moriz Wahl
9b2bf64db5 improved specs for userData resolver 2020-09-30 11:22:49 +02:00
Moriz Wahl
2eff1ab97b specs for userData resolver 2020-09-29 17:24:43 +02:00
Moriz Wahl
0e678a5559 basic json download of user data 2020-09-29 13:35:47 +02:00
Moriz Wahl
a67b74cae0 backend for export user data 2020-09-24 17:24:27 +02:00
Moriz Wahl
e90bc9fd46 undo changes on terms and condition agreed 2020-09-24 12:38:25 +02:00
Moriz Wahl
ade4114c73 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-09-24 12:33:01 +02:00
Moriz Wahl
0a11156d49 remove first character in query string if it is @, ! or # 2020-09-24 12:31:55 +02:00
Wolfgang Huß
44cf8c6b65 Fix backend tests by fixing US location 2020-09-23 08:03:39 +02:00
Alexander Friedland
abdce9aaa7
cange country 
United States of America TO United States
 2020-08-19 11:56:45 +02:00
ogerly
bbf578ffc6 fix: location nameEN to United States 2020-08-18 15:35:16 +02:00
ogerly
6a68bb8f83 fix: location map box USA 2020-08-18 11:50:32 +02:00
ogerly
1b268b4891 fix: lint 2020-08-14 17:48:29 +02:00
Alexander Friedland
6d856a3edc
Merge branch 'master' into 17-Admin-Remove-user-profile 2020-08-14 17:23:16 +02:00
ogerly
3d69ebbb1c fix: tests ok, lint ok 2020-08-14 11:39:38 +02:00