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
13,286 Commits 117 Branches 1,511 Tags
Commit Graph

5032 Commits

Author SHA1 Message Date
elweyn
ef7bb652bc Fix linting. 
Co-authored-by: maeckes-infinitylabs <markus@infinity.labs.ooo>
 2023-05-31 20:44:44 +02:00
elweyn
e18fa0cea0 Fix test of post edit. 
Co-authored-by: maeckes-infinitylabs<markus@infinity.labs.ooo>
 2023-05-31 12:32:48 +02:00
elweyn
1ca274fad4 Add creatEvent to the update post so the form has event specific fields. 
Co-authored-by: elweyn<heine.hannes@gmail.com>
Co-authored-by: maeckes-infinitylabs<markus@infinitylabs.ooo>
 2023-05-31 11:01:28 +02:00
Ulf Gebhardt
04ab8148f9
lint fixes 2023-05-25 12:41:04 +02:00
Ulf Gebhardt
73417079ed
fix eslint ignore 2023-05-25 12:40:32 +02:00
Ulf Gebhardt
3f1e42e6fd
externalize styles 2023-05-25 12:15:03 +02:00
Ulf Gebhardt
2bd8a7ef04
make time selection to be always valid 2023-05-25 11:56:10 +02:00
Ulf Gebhardt
572272b581
typo 2023-05-25 11:26:31 +02:00
Ulf Gebhardt
e6e972e50e
removed compiled css files 2023-05-25 11:22:56 +02:00
Ulf Gebhardt
13c7f080f0
removed compiled css files 2023-05-25 11:19:08 +02:00
Wolfgang Huß
2ba2da75a3 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master 2023-05-25 09:39:03 +02:00
Markus
87b41769f1 Merge branch 'master' into newsfeed-layout-fixes 2023-05-24 10:17:00 +02:00
Markus
12a4ab6b83 merged master and resolved conflict in webapp/pages/index.vue 2023-05-24 10:16:07 +02:00
Markus
acf68796e6 Merge branch 'master' into 6142-comment-mention-missing-white-space 2023-05-24 09:32:55 +02:00
Moriz Wahl
a701f37064 Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master 2023-05-23 11:43:45 +02:00
Hannes Heine
5c13af43d9
Merge branch 'master' into event-master 2023-05-23 11:42:09 +02:00
Moriz Wahl
9086986053 fix filter menu tests 2023-05-23 11:41:09 +02:00
Moriz Wahl
60b05379d9 post page test fixed 2023-05-23 11:29:18 +02:00
Moriz Wahl
e3eaaf4435 fix tests for contribution form 2023-05-23 11:04:01 +02:00
dependabot[bot]
c754b766f8
Bump node from 20.1.0-alpine3.17 to 20.2.0-alpine3.17 in /webapp 
Bumps node from 20.1.0-alpine3.17 to 20.2.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-05-23 08:49:33 +00:00
Moriz Wahl
59e7f8c0d2 fix post teaser unit tests and linting 2023-05-22 17:12:32 +02:00
Markus
dfd84f921c [fix] adds white space after mention in comment editor 2023-05-19 15:15:41 +02:00
elweyn
5544f453a6 Backend removed eventLocation, frontend fixes 2023-05-17 22:12:08 +02:00
Markus
df86812fc0 added missing eventLocationName to _EventInputs 2023-05-17 16:17:02 +02:00
Markus
7c37d9f9ef added conditional check for event time, code syntaxes 2023-05-17 15:32:49 +02:00
Alexander Friedland
cacf08afee
Merge branch 'master' into event-master 2023-05-17 11:05:37 +02:00
ogerly
6b6eeab655 fix lint 2023-05-17 11:03:10 +02:00
ogerly
ff559e71db merge #6045 #6267, resolve conflicts, fix save image 2023-05-17 11:01:49 +02:00
ogerly
b4275f44cb Merge branch '6045-add-event-info-to-post' into event-master 2023-05-17 10:11:39 +02:00
dependabot[bot]
fb2c924083
Bump node from 19.9.0-alpine3.17 to 20.1.0-alpine3.17 in /webapp 
Bumps node from 19.9.0-alpine3.17 to 20.1.0-alpine3.17.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 14:07:15 +00:00
Markus
998b71aa22 Merge branch 'newsfeed-layout-fixes' of github.com:Ocelot-Social-Community/Ocelot-Social into newsfeed-layout-fixes 2023-05-15 14:53:09 +02:00
Markus
95710fd587 [fix] added custom css to newsfeed layout if less than 3 posts are visible 2023-05-15 14:51:23 +02:00
elweyn
a403ffd23c Merge branch '6266-Event-create-design-optimization' into 6267-eventteaser-design-optimization 2023-05-13 11:51:03 +02:00
elweyn
affd2e5dd8 Merge branch 'event-master' into 6266-Event-create-design-optimization 2023-05-13 11:50:34 +02:00
Hannes Heine
7894a5f3f3
Merge branch 'master' into 6141-fix-z-layer-of-header-elements 2023-05-12 15:10:19 +02:00
Hannes Heine
24ccdab47f
Merge branch 'master' into newsfeed-layout-fixes 2023-05-12 14:17:27 +02:00
Markus
0c2c199e74 added linting 2023-05-10 15:26:33 +02:00
Markus
092feb5ee7 [webapp] added event info to post page 2023-05-10 15:20:01 +02:00
Markus
f2256c8146 [webapp] added event infos to postteaser component 2023-05-10 14:12:07 +02:00
Markus
03a07f3c13 [webapp] added more event info to the postquery for event teaser 2023-05-10 13:56:29 +02:00
Ulf Gebhardt
d7a11e2864
Merge branch 'master' into fix-avatar-group-settings 2023-05-08 13:11:18 +02:00
Ulf Gebhardt
f4efe245a7
properly render avatars in group settings 2023-05-08 13:06:18 +02:00
Markus
02566a6e93 fixed hardcoded z-index of overlay, filter and add-btn 2023-05-02 15:49:26 +02:00
Markus
013ec20e75 Merge branch 'master' into newsfeed-layout-fixes 2023-04-27 13:48:20 +02:00
Markus
f828497c96 updated of mobile media querys for top gap of newsfeed 2023-04-27 13:43:04 +02:00
Ulf Gebhardt
5fbdab6888
v2.6.0 2023-04-27 12:33:55 +02:00
Alexander Friedland
2426f5db88
Merge branch 'master' into 6266-Event-create-design-optimization 2023-04-27 08:41:41 +02:00
ogerly
5b256ed3e4 fix lint 2023-04-26 13:44:31 +02:00
ogerly
909a8f29fd refactor style 2023-04-26 13:43:14 +02:00
ogerly
7d3d25fc7c datepicker hide dates before today 2023-04-26 11:53:46 +02:00