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

875 Commits

Author SHA1 Message Date
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
Ulf Gebhardt
2b8996a898
Merge pull request #4121 from Ocelot-Social-Community/start_on_registration 
start_on_register
 2021-01-14 15:15:46 +01:00
Ulf Gebhardt
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
Nimit Bhargava
3be426c0d5 refactor: extracting social media to vue component 2020-12-06 19:30:19 +05:30
Nimit Bhargava
0585960313 feat: keeping same favicon implementation as in settings page 2020-12-03 12:41:38 +05:30
Nimit Bhargava
7e80189e2e fix: using ds-avatar instead of using user-avatar 2020-12-03 12:01:00 +05:30
Wolfgang Huß
633f4de93a Fix linting 2020-12-02 23:36:53 +01:00
Moriz Wahl
128e1f06cc logos changed. SVG should be in better quality 2020-11-10 14:41:09 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
Moriz Wahl
f7b60f5928 linting 2020-10-26 11:19:03 +01:00
Moriz Wahl
c4b436f6cb spinner added to download button, only the posts written by the user are exported 2020-10-26 10:43:22 +01:00
Moriz Wahl
14de48ecd7 deleted or disabled post are not available for user data download. 2020-10-16 11:00:58 +02:00
Moriz Wahl
3ba72526b9 filename of downloaded image changed 2020-10-14 12:19:53 +02:00
Moriz Wahl
6ff02b41c8 name of downloaded image is the same as the url in the exported json 2020-10-14 12:03:35 +02:00
Moriz Wahl
a6f87a394a improved German, download images on click 2020-10-14 11:49:06 +02:00
Moriz Wahl
4a79fffa5b Removed XML download. Added image download and description 2020-10-13 17:36:53 +02:00
Wolfgang Huß
bcd98c793c Implement mixins for delete, pin, unpin post in lists, done 2020-10-08 15:24:06 +02:00
Wolfgang Huß
c91c9e263f Implement mixins for delete, pin, unpin post in lists, on the way 2020-10-08 09:26:20 +02:00
Wolfgang Huß
91b64c2360 Implement postActions, first try 2020-09-30 16:19:10 +02:00
Wolfgang Huß
b076fa57ec Improve component for user profile tab and use on search page, refinement needed 2020-09-30 11:01:34 +02:00
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
Moriz Wahl
0e678a5559 basic json download of user data 2020-09-29 13:35:47 +02:00
Wolfgang Huß
5e910000aa Implement component for user profile tab, first step 2020-09-28 13:12:29 +02:00
Moriz Wahl
d049ad5d3e changes requested by review https://github.com/Human-Connection/Human-Connection/pull/3271 2020-09-24 13:14:35 +02:00
ogerly
d2e6280059 Merge branch '17-Admin-Remove-user-profile' of https://github.com/Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-07-31 07:36:21 +02:00
roschaefer
d78e181dd3 fix image path 2020-06-16 13:31:36 +02:00
roschaefer
68c5f0dd85 Fix lint 2020-06-15 15:15:55 +02:00
roschaefer
77b031083e Make four static pages 
* imprint
* data privacy
* terms of service
* code of conduct
 2020-06-15 14:08:45 +02:00
roschaefer
4a910664eb Parameterize entire html of terms+conditions 2020-06-14 17:57:40 +02:00
Wolfgang Huß
a4e4575f19 Fix lint 2020-06-10 15:11:40 +02:00
roschaefer
0d5cf7a8cd Replace name Human Connection from locales 2020-06-09 14:25:51 +02:00
adarsh-av13
2d66348c1b corrected code-of-conduct mail link 2020-06-08 00:32:21 +05:30
Wolfgang Huß
e33a190ffe Fix syntax 
- My conflict resolved on GitHub missed a bracket.
 2020-06-06 10:04:51 +02:00
Wolfgang Huß
cf3f9fa210
Merge branch 'master' into 3013-set-the-teaser-image-to-the-appropriate-size-ratio-from-the-beginning 2020-06-06 09:50:49 +02:00
roschaefer
387ea64faa Parameterize links 2020-06-05 17:15:12 +02:00
roschaefer
3a216226bc Paramterize all emails 2020-06-05 14:15:42 +02:00
roschaefer
bc70e8b3b0 refactor: Image paths 
* removed obsolete images
* moved all overwritable images to a location webapp/static/img/custom/
* better names
 2020-06-05 11:49:18 +02:00
Dries Cruyskens
38d7ab9661 Moved the sorting function to helper file to prevent duplicate code. 2020-06-04 00:18:51 +02:00
Dries Cruyskens
43a3b57dd9 Fixed linting issues and comments. 2020-05-30 03:20:50 +02:00
Dries Cruyskens
136e83afc2 Alphabetically sorting tags using compute functions on index and more-info page. Added test checking tags are present and shown alphabetically. 2020-05-30 03:10:11 +02:00