Hannes Heine
|
3cd55051f7
|
Merge branch 'master' into 6339-bug-webapp-event-update-page
|
2023-06-05 21:20:34 +02:00 |
|
|
|
13f17f8cee
|
Merge pull request #6364 from Ocelot-Social-Community/build-copy-files-script
refactor(backend): copy files in external script
|
2023-06-05 21:16:11 +02:00 |
|
|
|
4e13454a85
|
Merge branch 'master' into build-copy-files-script
|
2023-06-05 20:29:44 +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
|
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.
|
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
|
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 |
|
|
|
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
|
2023-06-05 10:42:13 +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 |
|
|
|
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
|
2023-06-05 10:04:26 +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 |
|
|
|
01343a6544
|
fixed yarn lock
|
2023-06-03 03:50:02 +02:00 |
|
|
|
8dbdcb4d19
|
we need to use sh instead of bash
|
2023-06-03 03:45:35 +02:00 |
|
|
|
9b93b65f71
|
Merge branch 'master' into build-copy-files-script
|
2023-06-03 03:30:52 +02:00 |
|
|
|
b3f6d58471
|
remove scripts folder from docker ignore list, convert script back to bash
|
2023-06-03 03:29:47 +02:00 |
|
Moriz Wahl
|
ff41c04cf9
|
test RESET_POST_TYPE
|
2023-06-02 19:08:45 +02:00 |
|
Moriz Wahl
|
72ef3fe6f2
|
clone filter for toggle events ended
|
2023-06-02 18:52:49 +02:00 |
|
Moriz Wahl
|
d3a694e6e7
|
watch posts filters, to ensure that hasMore is reset to true
|
2023-06-02 18:45:02 +02:00 |
|
Moriz Wahl
|
5389b607db
|
even closer to master
|
2023-06-02 18:27:23 +02:00 |
|
Moriz Wahl
|
fdf4eb6bdc
|
get closer to master
|
2023-06-02 18:25:13 +02:00 |
|
Moriz Wahl
|
0b4e309611
|
Merge branch 'master' into alternate-solution-filter-order-post-types
|
2023-06-02 18:13:58 +02:00 |
|
Moriz Wahl
|
5ad7dac1fe
|
use filterdPostTypes getter
|
2023-06-02 18:11:18 +02:00 |
|
Moriz Wahl
|
f252c76670
|
recover filteredPostTypes getter
|
2023-06-02 18:05:37 +02:00 |
|
Moriz Wahl
|
2ae6c350e1
|
get things working
|
2023-06-02 17:46:00 +02:00 |
|
Moriz Wahl
|
73f62212f8
|
refactor components for store changes
|
2023-06-02 16:55:52 +02:00 |
|
Moriz Wahl
|
ba80f14d8c
|
refactor store and store tests
|
2023-06-02 16:55:01 +02:00 |
|
|
|
8c969c88bd
|
Merge pull request #6366 from Ocelot-Social-Community/fix-typescript-2
fix(other): typescript fix regarding dist/build folder 2
|
2023-06-02 16:22:41 +02:00 |
|
Hannes Heine
|
166941f860
|
Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-optimisation
|
2023-06-02 15:47:14 +02:00 |
|
|
|
57840fcc69
|
Merge branch 'master' into fix-typescript-2
|
2023-06-02 15:38:19 +02:00 |
|
|
|
b6b1a62ffb
|
fix reference to dist folder when its build now
|
2023-06-02 15:34:35 +02:00 |
|
|
|
cea248bdd9
|
Merge pull request #6365 from Ocelot-Social-Community/typescript-fix-build
fix(backend): corrected path in branded images for backend build folder(former dist)
|
2023-06-02 13:57:20 +02:00 |
|
|
|
1b484b1e3e
|
corrected path in braded images for backend build folder(former dist)
|
2023-06-02 12:40:02 +02:00 |
|
|
|
6aaa51e388
|
use sh instead of bash
|
2023-06-02 12:32:20 +02:00 |
|
|
|
987e204ff9
|
remove all script functionality
|
2023-06-02 12:24:18 +02:00 |
|
|
|
f4f016265a
|
capsulate in /bin/sh
|
2023-06-02 12:18:08 +02:00 |
|
|
|
0954951e26
|
removed ./
|
2023-06-02 12:11:42 +02:00 |
|
Wolfgang Huß
|
e004afc9c5
|
Merge pull request #6331 from Ocelot-Social-Community/6330-node-version-upgrade-in-nvmrc-files-to-v20.2.0
chore(other): upgrade node version in '.nvmrc' files to v20.2.0
|
2023-06-02 11:50:40 +02:00 |
|
|
|
031c9c370b
|
copy files in external script
|
2023-06-02 11:08:08 +02:00 |
|
