ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-15 17:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,376 Commits 103 Branches 1,536 Tags
Commit Graph

1414 Commits

Author SHA1 Message Date
Wolfgang Huß
afe2c74bba Cleanup 2020-04-09 11:41:40 +02:00
Wolfgang Huß
7478b788a6 Cleanup 2020-04-09 08:18:03 +02:00
Wolfgang Huß
db7908139c Cleanup 2020-04-08 15:56:27 +02:00
Wolfgang Huß
f4b90a449e Fix Cypress test for notification on Build 2020-04-06 10:12:04 +02:00
Wolfgang Huß
b417667d31 Rename return property of 'extractNotificationDataOfCurrentUser' 
- Renamed 'report' to 'filedReport'.
- Commented on the need of deep nested and similair properties for GQL of notifications.
 2020-04-03 15:25:07 +02:00
Wolfgang Huß
2697408b65 Fix Cypress test for notifications 2020-04-03 14:46:13 +02:00
Wolfgang Huß
f8de595d3b Extent storybook NotificationsTable with filed report notifications 2020-04-03 13:43:42 +02:00
Wolfgang Huß
ff27a89579 Prettify notifications table 2020-04-03 09:34:15 +02:00
Wolfgang Huß
c574c58ad5 Refactor notifications menu 2020-04-03 09:27:12 +02:00
Wolfgang Huß
6f8b48024d Fix Cypher for notifications queries 
- Fixed GQL queries for notifications – normal, aerkAsRead, subscriptions add.
- Refactored notifications tests to check for authors of all types.
 2020-04-03 08:59:17 +02:00
Wolfgang Huß
d0cf1cc185 Fix lint 2020-04-01 15:53:57 +02:00
Wolfgang Huß
a52cbe1c66 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 
# Conflicts:
#	backend/src/db/seed.js
#	backend/src/middleware/notifications/notificationsMiddleware.js
#	backend/src/schema/resolvers/notifications.js
#	webapp/components/NotificationsTable/NotificationsTable.spec.js
 2020-04-01 12:22:56 +02:00
mattwr18
06985c2dbb chore: fix lint w/ new linting rules 2020-03-26 18:55:10 +01:00
mattwr18
cb0a3f5cdd chore: Fix lint w/ new linting rules 2020-03-26 10:14:51 +01:00
mattwr18
e1733201e8 chore: Fix lint, follow @alina-beck suggestions 2020-03-25 11:02:28 +01:00
Alina Beck
478e4fa08f include magic numbers in tokens, fix tests 2020-03-25 11:02:28 +01:00
Alina Beck
d9c3412b41 outsource styling to FilterMenuSection component 
@mattwr18 great work and great styling so far! ;)
fyi: I noticed there was a lot of duplicate CSS and the solution I came up with is this new component, using slots
 2020-03-25 11:02:28 +01:00
mattwr18
863656f718 chore: add story for LabeledButton 2020-03-25 11:02:28 +01:00
mattwr18
70bf870e4a chore: update name for HashtagsFilter 2020-03-25 11:02:28 +01:00
mattwr18
eb4536d855 refactor: test the functionality separately 2020-03-25 11:02:28 +01:00
mattwr18
5b8fecc6ef refactor: Extract LanguagesFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
bb183b1211 refactor: Extract FollowingFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
27c3c02e07 refactor: Extract CategoriesFilter to it own spec 2020-03-25 11:02:28 +01:00
mattwr18
38d2edf0f2 refactor: Extract EmotionsFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
4f8a4c6753 Refactor LanguageFilter to remove ds-flex 2020-03-25 11:02:28 +01:00
mattwr18
e400a10c45 chore: rename/refactor filter, make responsive 
- Make the emotions filter similar in style to CategoriesFilter
 2020-03-25 11:02:28 +01:00
mattwr18
0f03d09723 refactor: Extract FollowingFilter as own component 
Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-03-25 11:02:28 +01:00
mattwr18
b19a2a8dea Refactor GeneralFilter to remove unnecessary code 
- remove ds-flex, ds-flex-item, ds-space, ds-heading
- not really happy with the design, and in mobile the divider border is
  hidden(!?)
 2020-03-25 11:02:28 +01:00
Alina Beck
1ffde6bf10 refactor: CategoriesFilter to not use ds-flex 
Co-authored-by: mattwr18 <mattwr18@gmail.com>

- introduce LabeledButton component
- rename FilterMenu to HashtagsFilter and FilterPosts to FilterMenu
 2020-03-25 11:02:00 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Moriz Wahl
7024ea0b30 specs for Search for Hashtags 2020-03-19 15:09:43 +01:00
Moriz Wahl
1c43d5fe6f Search for Hashtags works due watching route in pages/index.vue 2020-03-19 14:19:13 +01:00
Moriz Wahl
014be6e7f8 partially working, index page does not update when route is changed 2020-03-19 12:59:15 +01:00
Moriz Wahl
16ad565ec8 partially working, index page does not update when route is changed 2020-03-19 12:55:59 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
Wolfgang Huß
db4bac695b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 2020-03-13 15:38:50 +01:00
Wolfgang Huß
06be781078 Fix frontend tests 2020-03-13 14:47:42 +01:00
Raphael Beer
7df4432601
Fix: named slot scopes 2020-03-13 00:09:33 +01:00
Raphael Beer
d465e94596
Refactor: use #shorthand for default v-slot attributes 2020-03-12 23:49:27 +01:00
Raphael Beer
5626cb2771
Revert "Refactor: replace default slots" 
This reverts commit f1e308074bc33e6762431f90f335ed849776f4d9.

  Let's take this one at a time...
 2020-03-12 23:49:01 +01:00
Raphael Beer
c3cf682fdf
Refactor: replace default slots 2020-03-12 23:49:01 +01:00
Raphael Beer
d90e4c2aa8
Refactor: replace named slots 2020-03-12 23:49:00 +01:00
Robert Schäfer
066506838f
Merge pull request #3219 from Human-Connection/2823-zero-bell-to-all-notifications-page 
feat: zero bell to all notifications page [2823]
 2020-03-10 13:01:38 +01:00
Wolfgang Huß
5dfd0f9ada Merge fixes and lint fixes 2020-03-09 09:54:43 +01:00
Wolfgang Huß
af8b479fb4 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach-merge-master 
# Conflicts:
#	backend/package.json
#	backend/src/db/seed.js
#	backend/src/middleware/notifications/notificationsMiddleware.js
#	backend/src/middleware/notifications/notificationsMiddleware.spec.js
#	backend/src/schema/resolvers/notifications.js
#	backend/src/schema/resolvers/notifications.spec.js
#	backend/yarn.lock
#	cypress/integration/common/steps.js
#	webapp/components/Notification/Notification.spec.js
#	webapp/components/Notification/Notification.vue
#	webapp/components/NotificationList/NotificationList.spec.js
#	webapp/components/UserTeaser/UserTeaser.vue
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/package.json
#	webapp/yarn.lock
 2020-03-09 09:34:49 +01:00
Wolfgang Huß
3ea1348bd4 Merge master 2020-03-09 08:37:05 +01:00
Raphael Beer
f3d2d35b26
Change: only attempt to style .main-navigation, if it exists 2020-03-05 12:03:11 +01:00
Raphael Beer
f3a7c10e8a
Fix: content shift when y-scrollbar disappears 2020-03-05 12:03:11 +01:00
Raphael Beer
8ffda5e908
Fix: linting, integration tests 2020-03-05 12:02:12 +01:00
Raphael Beer
d5cbfb142f
Change: remove counter from link to /notifications 2020-03-05 12:02:11 +01:00