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

9715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Heine
fe999776c0 Filter out the deleted comments of the comment counter 2020-08-03 15:09:33 +02:00
Hannes Heine
9be480add2 Added a deleted comment to the Test case 2020-08-03 15:08:57 +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
Wolfgang Huß
1ce43af746
Merge pull request #3662 from Human-Connection/Tirokk-disable-stale-bot 
chore: 💬 Rename stale.yml to stale-disabled.yml
 2020-07-13 11:47:11 +02:00
Lala Sabathil
a44ec015a6
Merge pull request #3650 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-core-2.15.0 
build(deps): [security] bump apollo-server-core from 2.12.0 to 2.15.0 in /backend
 2020-06-23 17:16:57 +02:00
Wolfgang Huß
b8ecb296b5
Rename stale.yml to stale-disabled.yml 
Disable the stale-bot for a while by renaming it’s file.
 2020-06-19 14:24:00 +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
906ab2d790 Parameterize page titles 2020-06-16 14:31:29 +02:00
roschaefer
650b3cef43 Remove "Human Connection" from translations 2020-06-16 14:19:07 +02:00
roschaefer
c2d92880c6 refactor: Move Logo out of styleguide 2020-06-16 13:35:01 +02:00
roschaefer
d78e181dd3 fix image path 2020-06-16 13:31:36 +02:00
roschaefer
1d98f580a1 Install raw-loader node module 2020-06-16 12:11:51 +02:00
roschaefer
a20aebc027 Remove obsolete env var 2020-06-15 15:18:25 +02:00
roschaefer
68c5f0dd85 Fix lint 2020-06-15 15:15:55 +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
77b031083e Make four static pages 
* imprint
* data privacy
* terms of service
* code of conduct
 2020-06-15 14:08:45 +02:00
roschaefer
4a910664eb Parameterize entire html of terms+conditions 2020-06-14 17:57:40 +02:00
Wolfgang Huß
10fe848d14
Merge pull request #3609 from Human-Connection/code-of-conduct-mail 
fix: Corrected Code-of-Conduct Mail Link
 2020-06-10 15:57:32 +02:00
Wolfgang Huß
a4e4575f19 Fix lint 2020-06-10 15:11:40 +02:00
roschaefer
0d5cf7a8cd Replace name Human Connection from locales 2020-06-09 14:25:51 +02:00
roschaefer
d171d783cd Run lint --fix 2020-06-08 21:57:50 +02:00
roschaefer
811027facf Fix image tags 2020-06-08 17:28:25 +02:00
roschaefer
92920fe8da Add CI workflow 2020-06-08 17:17:02 +02:00
roschaefer
3fa0723eac Fix Italian translation 2020-06-08 17:07:13 +02:00
adarsh-av13
2d66348c1b corrected code-of-conduct mail link 2020-06-08 00:32:21 +05:30
Wolfgang Huß
c113fde014
Merge pull request #3583 from Human-Connection/3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 
feat: 🍰 Hero image height on post page is now set without having to wait for…
 2020-06-06 11:52:34 +02:00
Wolfgang Huß
e33a190ffe Fix syntax 
- My conflict resolved on GitHub missed a bracket.
 2020-06-06 10:04:51 +02:00
Wolfgang Huß
cf3f9fa210
Merge branch 'master' into 3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 2020-06-06 09:50:49 +02:00
DriesCruyskens
a245fd2d50
Merge pull request #3589 from Human-Connection/2244-order-tags-in-cloud-alphabetically 
feat: 🍰 Alphabetically sorting tags using compute functions on index and more…
 2020-06-05 22:34:36 +02:00
roschaefer
36679da84d refactor: Avoid html in translation files 
I removed it. We cannot parameterize localizations with absolute urls
properly.
 2020-06-05 18:13:07 +02:00
roschaefer
37b3014ac7 Parameterize manifest 2020-06-05 17:37:16 +02:00
roschaefer
193f977863 fix: Remove broken moreInfoURL 
The links specified in the locales were pointing to the English site and
were mostly broken anyways.
 2020-06-05 17:19:58 +02:00
roschaefer
387ea64faa Parameterize links 2020-06-05 17:15:12 +02:00
roschaefer
4ea0d653c4 Remove inappropriate picture help link 
This link is helpful but points to Human Connection, so unfortunately I
have to remove it.
 2020-06-05 17:00:15 +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
92fba41286 Replace example link 2020-06-05 14:18:08 +02:00
roschaefer
3a216226bc Paramterize all emails 2020-06-05 14:15:42 +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
73c1f3c88b Silly fix of copy+paste error 2020-06-04 21:56:36 +02:00
roschaefer
936018198e Silly copy+paste error 2020-06-04 21:52:08 +02:00
Robert Schäfer
d7d31e0288
Merge pull request #6 from The-Schools-in-Motion-Network/avoid_builds_on_production 
feat: Avoid new builds on base docker-compose.yml
 2020-06-04 19:26:03 +02:00
roschaefer
2c4c9ab8b0 feat: Avoid new builds on base docker-compose.yml 2020-06-04 17:11:04 +02:00
roschaefer
23ae569509 Rename dockerhub organizations 
..plus get rid of obsolete prefix `nitro-`.
 2020-06-04 13:04:05 +02:00