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

814 Commits

Author SHA1 Message Date
ashleysylvialee
ff50273f94
fix: 🍰 Suggestion List Filter (#4296) 
* Fix suggestion list filter

* fix tests after MAPBOX changed their IDs again

* Add spacebar selection functionality for mentions

* Add tests

* Fix linting

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2021-03-19 01:32:27 -07:00
Wolfgang Huß
76d3788cf1
Merge pull request #4168 from Ocelot-Social-Community/4092-redesign-registration-process 
feat: 🍰 Redesign Registration Process Frontend
 2021-03-01 16:15:00 +01:00
Moriz Wahl
2afd0706cc fix missing comma after resolvinf conflicts 2021-03-01 15:59:03 +01:00
Moriz Wahl
a5740ebd0a backend tests for viewed teaser count 2021-03-01 15:33:20 +01:00
Moriz Wahl
1c3f628fb2 count views of post teaser 2021-03-01 15:33:20 +01:00
Moriz Wahl
88fd83ec2b
Merge pull request #4248 from Ocelot-Social-Community/count-post-views 
feat: 🍰 Count Post Clicks
 2021-03-01 14:55:14 +01:00
Wolfgang Huß
05352e52c9 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4092-redesign-registration-process 2021-02-26 07:10:28 +01:00
Moriz Wahl
b16e4a926c fixed searches for clickedCount 2021-02-22 22:24:27 +01:00
Moriz Wahl
4862d53196 tests added for click count 2021-02-22 20:49:33 +01:00
Moriz Wahl
a5df793c55 avoid introspection to get available roles as admin 2021-02-16 13:12:18 +01:00
Moriz Wahl
7bbdd5852f count clicks on posts setup 2021-02-16 09:51:36 +01:00
Moriz Wahl
7a313344cb MAPBOX introduced district for US-Cities. So I used a German City instead 2021-02-15 17:36:37 +01:00
Wolfgang Huß
567758bc56
Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4124-switch-user-role 2021-02-10 13:08:41 +01:00
Wolfgang Huß
97aa5ea07c Fix flaky reward backend test 2021-02-09 16:59:33 +01:00
Moriz Wahl
55983db2ca
Merge pull request #4199 from Ocelot-Social-Community/1934-image-cropping-optional 
feat: Image Cropping Is Optional
 2021-02-09 16:20:03 +01:00
Moriz Wahl
4a16af10ba image property type added 2021-02-04 21:01:52 +01:00
Ulf Gebhardt
ba460148b2
- renamed Location2 to LocationMapBox 2021-02-03 17:17:09 +01:00
Ulf Gebhardt
49b4ebb954
- beofreAll does not work - back to beforeEach 2021-02-02 07:19:50 +01:00
Ulf Gebhardt
c726c6bcc3
- lint fixes (backend) 2021-02-02 03:00:03 +01:00
Ulf Gebhardt
0597cead6a
- have blank lines between it in backend tests 2021-02-02 02:51:59 +01:00
Ulf Gebhardt
ad509c8818
- reuse user in backend location test 2021-02-02 02:51:00 +01:00
Ulf Gebhardt
143dee49c8
- lint fixes 2021-02-02 02:48:31 +01:00
Ulf Gebhardt
a350e40b3e
- backend tests 2021-02-02 02:48:31 +01:00
Ulf Gebhardt
31038c5c2a
- lint fixes 2021-02-02 02:48:31 +01:00
Ulf Gebhardt
d9e553b800
- backend implementation location query 2021-02-02 02:48:31 +01:00
Moriz Wahl
0af45c0156 change role as admin tests added. current user cannot change own role 2021-01-29 14:16:42 +01:00
Ulf Gebhardt
309c89ecf8
Merge pull request #4179 from Ocelot-Social-Community/statistics-test 
bug: DB Reset At Start Of Statistics Test In Backend
 2021-01-29 12:06:03 +01:00
Moriz Wahl
65d33ccdae db reset at start of statistics test in backend must be async 2021-01-28 20:29:54 +01:00
Moriz Wahl
9a6759aae4 db reset at start of statistics test in backend 2021-01-28 20:26:49 +01:00
Ulf Gebhardt
35cfcfc1a2
Merge pull request #4133 from Ocelot-Social-Community/refactor_config 
Refactor config
 2021-01-28 20:22:21 +01:00
Ulf Gebhardt
13c8b85c78
refactor backend config 2021-01-28 17:47:55 +01:00
Wolfgang Huß
7ffd8c59cb Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 2144-Add_Search_Results_Page 2021-01-25 08:24:47 +01:00
Moriz Wahl
ca74c91fc9
language detect: remove unwanted db fields 2021-01-21 13:30:56 +01:00
Moriz Wahl
250d231a74
auto detect language. Input field in contribution form removed. 2021-01-21 13:30:56 +01:00
Wolfgang Huß
e7243261f2 Fix lint 2021-01-21 13:10:58 +01:00
Wolfgang Huß
16c3d2ab87 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 2144-Add_Search_Results_Page 2021-01-21 08:01:40 +01:00
Moriz Wahl
9130b2bb50
Merge pull request #4154 from Ocelot-Social-Community/hot-fix.invite-codes 
bug: hotfix for invite codes
 2021-01-20 22:20:02 +01:00
Moriz Wahl
828ba7547f
Merge pull request #4134 from Ocelot-Social-Community/remove-categories 
refactor: Disable Categories
 2021-01-20 18:54:26 +01:00
Moriz Wahl
95a423a33a hotfix for invite codes 2021-01-20 18:49:51 +01:00
Moriz Wahl
f34f66fe82 invite codes: fixed typo, createdAt and ID is required 2021-01-19 17:15:28 +01:00
Moriz Wahl
190f9ba322 setup for switch iser role as admin 2021-01-18 17:37:57 +01:00
Moriz Wahl
a98170487b inviteCodes: explaination added, test for lower case 2021-01-18 17:23:55 +01:00
Wolfgang Huß
7dbc833e22 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page 
# Conflicts:
#	webapp/pages/profile/_id/_slug.vue
 2021-01-18 14:12:13 +01:00
Moriz Wahl
cbf50014ed removed categories from posts 2021-01-15 00:36:55 +01:00
Moriz Wahl
c6ff0723ee inviteCodes: tests are working as expected, fixed factory 2021-01-14 22:34:53 +01:00
Moriz Wahl
f20e17dcc1 query for validation of invite code 2021-01-12 21:25:25 +01:00
Moriz Wahl
9449a55d42 qyery for generated invite codes 2021-01-12 16:43:34 +01:00
Moriz Wahl
dd6cafed4c basic specs for inviteCodes 2021-01-11 21:25:02 +01:00
Moriz Wahl
a1967815bf further invite code 2021-01-07 13:30:11 +01:00
Moriz Wahl
dafb280494 linting 2020-11-16 14:01:12 +01:00