|
|
895ba16ab1
|
Merge branch 'master' into deployment-secrets
|
2023-03-14 20:24:54 +01:00 |
|
Wolfgang Huß
|
e36af318ec
|
Merge pull request #6116 from Ocelot-Social-Community/6016-feature-refactor-notification-page
feat(webapp): refactor notification page
b2.4.0-348
|
2023-03-14 20:21:03 +01:00 |
|
Wolfgang Huß
|
701d1d1dcf
|
Merge branch 'master' into 6016-feature-refactor-notification-page
|
2023-03-14 19:49:33 +01:00 |
|
Wolfgang Huß
|
c4601964df
|
Merge pull request #6130 from Ocelot-Social-Community/3157-fix-post-ribbons-position
fix(webapp): fix ribbons position
b2.4.0-347
|
2023-03-14 19:49:11 +01:00 |
|
Wolfgang Huß
|
fdb451c87a
|
Merge branch 'master' into 3157-fix-post-ribbons-position
|
2023-03-14 19:15:51 +01:00 |
|
Wolfgang Huß
|
5e56b8ba37
|
Merge branch 'master' into 6016-feature-refactor-notification-page
|
2023-03-14 15:25:46 +01:00 |
|
Wolfgang Huß
|
387d70a907
|
Merge pull request #6107 from Ocelot-Social-Community/5982-fix-donation-bar-blink
fix(webapp): fix donation bar blink
b2.4.0-346
|
2023-03-14 15:25:32 +01:00 |
|
Wolfgang Huß
|
3d795558d7
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6016-feature-refactor-notification-page
|
2023-03-14 14:25:23 +01:00 |
|
Wolfgang Huß
|
3f4f65121a
|
Fix linting
|
2023-03-14 14:25:15 +01:00 |
|
Wolfgang Huß
|
b1be6321e0
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-14 14:23:54 +01:00 |
|
Wolfgang Huß
|
678fc2e7d3
|
Merge pull request #6122 from Ocelot-Social-Community/6066-group-query-sort-by-createdAt
feat(webapp): change order of groups to new first
b2.4.0-345
|
2023-03-14 14:17:58 +01:00 |
|
|
|
14b79c9aaa
|
Merge branch 'master' into deployment-secrets
|
2023-03-14 13:05:38 +01:00 |
|
Hannes Heine
|
017140c672
|
Merge branch 'master' into 6066-group-query-sort-by-createdAt
|
2023-03-14 13:01:54 +01:00 |
|
Hannes Heine
|
dad1764a62
|
Merge pull request #6093 from Ocelot-Social-Community/5967-user-profil-show-more-following-user
fix(webapp): error in user profil on the 'show x more' button
b2.4.0-344
|
2023-03-14 13:01:24 +01:00 |
|
Hannes Heine
|
3864c8a8d6
|
Merge branch 'master' into 5967-user-profil-show-more-following-user
|
2023-03-14 12:05:29 +01:00 |
|
|
|
a8cc17db44
|
Merge branch 'master' into deployment-secrets
|
2023-03-14 12:04:58 +01:00 |
|
Markus
|
47d7ed3cad
|
added linting for postteaser
|
2023-03-14 12:03:36 +01:00 |
|
Hannes Heine
|
3e283bf0ce
|
Merge pull request #6109 from Ocelot-Social-Community/feat-filter-buttons
feat(webapp): filter button style change
b2.4.0-343
|
2023-03-14 11:57:19 +01:00 |
|
Markus
|
36c05edf5c
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-14 11:52:55 +01:00 |
|
Hannes Heine
|
d0a71da633
|
Merge branch 'master' into feat-filter-buttons
|
2023-03-14 11:29:44 +01:00 |
|
mahula
|
623e12befe
|
Merge pull request #6125 from Ocelot-Social-Community/5972-devops-eliminate-annotations-for-e2e-tests
refactor(other): deactivate video recording & only upload screenshots, if tests fail for e2e tests
b2.4.0-342
|
2023-03-14 11:26:30 +01:00 |
|
Hannes Heine
|
014e537c51
|
Merge branch 'master' into 5972-devops-eliminate-annotations-for-e2e-tests
|
2023-03-14 10:54:02 +01:00 |
|
Hannes Heine
|
41e1c722ad
|
Merge branch 'master' into feat-filter-buttons
|
2023-03-14 10:52:29 +01:00 |
|
Hannes Heine
|
479232cd87
|
Merge pull request #6112 from Ocelot-Social-Community/5983-change-design-of-topics(categories)-of-post-teaser
fix(webapp): change icon color of active topics (categories) of post teaser
b2.4.0-341
|
2023-03-14 10:51:47 +01:00 |
|
mahula
|
00782a10ab
|
Merge branch 'master' into feat-filter-buttons
|
2023-03-14 10:43:10 +01:00 |
|
Wolfgang Huß
|
bf695ebd5b
|
Merge branch 'master' into 5983-change-design-of-topics(categories)-of-post-teaser
|
2023-03-14 10:05:50 +01:00 |
|
Hannes Heine
|
4041ceb5f8
|
Merge pull request #6059 from Ocelot-Social-Community/add-db-migrate-up-command-to-docu
docs(other): correct **/README.md
b2.4.0-340
|
2023-03-14 10:04:42 +01:00 |
|
Wolfgang Huß
|
b41794aab8
|
Merge branch 'master' into 5983-change-design-of-topics(categories)-of-post-teaser
|
2023-03-14 10:00:28 +01:00 |
|
Hannes Heine
|
2c13c07e46
|
Merge branch 'master' into add-db-migrate-up-command-to-docu
|
2023-03-14 09:32:06 +01:00 |
|
Wolfgang Huß
|
9d16d420af
|
Merge pull request #6110 from Ocelot-Social-Community/5627-fix-responsive-view-on-iphone
fix(webapp): fix `viewport``width=device-width` by removing it
b2.4.0-339
|
2023-03-14 08:32:33 +01:00 |
|
elweyn
|
eb396424ef
|
Merge master.
|
2023-03-14 08:12:24 +01:00 |
|
Wolfgang Huß
|
aa161115e7
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6016-feature-refactor-notification-page
|
2023-03-14 07:56:49 +01:00 |
|
Wolfgang Huß
|
2d0a60da58
|
Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5627-fix-responsive-view-on-iphone
|
2023-03-14 07:39:31 +01:00 |
|
Wolfgang Huß
|
60e4ff28a7
|
Remove comment why 'viewport' has to be changed
|
2023-03-14 07:39:25 +01:00 |
|
|
|
3ee9053623
|
better to encrypt .env
|
2023-03-14 01:39:27 +01:00 |
|
|
|
57d33821c5
|
do not encrypt .env
|
2023-03-14 01:36:55 +01:00 |
|
Markus
|
a5d6bd037b
|
set ribbons position as divider between user teaser and hero image on post teaser component
|
2023-03-13 20:52:13 +01:00 |
|
mahula
|
d5d8597232
|
deactivate video recording in cypress
|
2023-03-13 20:46:59 +01:00 |
|
Markus
|
344be595bf
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-13 20:43:48 +01:00 |
|
Markus
|
1730443e86
|
Merge pull request #6121 from Ocelot-Social-Community/6103-newsfeed-bigger-gap-between-posts
feat(webapp): on newsfeed add bigger y-gap between posts
b2.4.0-338
|
2023-03-13 20:43:09 +01:00 |
|
mahula
|
4b468903a3
|
remove video upload for e2e tests in github test workflow
|
2023-03-13 20:41:08 +01:00 |
|
mahula
|
10995665a1
|
configure screenshot upload to depend on e2e test failure in github test workflow
|
2023-03-13 20:39:22 +01:00 |
|
Markus
|
7b1f4cb7e5
|
Merge branch 'master' into 5982-fix-donation-bar-blink
|
2023-03-13 17:21:01 +01:00 |
|
Markus
|
f42eeb0104
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:37 +01:00 |
|
Markus
|
12861834fb
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:25 +01:00 |
|
Markus
|
736bc2719a
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:17 +01:00 |
|
Markus
|
e1a18527cf
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:56:02 +01:00 |
|
Markus
|
d4149e964d
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:55:43 +01:00 |
|
Markus
|
6727a61329
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:55:31 +01:00 |
|
Markus
|
5d54c1af1f
|
Update webapp/components/NotificationsTable/NotificationsTable.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2023-03-13 16:54:37 +01:00 |
|
