IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,960 Commits 5 Branches 2 Tags
Commit Graph

13960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
2a44b18aa6 Fix icon and set texts on chat button on user profile 2023-07-12 16:11:58 +02:00
Wolfgang Huß
0eaa4059b3 Fix icon and dummy count for chat notification button in header menu 2023-07-12 16:07:33 +02:00
Wolfgang Huß
181207a90b Move chat notification button in header to position between language and system notification 
- Add this button to mobile as well.
 2023-07-12 14:28:04 +02:00
mahula
eeaa166f73
Merge pull request #6527 from Ocelot-Social-Community/disable-cypress-retries 
refactor(other): disable cypress test retries
 2023-07-11 17:26:27 +02:00
mahula
7add9f4a4f
Merge branch 'master' into disable-cypress-retries 2023-07-11 16:56:40 +02:00
mahula
4a0427e02b
Merge pull request #6525 from Ocelot-Social-Community/6501-featurefrontend-event-creation-page 
feat(webapp): event creation page -better placeholder texts for venue and city inputs
 2023-07-11 16:56:21 +02:00
mahula
e2da08c0ff
Merge branch 'master' into 6501-featurefrontend-event-creation-page 2023-07-11 15:59:33 +02:00
mahula
0154f7bcd5
Merge pull request #6526 from Ocelot-Social-Community/refactor-webapp-workflow 
refactor(other): refine webapp github workflow conditions
 2023-07-11 15:58:57 +02:00
mahula
8d962c738a
Merge branch 'master' into refactor-webapp-workflow 2023-07-11 15:34:45 +02:00
Wolfgang Huß
a97d65da3c
Merge pull request #6532 from Ocelot-Social-Community/docu-deployment-js-files 
docs(other): update TODO-next-update.md for 2.7.0-470
 2023-07-11 14:59:31 +02:00
Ulf Gebhardt
453ffa4f2b
Merge branch 'master' into docu-deployment-js-files 2023-07-11 13:29:48 +02:00
Ulf Gebhardt
ab5b7a0b8a
Merge pull request #6530 from Ocelot-Social-Community/fix-backend-room-with-self 
fix(backend): chat - do not allow to create room with self
 2023-07-11 13:29:35 +02:00
Ulf Gebhardt
40dea17360
update TODO-next-update.md for 2.7.0-470 2023-07-11 13:05:01 +02:00
Ulf Gebhardt
a4bb523cb4
unit test for error when creating room with self 2023-07-11 12:57:37 +02:00
Ulf Gebhardt
dd4e6bf2dc
fix open chat functionality after relog co-authored-by: Ogerly <https://github.com/ogerly> 2023-07-11 12:13:46 +02:00
Ulf Gebhardt
073adbe48c
do not allow to create room with self 2023-07-11 11:19:01 +02:00
Ulf Gebhardt
1ee2dc70bb
Merge pull request #6524 from Ocelot-Social-Community/frontend-messages 
feat(webapp): chat message capability
 2023-07-10 20:56:59 +02:00
Ulf Gebhardt
3134c7311c
Merge branch 'master' into frontend-messages 2023-07-10 19:44:27 +02:00
mahula
31da4c597b fix webapp github workflow conditions 2023-07-10 19:14:20 +02:00
mahula
728fd79579 set cypress test retries to 0 2023-07-10 18:42:06 +02:00
mahula
753e60fef1
Merge branch 'master' into refactor-webapp-workflow 2023-07-10 18:22:21 +02:00
mahula
5afd0f6bb4
Merge pull request #6368 from Ocelot-Social-Community/dependabot/npm_and_yarn/faker-js/faker-8.0.2 
chore(backend): bump @faker-js/faker from 5.1.0 to 8.0.2
 2023-07-10 18:20:17 +02:00
mahula
54711d3676
Merge branch 'master' into dependabot/npm_and_yarn/faker-js/faker-8.0.2 2023-07-10 17:12:32 +02:00
Ulf Gebhardt
cb8db68b5b
user mapgetters instead of addressing the store directly 2023-07-10 17:11:14 +02:00
mahula
3d32f39088 fix webapp github workflow conditions 2023-07-10 17:07:47 +02:00
Ulf Gebhardt
0888be0f70
Merge branch 'master' into frontend-messages 2023-07-10 17:04:22 +02:00
mahula
5379d615bb
Merge pull request #6509 from Ocelot-Social-Community/dependabot/npm_and_yarn/cypress-12.17.0 
chore(other): bump cypress from 12.14.0 to 12.17.0
 2023-07-10 16:58:21 +02:00
Ulf Gebhardt
0ad59d9412
lint fix 2023-07-10 16:27:36 +02:00
mahula
97d883b845 set new placeholder texts for venue and city inputs 2023-07-10 16:25:53 +02:00
Ulf Gebhardt
aecc24e374
chat message capability 2023-07-10 16:21:39 +02:00
mahula
0d6a7daba4
Merge branch 'master' into dependabot/npm_and_yarn/cypress-12.17.0 2023-07-10 16:15:50 +02:00
Ulf Gebhardt
a965cef459
Merge pull request #6519 from Ocelot-Social-Community/frontend-rooms 
feat(webapp): chat rooms
 2023-07-10 15:26:22 +02:00
Ulf Gebhardt
88e2091804
fix comments 2023-07-10 13:37:42 +02:00
mahula
98076064d5 fix typo in webapp locale 2023-07-10 12:38:49 +02:00
Ulf Gebhardt
8859aa56a4
lint fixes 2023-07-10 12:00:11 +02:00
Ulf Gebhardt
5f2cfdeab4
backend room hacks 2023-07-10 11:53:20 +02:00
Ulf Gebhardt
c2c96ee96c
frontend rooms query, singleRoom gets an userid now, not a boolean 2023-07-10 11:53:00 +02:00
Ulf Gebhardt
abdcdba355
Merge pull request #6516 from Ocelot-Social-Community/fix-branded-build3 
fix(other): fix branded build - rename files to js for the webapp
 2023-07-09 12:17:43 +02:00
Ulf Gebhardt
2caeededef
Merge branch 'master' into fix-branded-build3 2023-07-09 10:53:42 +02:00
Ulf Gebhardt
b90576689f
update stage.ocelot.social reference 2023-07-09 10:43:12 +02:00
Ulf Gebhardt
22b5e8f6f8
rename ts files to js for webapp 2023-07-09 10:41:40 +02:00
dependabot[bot]
f0d4c7ac22
Bump cypress from 12.14.0 to 12.17.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 12.14.0 to 12.17.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v12.14.0...v12.17.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-08 01:16:57 +00:00
Ulf Gebhardt
77132adc62
Merge pull request #6508 from Ocelot-Social-Community/fix-branded-build2 
fix(backend): fix branded build (migration)
 2023-07-08 00:19:35 +02:00
Hannes Heine
0d7cd5b4e1
Merge branch 'master' into fix-branded-build2 2023-07-07 23:11:41 +02:00
Ulf Gebhardt
3a229672d2
update stage.ocelot.social reference 2023-07-07 23:09:19 +02:00
Ulf Gebhardt
4de840f2ea
fix build paths 2023-07-07 23:09:02 +02:00
Hannes Heine
1f548487cd
Merge pull request #6507 from Ocelot-Social-Community/fix-branded-build 
fix(backend): fix branded build
 2023-07-07 21:30:42 +02:00
Ulf Gebhardt
4fb884c9eb
fix copy script 2023-07-07 11:56:28 +02:00
Ulf Gebhardt
597a6f9015
start node in build/src 2023-07-07 11:56:00 +02:00
Ulf Gebhardt
e058d4009a
fix docker file 2023-07-07 11:55:42 +02:00