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
11,201 Commits 5 Branches 2 Tags
Commit Graph

4080 Commits

Author SHA1 Message Date
Wolfgang Huß
d8d080dae5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into categories-filter-menu 2022-08-25 17:39:38 +02:00
Moriz Wahl
407f4f8d2d fix test (mock .CATEGORIES_ACTIVE) 2022-08-25 13:29:08 +02:00
Wolfgang Huß
d112538e63
Merge pull request #5174 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 
Bump vue-sweetalert-icons from 4.3.0 to 4.3.1 in /webapp
 2022-08-25 13:29:02 +02:00
Wolfgang Huß
ab3ab3b07d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 2022-08-25 11:57:35 +02:00
Tima Gixe
15ce070288 Update tests to expect Not Authorized! 2022-08-25 09:08:14 +03:00
Moriz Wahl
ad4497786c add missing items for categories 2022-08-22 20:29:04 +02:00
Moriz Wahl
25c8fe275f add locales for yunite categories 2022-08-22 20:11:21 +02:00
Moriz Wahl
eddaa96d36 add movement icon 2022-08-22 18:52:42 +02:00
Moriz Wahl
a22023174d feat: Show Categories Filter when Categories are Active 2022-08-22 18:33:12 +02:00
dependabot[bot]
73559242d6
Bump cross-env from 7.0.2 to 7.0.3 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v7.0.2...v7.0.3)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-16 06:44:19 +00:00
dependabot[bot]
d2f6590e05
Bump vue-sweetalert-icons from 4.3.0 to 4.3.1 in /webapp 
Bumps [vue-sweetalert-icons](https://github.com/JorgenVatle/vue-sweetalert-icons) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/JorgenVatle/vue-sweetalert-icons/releases)
- [Commits](https://github.com/JorgenVatle/vue-sweetalert-icons/compare/v4.3.0...v4.3.1)

---
updated-dependencies:
- dependency-name: vue-sweetalert-icons
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-11 04:25:39 +00:00
Wolfgang Huß
f6bfc8aa7f
Merge pull request #5143 from Ocelot-Social-Community/5142-rename-UserGroup-to-UserRole 
refactor: 🍰 Rename `UserGroup` To `UserRole`
 2022-08-09 09:02:27 +02:00
Wolfgang Huß
e758e1337d Release v1.1.0 - implement categories again 2022-08-03 15:24:42 +02:00
Wolfgang Huß
a8a6acb9f7 Rename 'UserGroup' to 'UserRole' 2022-08-03 08:14:05 +02:00
Moriz Wahl
938f5ccdf9 fix all tests 2022-07-25 23:20:05 +02:00
Moriz Wahl
b71b20ae81 fix more tests 2022-07-25 23:04:12 +02:00
Moriz Wahl
5393c2aeaa fix some tests 2022-07-25 22:53:19 +02:00
Moriz Wahl
bc955003f7 add optional categories to teaser and post 2022-07-25 20:03:00 +02:00
Moriz Wahl
e31f250ea5 env vatiable for CATEGORIES_ACTIVE and switch for categories in contribution form 2022-07-25 18:41:39 +02:00
Wolfgang Huß
6247734a32 Release v1.0.9 2022-07-20 14:42:38 +02:00
ogerly
e2f0138543 change footer version-link 2022-07-19 15:30:18 +02:00
ogerly
c4d9e028d7 add RU locales, set text in plural 2022-07-19 12:26:01 +02:00
ogerly
f4a746aa38 add all locales, set text in plural 2022-07-19 12:14:30 +02:00
ogerly
7ad398fb20 refactor search info text 2022-07-19 11:50:59 +02:00
Wolfgang Huß
9143eb7143 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5072-remove-image-entries-in-docker-compose-files-fix-m1 
# Conflicts:
#	DOCKER_MORE_CLOSELY.md
#	docker-compose.override.yml
#	docker-compose.test.yml
#	docker-compose.yml
 2022-07-18 19:01:58 +02:00
Wolfgang Huß
5f9155805d Fix 'Dockerfile' for webapp and backend for running locally and in cluster 2022-07-17 20:32:03 +02:00
Wolfgang Huß
0fef1bbd60 Change Docker compose 'maintenance' port from '5000' to '3001' 
- Because port '5000' has a standard use on macOS, it is said.
 2022-07-13 10:49:21 +02:00
Wolfgang Huß
cd07c9b2f6 Release v1.0.8 2022-07-01 09:51:48 +02:00
Wolfgang Huß
f92cec3749 Log e-mail if not sending it 2022-06-24 10:04:35 +02:00
Wolfgang Huß
bdbd2c361a Change dummy invite code from 'AAAAAA' to 'ABCDEF' to see the length 2022-06-23 18:12:37 +02:00
Wolfgang Huß
5abbf22b43 Implement 'inviteCode' and 'nonce' lengths via 'registration.js' in backend and webapp 2022-06-23 17:44:59 +02:00
Wolfgang Huß
15e69a47ae Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-06-23 09:35:30 +02:00
Wolfgang Huß
23dbf2d310 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-06-22 11:31:54 +02:00
ogerly
c92d437723 change hashtag test from = to # 2022-06-22 11:05:40 +02:00
ogerly
652fdcca5c yarn lint 2022-06-22 11:03:32 +02:00
ogerly
61679549d2 add comment for general hashtag in link is not the problem 2022-06-22 11:01:28 +02:00
ogerly
771f11ee90 replace hashtag in d.tube url 2022-05-15 09:44:15 +02:00
Wolfgang Huß
d9f33ded17
Merge pull request #4882 from Ocelot-Social-Community/4342-fix-language-select 
fix: 🍰 Add Expiration Date To Cookies Etc.
 2022-05-06 12:16:14 +02:00
ogerly
f63165aa70 deleted unused css 2022-05-06 10:55:05 +02:00
Wolfgang Huß
652665d1fb Change naming and negation for better readability 2022-05-06 10:50:38 +02:00
Wolfgang Huß
46f27ccb9b Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4342-fix-language-select 2022-05-06 10:00:08 +02:00
Wolfgang Huß
23b7efa0e5 Change some little things in the frontend tests 2022-05-06 09:09:00 +02:00
Wolfgang Huß
7936b76043 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4771-refactor-social-media-list-with-slots 2022-05-06 07:58:41 +02:00
Wolfgang Huß
a66212f66c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-05-06 07:32:42 +02:00
Wolfgang Huß
e4b695a486 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4771-refactor-social-media-list-with-slots 2022-05-04 09:36:06 +02:00
Wolfgang Huß
8648c271a7 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4785-test-refactor-email-templates 2022-05-04 09:31:04 +02:00
Wolfgang Huß
50bdfb80e2 Change from require to import which now works again 2022-05-04 09:15:47 +02:00
Wolfgang Huß
980a6bf504 Fix faker package installation in webapp 2022-05-03 20:02:44 +02:00
Wolfgang Huß
634249b407 Fix the rest of the faker imports 
- Some seems to work even the old way?!
 2022-05-03 14:22:10 +02:00
Wolfgang Huß
37d36be095 Replace deleted faker 
- Add Node Version Manager files as hint of the best Node version and to be used with '$ nvm use'.
 2022-05-02 16:02:28 +02:00