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

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahula
fafca69dbb update neode package 2023-06-06 08:57:19 +02:00
mahula
29c90b8202 Revert "update neode package version globally" 
This reverts commit 6797c03a337f0cd7068275ebd5cf30cac43e9799.
 2023-06-05 23:07:33 +02:00
mahula
6797c03a33 update neode package version globally 2023-06-05 22:41:16 +02:00
mahula
adf88d3926
Merge branch 'master' into cypress-migrate-to-v10 2023-06-05 22:07:31 +02:00
Hannes Heine
3cd55051f7
Merge branch 'master' into 6339-bug-webapp-event-update-page 2023-06-05 21:20:34 +02:00
Ulf Gebhardt
13f17f8cee
Merge pull request #6364 from Ocelot-Social-Community/build-copy-files-script 
refactor(backend): copy files in external script
b2.6.0-434 		2023-06-05 21:16:11 +02:00
Ulf Gebhardt
514a5c4894
fix warning in edit post test 2023-06-05 20:53:03 +02:00
Ulf Gebhardt
f894cca63d
fix test warning 2023-06-05 20:46:43 +02:00
Ulf Gebhardt
4e13454a85
Merge branch 'master' into build-copy-files-script 2023-06-05 20:29:44 +02:00
mahula
040295184a
update cypress/support/step_definitions/Moderation.ReportContent/somebody_reported_the_following_posts.js 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-06-05 20:29:19 +02:00
Moriz Wahl
befc37f304
Merge pull request #6367 from Ocelot-Social-Community/alternate-solution-filter-order-post-types 
feat(webapp): alternative solution for filter and order posts
b2.6.0-433 		2023-06-05 20:23:45 +02:00
elweyn
1c344c4dfd Fix sorting in locales. 2023-06-05 19:24:24 +02:00
elweyn
a24e2186be Fix linting 2023-06-05 17:55:45 +02:00
elweyn
734891e93d Fix localization of edit events 
Co-authored-by: ogerly <fridolin@tutanota.com>
 2023-06-05 17:54:37 +02:00
Moriz Wahl
abc2cc2241
Merge branch 'master' into alternate-solution-filter-order-post-types 2023-06-05 17:53:00 +02:00
elweyn
b8b49e283b Move formSchema to computed & fix eventIsOnline 
Co-authored-by: ogerly <fridolin@tutanota.com>
 2023-06-05 17:44:47 +02:00
elweyn
46d8244b57 Change update post mutation to new schema. 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: maeckes <markus@infinity.labs.ooo>
 2023-06-05 15:37:42 +02:00
Hannes Heine
684b151a24
Merge pull request #6362 from Ocelot-Social-Community/6340-refactor-webapp-event-teaser-ribbon-optimisation 
refactor(webapp): changed color for event-ribbon.
b2.6.0-432 		2023-06-05 14:37:36 +02:00
mahula
8a10c95d62
Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-optimisation 2023-06-05 14:07:08 +02:00
elweyn
277e53ded5 Change ribbon text from 'post' to 'article' 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: entermex <max@infinity.labs.ooo>
 2023-06-05 13:03:46 +02:00
elweyn
93a679c17a Add background color definitions 
Add background ribbon colors

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: entermex <max@infinity.labs.ooo>
 2023-06-05 12:57:15 +02:00
Moriz Wahl
87fcaad490
Merge pull request #6359 from Ocelot-Social-Community/fix-webapp-unit-tests 
fix(webapp): warnings in unit tests
b2.6.0-431 		2023-06-05 12:45:51 +02:00
elweyn
1626b06948 Revert "refactor(webapp): changed locaalized text for article ribbon." 
This reverts commit 75f18e60d3d358b1586cac1ed021344d7c490ba5.
 2023-06-05 12:33:48 +02:00
Wolfgang Huß
71d964ae93
Merge branch 'master' into 6339-bug-webapp-event-update-page 2023-06-05 11:32:03 +02:00
Moriz Wahl
ddd60667a2
Merge branch 'master' into fix-webapp-unit-tests 2023-06-05 11:16:36 +02:00
Hannes Heine
0533fc687e
Merge branch 'master' into alternate-solution-filter-order-post-types 2023-06-05 10:45:38 +02:00
Ulf Gebhardt
90a3ad0c6a
Merge pull request #6372 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-title-5.34.7 
Bump metascraper-title from 5.33.5 to 5.34.7 in /backend
b2.6.0-430 		2023-06-05 10:42:13 +02:00
Ulf Gebhardt
c435fb7246
renable full e2e scenario 2023-06-05 10:38:18 +02:00
Ulf Gebhardt
d1d4317265
increase timeout 2023-06-05 10:36:51 +02:00
Ulf Gebhardt
94efe01a56
revereted change to workflow.yml 2023-06-05 10:34:51 +02:00
Ulf Gebhardt
4b2bbe23b3
tripple timeout 2023-06-05 10:31:48 +02:00
Ulf Gebhardt
0812d9d992
properly include author of post aswell 2023-06-05 10:13:22 +02:00
dependabot[bot]
9c5fecb7b8
Bump metascraper-title from 5.33.5 to 5.34.7 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.33.5 to 5.34.7.
- [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.33.5...v5.34.7)

---
updated-dependencies:
- dependency-name: metascraper-title
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-05 08:08:21 +00:00
Ulf Gebhardt
5f2d771921
Merge pull request #6369 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/preset-env-7.22.4 
Bump @babel/preset-env from 7.21.5 to 7.22.4
b2.6.0-429 		2023-06-05 10:04:26 +02:00
mahula
8a8bfdfeac Revert "update cypress related packageges in package.json" 
This reverts commit 59b61ef91851a6d2e75ff45f19eca262b2c47e2c.
 2023-06-03 13:07:13 +02:00
mahula
a0c525b661 set back cypress-file-upload package version 2023-06-03 10:59:12 +02:00
mahula
7815194118
Merge branch 'master' into cypress-migrate-to-v10 2023-06-03 09:58:10 +02:00
mahula
59b61ef918 update cypress related packageges in package.json 2023-06-03 09:55:06 +02:00
mahula
ad1ee56064 fix reporting e2e tests 2023-06-03 07:14:59 +02:00
mahula
c218a550d2 linting 2023-06-03 06:05:16 +02:00
mahula
20ad70362a fix social media test step 2023-06-03 06:00:53 +02:00
mahula
304d6bfb72 add cypresscondition to models index 2023-06-03 05:55:32 +02:00
dependabot[bot]
0102d347bd
Bump @babel/preset-env from 7.21.5 to 7.22.4 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.21.5 to 7.22.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-03 01:57:23 +00:00
Ulf Gebhardt
01343a6544
fixed yarn lock 2023-06-03 03:50:02 +02:00
Ulf Gebhardt
b0121990ba
try using optionalAuthors 2023-06-03 03:48:41 +02:00
Ulf Gebhardt
8dbdcb4d19
we need to use sh instead of bash 2023-06-03 03:45:35 +02:00
Ulf Gebhardt
9b93b65f71
Merge branch 'master' into build-copy-files-script 2023-06-03 03:30:52 +02:00
Ulf Gebhardt
b3f6d58471
remove scripts folder from docker ignore list, convert script back to bash 2023-06-03 03:29:47 +02:00
Ulf Gebhardt
faffe08702
Merge branch 'master' into seed-posts-as-articles 2023-06-03 03:02:11 +02:00
Ulf Gebhardt
832763022d
also include author 2023-06-03 03:02:22 +02:00