912 Commits

Author SHA1 Message Date
Wolfgang Huß
17b5e97d76 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4253-long-hashtags-not-visible
# Conflicts:
#	webapp/plugins/vue-filters.js
2021-03-30 16:05:54 +02:00
Wolfgang Huß
4907eab095
Remove header from registration page 2021-03-30 04:51:45 +02:00
Wolfgang Huß
e00de176e2
Cleanup in general 2021-03-30 04:51:45 +02:00
Wolfgang Huß
cad37a8666
Write test for the slider entrance controlled by URI queries 2021-03-30 04:51:45 +02:00
Wolfgang Huß
3fa7e04d48
Delete unnecessary code 2021-03-30 04:51:44 +02:00
Wolfgang Huß
6f79bba69d Fix truncate via adding 'truncateStr'
- Because the 'truncate' function uses 'trunc-html' which seem not to function anymore like expected what has to be investigated further.
2021-03-29 11:27:27 +02:00
Wolfgang Huß
a8cfdf8192 Fix signup component and test 2021-03-22 14:53:14 +01:00
Wolfgang Huß
1c78f30184 Fix registration page tests 2021-03-22 14:25:34 +01:00
Wolfgang Huß
d6ccdeb2b7 Fix refactoring use of .env variables after Moriz suggestions 2021-03-22 09:39:00 +01:00
Wolfgang Huß
4c8fb83dcd Refactor use of .env variables after Moriz suggestions 2021-03-19 13:23:15 +01:00
Wolfgang Huß
c26ee9df3a Implement test of registration page, first step 2021-03-15 18:35:14 +01:00
Wolfgang Huß
80aa480a03 Refined and cleaned registration page 2021-03-15 13:53:36 +01:00
Wolfgang Huß
db9ef6a832 Fix env 'PUBLIC_REGISTRATION' and invent env 'INVITE_REGISTRATION' in backend and frontend 2021-03-03 16:10:20 +01:00
Wolfgang Huß
393a05c358 Implement 'no-public-registration' slider 2021-03-02 12:33:47 +01:00
Wolfgang Huß
eebacab7ea Implement registration with slider, first step 2021-03-01 18:08:40 +01:00
Moriz Wahl
a5df793c55 avoid introspection to get available roles as admin 2021-02-16 13:12:18 +01:00
Wolfgang Huß
58728df97b Refinied design 2021-02-11 12:39:38 +01:00
Moriz Wahl
4097cc16f7 remove emojis from post page 2021-02-11 12:39:38 +01:00
Moriz Wahl
dd8f32bbd3
switch user role: removed unecessary comment 2021-02-10 13:08:42 +01:00
Moriz Wahl
14dfe2ae2c
change user role: tests are working 2021-02-10 13:08:42 +01:00
Moriz Wahl
c528269cb2
change user roles is working, test fails 2021-02-10 13:08:42 +01:00
Moriz Wahl
9ef42940ae
change user roles: fixed mutation parameters, added success toast 2021-02-10 13:08:42 +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
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
650e83f4c2 file upload: refactored 2021-02-08 16:10:38 +01:00
Wolfgang Huß
7571361b92 Fix linting by deleting console.log 2021-02-08 10:01:51 +01:00
narendra chandra
c39e7224dc User cannot change their own role 2021-02-06 17:45:21 -05:00
narendra chandra
ce23692922 User cannot change their role 2021-02-06 17:34:17 -05:00
narendra chandra
4920a902c4 User cannot change their own role 2021-02-06 17:12:24 -05:00
Moriz Wahl
80e296604d height of image in post/index.vue is calculated correctly. Why is this necessary? 2021-02-05 14:19:47 +01:00
Moriz Wahl
73cc1b1fa1 locations: fix frontend test for selecting new location 2021-02-04 15:03:55 +01:00
05adf4a9f1
- have expected call values in test calls 2021-02-03 17:50:36 +01:00
d0274a40ae
- renamed Location2 to LocationMapBox 2021-02-03 17:17:18 +01:00
0ba37aab18
- lots of additional tests
- removed 3 character condition for location query
- lint ing
2021-02-02 06:56:56 +01:00
31038c5c2a
- lint fixes 2021-02-02 02:48:31 +01:00
c0b25040c3
- frontend implementation location query
- remove mapboxtoken from .env template
2021-02-02 02:48:31 +01:00
narendra chandra
d5e227a38a Added user role change feature 2021-01-24 21:07:45 -05:00
Wolfgang Huß
ae09aee91c Renamed NewTabNavigation to TabNavigation
- Renamed old TabNavigation to OldTabNavigation.
2021-01-21 20:27:13 +01:00
Wolfgang Huß
9ce1e089fa Fix lint 2021-01-21 16:38:55 +01:00
Wolfgang Huß
101b50486c Cleanup comments 2021-01-21 13:03:32 +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
Wolfgang Huß
3de2e3c003 Add again accidental removed 'deleteUser' function on user profile 2021-01-21 07:53:25 +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
2b8996a898
Merge pull request #4121 from Ocelot-Social-Community/start_on_registration
start_on_register
2021-01-14 15:15:46 +01:00
81e42d6f58
- start with register page
- on logout force to go to login page
2021-01-10 00:12:29 +01:00
Wolfgang Huß
d3737b2acf Change registration svg 2021-01-07 15:33:26 +01:00
Wolfgang Huß
259a58cab9 Change svg's width and height from 100% to explicit px of viewBox
- Set a link on password-reset image.
2021-01-07 15:33:26 +01:00
Wolfgang Huß
b778d3eda5 Change some logos to ocelot.social white branded 2021-01-07 15:33:26 +01:00
Nimit Bhargava
0a177e4a5f
Merge branch 'master' into 3505-display-social-media-favicons-on-profile 2020-12-06 19:44:46 +05:30