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
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
Wolfgang Huß
7106fa8ada
Merge pull request #3506 from Human-Connection/3498-Checkboxes_missing_on_delete_user_account_page 
fix: 🍰 Checkboxes Not Missing Anymore On Delete User Account Page
 2020-08-05 15:06:51 +02:00
ogerly
0b62d76bc1 fix: prework for tests 2020-08-05 13:45:24 +02:00
Wolfgang Huß
17a296b82e Refactore and cleanup backend tests 
- Removed double declarations.
- Put assignments in 'beforeEach'.
 2020-08-05 08:53:45 +02:00
ogerly
b25bf7b0b3 fix: lint 2020-08-03 15:22:21 +02:00
ogerly
388331f5ae test specs clear 2020-08-03 15:13:55 +02:00
ogerly
a4be3f7adf test check test WIP 2020-08-03 14:49:50 +02:00
ogerly
d2e6280059 Merge branch '17-Admin-Remove-user-profile' of https://github.com/Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-07-31 07:36:21 +02:00
ogerly
d2a43cecd7 fix lint: tests and lint ok 2020-07-30 12:14:27 +02:00
ogerly
9d5c192869 tests user.spec.js tests once clean once broken always alternating 2020-07-30 11:45:51 +02:00
dependabot-preview[bot]
9701727a05
build(deps): [security] bump apollo-server-core in /backend 
Bumps [apollo-server-core](https://github.com/apollographql/apollo-server) from 2.12.0 to 2.15.0. **This update includes a security fix.**
- [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-core@2.12.0...apollo-server-core@2.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-18 04:16:17 +00:00
roschaefer
a20aebc027 Remove obsolete env var 2020-06-15 15:18:25 +02:00
roschaefer
9bb827a8ee Remove name "Human Connection" in email templates 2020-06-15 15:13:36 +02:00
roschaefer
dd09dfa721 Replace welcome image in email templates 2020-06-15 14:54:03 +02:00
roschaefer
16c7be1cc4 Parameterize emails in backend 2020-06-05 16:49:32 +02:00
roschaefer
063200bcb1 backend: Ignore if .env file cannot be found 
fix: #7
 2020-06-05 16:29:13 +02:00
roschaefer
0ee3a308a7 Add tags and APPLICATION_NAME env variable 2020-06-05 13:07:27 +02:00
roschaefer
bc70e8b3b0 refactor: Image paths 
* removed obsolete images
* moved all overwritable images to a location webapp/static/img/custom/
* better names
 2020-06-05 11:49:18 +02:00
roschaefer
a741721295 Remove labels from Dockerfiles 
Version was out of date anyways
 2020-06-05 11:19:57 +02:00
roschaefer
23ae569509 Rename dockerhub organizations 
..plus get rid of obsolete prefix `nitro-`.
 2020-06-04 13:04:05 +02:00
Moriz Wahl
da801d6410 Removed category fragments form search gql 2020-06-02 15:43:56 +02:00
Moriz Wahl
de2193e75a changes requested by reviewers 2020-06-02 14:12:14 +02:00
Wolfgang Huß
dcc5b74038 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-05-28 10:52:24 +02:00
Wolfgang Huß
a99ee763e6 Upgrade to v0.6.1 2020-05-04 12:40:34 +02:00
ogerly
6e934ed6b2 merge: master ok 2020-04-22 10:05:09 +02:00
Wolfgang Huß
9aacb22a58
Merge pull request #3293 from Human-Connection/1741-follow-lists 
feat: FollowerList [1741]
 2020-04-20 13:01:29 +02:00
Moriz Wahl
e090ac6998 specs for searches by type 2020-04-15 14:32:13 +02:00
Moriz Wahl
e03d209c45 In the search field, if the first charater is '!', '@' or '#' it only shows results for posts, users or hastags with a limit of 15 in the dropdown 2020-04-15 09:58:23 +02:00
Moriz Wahl
7562af227e pages are counted correctly 2020-04-14 21:41:45 +02:00
Moriz Wahl
b2a5d51106 refactoring 2020-04-14 18:53:40 +02:00
Moriz Wahl
c060ad0c4a refactoring 2020-04-14 16:45:29 +02:00
Moriz Wahl
499f9859e8 skip and offset removes from cypher as it has no effect. Added function to apply limits 2020-04-13 23:38:40 +02:00
Moriz Wahl
ee1569d5d9 refactoring of search by types 2020-04-13 16:34:47 +02:00