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

3518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
senderfm
42f5fb6bf3 Fixed No untranslated strings 2019-06-05 10:38:15 +02:00
Robert Schäfer
36f77e660e
Merge pull request #731 from Human-Connection/722_comment-date 
Add date relative date on comments
 2019-06-05 00:54:48 +02:00
Robert Schäfer
67862b1f20
Merge pull request #735 from Human-Connection/remove_verbose_log_output_on_travis 
DISABLED_MIDDLEWARES only set outside production
 2019-06-05 00:45:32 +02:00
Robert Schäfer
a200ce5955
Merge pull request #736 from Human-Connection/releasePost3 
🍰 release contribution again
 2019-06-04 23:20:13 +02:00
Robert Schäfer
52a52d7ad4 Provide better user experience with different icon 
@ogerly I changed the icon to use a normal eye if you want to release
the contribution. Changing visual state usually improves user
experience.
 2019-06-04 18:15:07 +02:00
Robert Schäfer
e3b4e9bf56 Cleaning the database checks for process.env 2019-06-04 17:33:30 +02:00
Robert Schäfer
0289412ba7 DISABLED_MIDDLEWARES only set outside production 
That way, we don't see verbose logging output on Travis. Setting DEBUG
will have the effect that all calls of `neo4jgraphql` will produce log
output.
 2019-06-04 17:33:30 +02:00
senderfm
f1b85d5256 Fixed clean ReleaseModal and DeleteModal 2019-06-04 16:25:59 +02:00
aonomike
21131a1e45 Add cypress test to check date comment posted is displayed 2019-06-04 15:16:01 +03:00
aonomike
55b3764258 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 722_comment-date 2019-06-04 13:54:41 +03:00
Robert Schäfer
5aafe5d1b2
Merge pull request #733 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.2 
Bump tippy.js from 4.3.1 to 4.3.2 in /webapp
 2019-06-04 12:53:48 +02:00
dependabot-preview[bot]
b9c8d35def
Bump tippy.js from 4.3.1 to 4.3.2 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.1...v4.3.2)
 2019-06-04 04:59:26 +00:00
Ulf Gebhardt
cdc1b28735
Merge pull request #724 from Human-Connection/2019/kw22/refactor_backend_structure 
🍰 2019/kw22/refactor_backend_structure
 2019-06-04 00:48:22 +02:00
mattwr18
094a46861b
Merge pull request #721 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.20.2 
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp
 2019-06-03 19:30:10 -03:00
Ulf Gebhardt
dd624ef535
fix for YOU CAN'T CLEAN THE DATABASE WITH DEBUG=false 2019-06-04 00:10:42 +02:00
Ulf Gebhardt
97ff6fdb78
Merge branch 'master' into 2019/kw22/refactor_backend_structure 2019-06-03 23:31:26 +02:00
Ulf Gebhardt
0b270ee7c3
fixed default import syntax 2019-06-03 23:24:26 +02:00
Ulf Gebhardt
1a264a2662
fixed config check for server 2019-06-03 23:19:50 +02:00
Ulf Gebhardt
15bfabcefd
check if config variables are present only when server is started 2019-06-03 23:17:58 +02:00
Ulf Gebhardt
a1db7fa201
corrected config include 2019-06-03 23:13:42 +02:00
Ulf Gebhardt
edcc5adb41
corrected paths and include order 2019-06-03 23:11:48 +02:00
Ulf Gebhardt
de6e2ee1f9
Merge pull request #729 from Human-Connection/553-delete-comment 
User can not anymore delete Comments of others
 2019-06-03 23:02:08 +02:00
Ulf Gebhardt
edd71b7825
DISABLE_MIDDLEWARES now requires DEBUG=true 2019-06-03 23:00:27 +02:00
Ulf Gebhardt
164f3b6878
fixed lint 2019-06-03 22:57:46 +02:00
aonomike
f7e5c7bf2c Add date relative date on comments 2019-06-03 23:36:04 +03:00
Matt Rider
76bca90ede Merge branch 'master' of github.com:Human-Connection/Human-Connection into 553-delete-comment 2019-06-03 16:55:30 -03:00
Ulf Gebhardt
6948666cfe
Merge branch 'master' into 2019/kw22/refactor_backend_structure 
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/comments.spec.js
#	backend/src/schema/resolvers/socialMedia.spec.js
 2019-06-03 19:48:47 +02:00
Wolfgang Huß
cc774b03b8 Lint Fix in Backend 2019-06-03 19:48:36 +02:00
Ulf Gebhardt
177e33c022
fixed spec include paths 2019-06-03 19:34:58 +02:00
Ulf Gebhardt
3adb8d0f64
lint fixes 2019-06-03 19:29:14 +02:00
Robert Schäfer
7272c5002d
Merge pull request #725 from Human-Connection/fix_terrible_middleware_bug_in_production 
Don't remove middlewares in production
 2019-06-03 19:27:33 +02:00
Wolfgang Huß
62993cc3e9 Clean up 2019-06-03 19:05:59 +02:00
Wolfgang Huß
25999a6dfd Bug fix for User can delete Comments of others 
Wrote a Jest test for this.
 2019-06-03 19:04:40 +02:00
Ulf Gebhardt
caa6a65f99
removed dotenv.config calls 2019-06-03 18:47:00 +02:00
Wolfgang Huß
deaf1b4307
Merge pull request #609 from Human-Connection/553-delete-comment 
Delete Comment

I’ll come back to your notices and recommendations @roschaefer …
But merge for now.
 2019-06-03 17:20:23 +02:00
Robert Schäfer
74f4c7b2fe
Merge pull request #718 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.1 
Bump apollo-server from 2.5.1 to 2.6.1 in /backend
 2019-06-03 14:18:59 +02:00
Robert Schäfer
e1a1403df4
Merge pull request #714 from Human-Connection/deploy_maintenance_worker_to_dockerhub_automatically_with_small_split_size 
Deploy maintenance worker to dockerhub automatically with smaller split size
 2019-06-03 14:18:13 +02:00
Robert Schäfer
5866804fd3 Don't remove middlewares in production 
@ulfgebhardt thank you for pointing out! That was a terrible bug.
 2019-06-03 14:14:57 +02:00
Wolfgang Huß
d365f9368b Lint Fixes 2019-06-03 13:54:50 +02:00
Ulf Gebhardt
4fd2885b26
reference global config 2019-06-03 13:19:08 +02:00
Robert Schäfer
df70ae451c Parameterize split size 
@ulfgebhardt that was a really good suggestion, thanks!
 2019-06-03 13:11:12 +02:00
dependabot-preview[bot]
1b35859861
Bump apollo-server from 2.5.1 to 2.6.1 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.5.1 to 2.6.1.
- [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.5.1...apollo-server@2.6.1)
 2019-06-03 11:05:10 +00:00
Robert Schäfer
3c1629ca3f
Merge pull request #719 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.1 
Bump apollo-server-testing from 2.5.1 to 2.6.1 in /backend
 2019-06-03 13:02:50 +02:00
Wolfgang Huß
948a99d9da Merge remote-tracking branch 'origin/master' into 553-delete-comment 
# Conflicts:
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/pages/index.vue
#	webapp/pages/post/_id/_slug/more-info.vue
 2019-06-03 10:39:13 +02:00
dependabot-preview[bot]
86d1e2a4b9
Bump tiptap-extensions from 1.20.1 to 1.20.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.20.1...tiptap-extensions@1.20.2)
 2019-06-03 05:01:54 +00:00
dependabot-preview[bot]
ebdfb028b8
Bump apollo-server-testing from 2.5.1 to 2.6.1 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.5.1 to 2.6.1.
- [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.5.1...apollo-server-testing@2.6.1)
 2019-06-03 04:57:55 +00:00
Ulf Gebhardt
89fa5c2f3b
Merge pull request #698 from Human-Connection/691_handle-large-file-sizes-bug 
Fix upload large file sizes bug
 2019-06-02 04:47:34 +02:00
Matt Rider
e09ef35c4a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 691_handle-large-file-sizes-bug 2019-06-01 16:05:43 -03:00
aonomike
78100bec37 Add tests to upload error bug fix 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-06-01 20:23:04 +03:00
Robert Schäfer
13a2f771f8
Merge pull request #712 from Human-Connection/dependabot/docker/webapp/node-12.3.1-alpine 
Bump node from 10-alpine to 12.3.1-alpine in /webapp
 2019-05-31 20:15:10 +02:00