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

5716 Commits

Author SHA1 Message Date
mahula
43ed698036 add missing option to action radius select 2023-04-25 17:31:34 +02:00
mahula
60f18c1167 remove comments 2023-04-25 17:26:36 +02:00
ogerly
bc008ddb86 teaser event green 2023-04-25 16:18:40 +02:00
ogerly
bd8ea66922 resolve conflict 2023-04-25 15:28:43 +02:00
ogerly
5387c16fd5 ribbonText 2023-04-25 15:23:02 +02:00
mahula
7732e2a890
Merge branch 'master' into 5441-wrench-refactor-groupform-select-make-a-component 2023-04-25 15:20:07 +02:00
mahula
28e92c25b7 add unit tests to action radius select 2023-04-25 15:19:00 +02:00
mahula
4e76f0c712 linting 2023-04-25 15:18:07 +02:00
Ulf Gebhardt
e1fe57c741
Merge branch 'master' into fix-avatars-in-group-member-list 2023-04-25 15:17:16 +02:00
Moriz Wahl
65ad2a72ad postType not in fragment 2023-04-25 15:09:36 +02:00
Moriz Wahl
97632a08fd Merge branch 'event-master' into 6044-Add-create-New-Event 2023-04-25 14:36:34 +02:00
Moriz Wahl
06929e7053 rebase on event master 2023-04-25 14:32:50 +02:00
ogerly
032b65fb92 teasr 2 2023-04-25 14:24:31 +02:00
mahula
6298194db3 fix updating of group type and action radius changes to the form 2023-04-25 14:11:00 +02:00
ogerly
affc392b10 teasr 2023-04-25 14:05:17 +02:00
Moriz Wahl
1a4398eaf9 remove comments 2023-04-25 13:32:42 +02:00
Moriz Wahl
8df7d5d265 get it working 2023-04-25 13:27:25 +02:00
Ulf Gebhardt
282d701e90
show avatar for group members 2023-04-25 12:44:47 +02:00
ogerly
8dfb22e7a5 merge event-master 2023-04-25 12:35:54 +02:00
Moriz Wahl
3244f3f86d feat(webapp): group categories on posts 2023-04-25 12:35:46 +02:00
Ulf Gebhardt
bbe77c7ddd
Merge branch 'master' into fix-search-3-chars 2023-04-25 12:02:43 +02:00
mahula
a780f43d82 use object notation for props 2023-04-25 11:07:00 +02:00
ogerly
e012dbd4c4 Merge branch 'master' into 6044-Add-create-New-Event 2023-04-25 09:26:44 +02:00
ogerly
76eb8757cb merge event master + changes 2023-04-25 09:17:03 +02:00
Ulf Gebhardt
c88cbdc9d8
last lint 2023-04-25 04:41:43 +02:00
Ulf Gebhardt
23588c02ec
more lint fixes 2023-04-25 04:24:34 +02:00
Ulf Gebhardt
e228b42cc4
lint 2023-04-25 04:16:19 +02:00
Ulf Gebhardt
efff3625a9
properly diferentiate between clearbale search and text hints 2023-04-25 04:07:26 +02:00
Ulf Gebhardt
536ef92132
more simplifications 2023-04-25 03:44:51 +02:00
Ulf Gebhardt
4a5c56203b
simplified searchableInput further - fixed on Enter 2023-04-25 02:44:46 +02:00
Ulf Gebhardt
c7fbe9beef
removed test for onDelete event 2023-04-25 02:36:01 +02:00
Ulf Gebhardt
33d5758686
removed comments 2023-04-25 02:35:43 +02:00
Ulf Gebhardt
6025706b4b
fix searchableInput field component to properly retrigger search on delete, clear properly etc 2023-04-25 02:19:50 +02:00
ogerly
ed6717a907 locales fix 2023-04-24 15:08:09 +02:00
ogerly
e172fe917a fix lint 2023-04-24 14:20:36 +02:00
ogerly
1ba79343fe save event 2023-04-24 12:40:52 +02:00
Hannes Heine
3594e8387f
Merge branch 'master' into group-posts-cannot-be-pinned 2023-04-24 09:41:43 +02:00
mahula
94656a901b linting 2023-04-21 12:34:41 +02:00
mahula
35bd3d2a61 use action radius select in group form 2023-04-21 12:11:06 +02:00
mahula
c951a900ad add action radius select component 2023-04-21 12:03:34 +02:00
Moriz Wahl
b672b62e0d no pin post button for posts in group 2023-04-20 14:33:51 +02:00
ogerly
1578ef9c44 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social 2023-04-20 13:56:17 +02:00
ogerly
dbf89fadfc pre add-further-event-params 2023-04-20 13:55:52 +02:00
mahula
cac4d0a6fe
Merge branch 'master' into 6138-refactor-fix-workflows 2023-04-18 09:16:29 +02:00
dependabot[bot]
7cbe8feab9
Bump node from 19.8.1-alpine3.17 to 19.9.0-alpine3.17 in /webapp 
Bumps node from 19.8.1-alpine3.17 to 19.9.0-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-15 01:56:57 +00:00
dependabot[bot]
eb29000073
Bump @babel/core from 7.12.17 to 7.21.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.17 to 7.21.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.21.4/packages/babel-core)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-08 02:00:55 +00:00
dependabot[bot]
3040002643
Bump jsonwebtoken from 8.5.1 to 9.0.0 in /webapp 
Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.5.1 to 9.0.0.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.1...v9.0.0)

---
updated-dependencies:
- dependency-name: jsonwebtoken
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-07 10:25:50 +00:00
dependabot[bot]
1d2a2abb9f
Bump jest from 29.4.2 to 29.5.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 29.4.2 to 29.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/jest)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-06 18:42:49 +00:00
dependabot[bot]
4156babe4b
Bump babel-jest from 29.4.2 to 29.5.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 29.4.2 to 29.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/babel-jest)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-06 15:53:46 +00:00
dependabot[bot]
a8da88acd2
Bump node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17 in /webapp 
Bumps node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-06 10:24:41 +00:00