Moriz Wahl
|
abc2cc2241
|
Merge branch 'master' into alternate-solution-filter-order-post-types
|
2023-06-05 17:53:00 +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 |
|
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 |
|
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 |
|
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 |
|
Wolfgang Huß
|
779a23588a
|
Merge branch 'master' into 6330-node-version-upgrade-in-nvmrc-files-to-v20.2.0
|
2023-06-02 11:05:54 +02:00 |
|
Wolfgang Huß
|
52798c1174
|
Refactor 'TOGGLE_EVENTS_ENDED' and 'eventsEnded' in store to contain the event start date
|
2023-06-02 11:04:28 +02:00 |
|
|
|
1b92bb60b3
|
Merge pull request #6321 from Ocelot-Social-Community/typescript
feat(backend): typescript
|
2023-06-02 10:52:10 +02:00 |
|
|
|
d2a44c8753
|
Merge branch 'master' into typescript
|
2023-06-02 10:16:01 +02:00 |
|
Wolfgang Huß
|
4f078e4b24
|
Fix webapp tests
|
2023-06-02 10:08:55 +02:00 |
|
entermex
|
9c98f87e69
|
refactor(webapp): changed color a bit litter for event-ribbons
|
2023-06-02 09:49:45 +02:00 |
|
Wolfgang Huß
|
51e1b496d4
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6190-extend-newsfeed-filter-menu-for-events
|
2023-06-02 09:27:28 +02:00 |
|
entermex
|
75f18e60d3
|
refactor(webapp): changed locaalized text for article ribbon.
|
2023-06-02 00:17:29 +02:00 |
|
entermex
|
a08d4f48ae
|
refactor(webapp): changed color for event-ribbon.
Co-authored-by: Elweyn <heine.hannes@gmail.com>
|
2023-06-01 23:42:09 +02:00 |
|
entermex
|
a4f84b0a4c
|
Merge pull request #6319 from Ocelot-Social-Community/6307-group-list-number-to-six
fix(webapp): fix group list number to six
|
2023-06-01 23:29:06 +02:00 |
|
entermex
|
9176cbfe80
|
Merge branch 'master' into 6307-group-list-number-to-six
|
2023-06-01 22:50:46 +02:00 |
|
entermex
|
691226e3f3
|
Merge pull request #6335 from Ocelot-Social-Community/6290-fix-notification-menu-comment-hash
fix(webapp): fix notification menu comment hash
|
2023-06-01 22:50:13 +02:00 |
|
entermex
|
e11b4eb28e
|
Merge branch 'master' into 6290-fix-notification-menu-comment-hash
|
2023-06-01 22:19:44 +02:00 |
|
Wolfgang Huß
|
5863eed59a
|
Delete file 'filterMenuMixin.js' and move all from there to the files where it's used
|
2023-06-01 20:42:51 +02:00 |
|
Wolfgang Huß
|
419ec5384f
|
Move 'eventsEnded' and 'toggleEventsEnded' from file 'filterMenuMixin.js' to the files where it's used
|
2023-06-01 19:44:13 +02:00 |
|
Wolfgang Huß
|
c1d9766f39
|
Replace 'setOrder' by 'toggleOrder'
|
2023-06-01 19:31:21 +02:00 |
|
Wolfgang Huß
|
edfb667bcf
|
Replace 'setEventsEnded' by 'toggleEventsEnded'
|
2023-06-01 19:29:58 +02:00 |
|
Wolfgang Huß
|
7687d6f28c
|
Move 'setUnsetPostTypeFilter' to the store
|
2023-06-01 19:27:13 +02:00 |
|
Wolfgang Huß
|
52839f4b22
|
Move 'unsetAllPostTypeFilters' to the store
|
2023-06-01 19:07:07 +02:00 |
|
