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

2667 Commits

Author SHA1 Message Date
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
c179b0a12f remove categories: clean up 2021-01-19 17:40:02 +01:00
Moriz Wahl
f73c40c252 removed categories from posts 2021-01-19 17:40:02 +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
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
Wolfgang Huß
7c2c8d3368 Implement new ocelot.social logos 2021-01-07 15:33:26 +01:00
Mogge
cc9c70dbe7
Merge pull request #4047 from Ocelot-Social-Community/3505-display-social-media-favicons-on-profile 
feat: 🔥 Displaying Social Media Favicons On Profile Page
 2020-12-22 13:06:39 +01:00
Nimit Bhargava
0fec0afd27 testing: adding spec for social-media 2020-12-22 17:24:45 +05:30
Moriz Wahl
db9715297e Test examples added 2020-12-22 16:46:32 +05:30
Nimit Bhargava
3934bf6a47 testing: adding spec for social-media 2020-12-18 16:36:50 +05:30
Nimit Bhargava
c5cbb9fb8c enhancement: using link id as key, instead of username as usernames can be same for different social networks 2020-12-18 16:36:50 +05:30
Nimit Bhargava
c3d3d2d981 refactor: moving element style to style tag 2020-12-18 16:36:50 +05:30
Nimit Bhargava
75763a6486 refactor: extracting social media to vue component 2020-12-18 16:36:50 +05:30
Moriz Wahl
c405e008e4 checks that a cookie exists after login. If not, throw an error saying that no cookie can be set 2020-12-18 11:31:16 +01:00
Wolfgang Huß
633f4de93a Fix linting 2020-12-02 23:36:53 +01:00
Wolfgang Huß
d2d257bc1c Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into white-labeling 
# Conflicts:
#	backend/Dockerfile
#	webapp/Dockerfile
#	webapp/Dockerfile.maintenance
#	webapp/components/LoginForm/LoginForm.vue
#	webapp/package.json
 2020-12-02 11:11:26 +01:00
Brandon Tripp
4efc1d3bf6 Linted the code to correct one error. 2020-12-01 13:37:58 -07:00
Brandon Tripp
8afcd6e4ea The styling was adjusted to center eye icon and make entire span clickable. 2020-12-01 11:28:58 -07:00
Brandon Tripp
d7641c3a35 Changed spec descriptions to be more clear. 2020-11-25 21:18:26 -07:00
Brandon Tripp
8d1931f94c Linting for new tests and LoginForm changes. 2020-11-24 15:38:49 -07:00
Brandon Tripp
f71fb6b07b Modified reveal password wrapper to contain test data, added tests for icon default and change of icon upon click. Preliminary test for returning focus to input field. 2020-11-24 15:35:35 -07:00
Brandon Tripp
0b03bf2fcc Initial attempt at spec for show/hide password 2020-11-20 15:15:09 -07:00
Brandon Tripp
74b56cbca7 linting of LoginForm.vue 2020-11-20 14:10:43 -07:00
Brandon Tripp
f56664b334 Refactor of click event to use a methhod and the @click rather than mouse down. Small adjustment to button spacing. 2020-11-20 13:39:43 -07:00
Brandon Tripp
59df64027e adding linted code to pull request. 2020-11-20 11:33:11 -07:00
Brandon Tripp
d33b9861fa added to new style to password field to incorporate the ds-input with the hide and show password icon 2020-11-20 10:30:39 -07:00
Brandon Tripp
15cd45e8e1 added password field icon and toggle functionality for the icon and password field on hide/reveal icon click 2020-11-20 09:26:35 -07:00
Wolfgang Huß
b404355cd9 Fix linting 2020-11-16 15:55:33 +01:00
Ademílson F. Tonato
89e034057d fix: update based on code-review suggestions 2020-11-16 15:25:09 +01:00
Moriz Wahl
430d07d0c1 link to FAQ changed 2020-11-16 12:59:13 +01:00
Moriz Wahl
5cfb73572e further rebranding 2020-11-16 09:43:15 +01:00
Wolfgang Huß
a94d7188be Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read-test 2020-11-12 15:37:38 +01:00
Moriz Wahl
128e1f06cc logos changed. SVG should be in better quality 2020-11-10 14:41:09 +01:00
Moriz Wahl
ecb0bb3766 Starting rebranding to ocelot.social 2020-11-10 12:08:44 +01:00
Moriz Wahl
bd962bbfcc merging rebranding branch from / 2020-11-10 10:28:20 +01:00
dasari810
cd7e519d4b implemented requested changes 2020-11-03 01:04:28 +05:30
Wolfgang Huß
1a6a2bd8c8 Inserted empty line for nicer formating 2020-11-02 12:53:47 +01:00
Wolfgang Huß
0095a94863 Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into allow-only-supported-file-formats 2020-11-02 12:41:15 +01:00
dasari810
939466b9bb allow only supported file formats 2020-10-27 12:48:08 +05:30
dasari810
df4347f07c added translations for text 2020-10-26 19:13:51 +05:30
dasari810
ae681ccad3 show supported img formats implemented 2020-10-26 16:35:06 +05:30
Ademílson F. Tonato
bfe66adaac feat: add button to mark all notifications as read on notification menu 2020-10-24 19:40:05 +01: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
Wolfgang Huß
5e910000aa Implement component for user profile tab, first step 2020-09-28 13:12:29 +02:00
Wolfgang Huß
20c52b16e7 Temporary fix tests for SearchResult.vue 
- Now the buttons are disabled instead of remove from the DOM.
 2020-09-25 13:46:56 +02:00
Wolfgang Huß
7fd861caa0 Fix tests for pagination buttons 
- Now the buttons are disabled instead of remove from the DOM.
 2020-09-25 13:31:35 +02:00