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
Matt Rider
ba1e62da21 Update the apollo cache 2019-08-26 18:54:21 +02:00
Alina Beck
f47502ade1 survive empty urls 2019-08-26 16:38:33 +01:00
Matt Rider
2af4151918 Update to use <client-only> instead of <no-ssr> 2019-08-26 17:09:24 +02:00
Alina Beck
1df3cb1ed1 get link input to work 2019-08-26 16:08:46 +01:00
Wolfgang Huß
7498d88a44 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-26 15:44:32 +02:00
Alina Beck
62e34bf5b0 refactor suggestion list 2019-08-26 12:46:46 +01:00
Alina Beck
5c4ec0dd19 use constants for keycodes and mention types 2019-08-26 11:58:15 +01:00
Alina Beck
dc70da8826 make optional extensions a computed property 2019-08-24 12:42:34 +01:00
Alina Beck
6b452a2217 refactor duplicate code 2019-08-24 11:59:59 +01:00
Alina Beck
af985ba95c rename suggestions menu to suggestion list 2019-08-24 10:44:37 +01:00
Alina Beck
62775a93d6 put link input in separate component 2019-08-24 10:42:24 +01:00
Alina Beck
2c0b2ed482 place tippy popup in renderless component 2019-08-23 23:21:24 +01:00
Alina Beck
fbe4de347b extract suggestions menu into separate component 2019-08-23 22:30:05 +01:00
ogerly
63549c1101 Tests for create users with terms and conditions are ok 2019-08-23 19:37:23 +02:00
Alina Beck
cbb0d79331 put link bubble back in (wip) 2019-08-23 17:37:17 +01:00
Alina Beck
ee00a3b3df replace floating and bubble menu with menu bar 2019-08-23 15:49:20 +01:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
Wolfgang Huß
66612801ce Change text of invite form 2019-08-23 13:35:22 +02:00
ogerly
877b0ea77e Terms and conditions are handed over cleanly during registration 2019-08-23 13:17:54 +02:00
ogerly
53532025d6 Fix translation add backend test case todo 2019-08-23 11:36:41 +02:00
ogerly
592a682bd7 Temporary commit 2019-08-23 11:02:24 +02:00
Wolfgang Huß
793485c0fc Write frontend tests 2019-08-22 15:20:40 +02:00
Wolfgang Huß
04fe6b0a8c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotificationsMiddleware.spec.js

Refactored there tests a little
 2019-08-22 11:02:10 +02:00
roschaefer
a7ebbcf154 Implement visual feedback if filter is active 2019-08-21 23:52:10 +02:00
Robert Schäfer
deb0fcabd4
Merge pull request #1268 from Human-Connection/post-needs-to-have-category#1222 
Validate that a post cannot be created without categories/too many categories
 2019-08-21 16:28:32 +02:00
Wolfgang Huß
3d2df56141 Backend tests 2019-08-21 14:27:32 +02:00
Matt Rider
d1008cd0c7 Fix vue warnings 
- localVue.use(Styleguide) to register components
- find masonryGrid and emit event

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-08-21 13:17:32 +02:00
Wolfgang Huß
d98ebdd713 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-21 08:37:43 +02:00
Robert Schäfer
af5772db49
Merge pull request #1256 from Human-Connection/add-masonry-grid 
Add masonry layout grid
 2019-08-21 00:42:48 +02:00
Matt Rider
512bf32b0c Update cypress tests, fix broken comment reactivity 2019-08-20 21:27:00 +02:00
Matt Rider
8735045d11 Update cypress tests, post query 2019-08-20 20:13:29 +02:00
Alina Beck
626e9e24d4 use rowGap property with gridRowGap as fallback 2019-08-20 15:46:41 +01:00
Matt Rider
a000719663 Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 16:13:38 +02:00
Matt Rider
c614e4de47 Update UI, component tests 
- enforce that a post cannot be created or updated with no categories nor more than 3 categories
 2019-08-20 15:53:07 +02:00
Matt Rider
a77c9638f6 Refactor Notification.vue 
- Follow @alina-beck's suggestions, use notification over notification: true, use span with font weight and margin-right to remove &nbsp;
 2019-08-20 08:36:05 +02:00
Alina Beck
3703fc787a fix lint errors – thanks github editor 2019-08-19 16:23:38 +01:00
Wolfgang Huß
aae5fd396e Merge branch '1017-send-out-notifications-on-create-omment' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.js
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
#	webapp/components/notifications/Notification/Notification.vue
#	webapp/components/notifications/NotificationMenu/NotificationMenu.vue
 2019-08-19 16:58:18 +02:00
Alina Beck
b74c47a265
Merge branch 'master' into add-masonry-grid 2019-08-19 15:05:54 +01:00
Alina Beck
0bb746804b add masonry grid item tests 2019-08-19 14:06:32 +01:00
Alina Beck
5abf6003cc add tests for masonry grid 2019-08-19 13:15:13 +01:00
Matt Rider
053d8bcf7b Fix UserQuery 2019-08-19 11:41:23 +02:00
Alina Beck
bec5ed9695 remove computed props from grid 2019-08-19 10:37:20 +01:00
Alina Beck
b0de4ec2b5 move calculation from grid to grid item 2019-08-19 10:16:44 +01:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
mattwr18
90fa70e83d
Merge pull request #1282 from Human-Connection/count_from_0_to_0_by_default 
Get rid of property warnings
 2019-08-19 10:06:09 +02:00
Robert Schäfer
87461c21ca
Merge pull request #1280 from Human-Connection/refactor-graphql-queries 
Refactor graphql queries
 2019-08-19 09:58:38 +02:00
Wolfgang Huß
68c25b8d54 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
 2019-08-19 08:42:00 +02:00
Alina Beck
0aa1b8046b remove grid logic from post component 2019-08-18 18:28:48 +01:00
Alina Beck
76be960c03 move grid calculations to masonry grid components 2019-08-18 18:25:14 +01:00
Wolfgang Huß
f653bac9e1 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.spec.js
 2019-08-16 18:22:36 +02:00