IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,413 Commits 5 Branches 2 Tags
Commit Graph

2413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
e4908ed640 Add component for Notifications' posts, style 2019-04-15 19:33:27 -03:00
Matt Rider
e7e2a8a937 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 347-display_notifications 2019-04-09 21:55:11 -03:00
Robert Schäfer
6d24a63143
Merge pull request #437 from Human-Connection/2019/kw15/disabled_post_fix_disabled_border_z-index 
2019/kw15/disabled_post_fix_disabled_border_z-index
 2019-04-10 00:44:18 +02:00
Robert Schäfer
c44b3b8b96
Merge branch 'master' into 347-display_notifications 2019-04-10 00:02:42 +02:00
Robert Schäfer
ad2e628ba4
Merge branch 'master' into 2019/kw15/disabled_post_fix_disabled_border_z-index 2019-04-10 00:01:00 +02:00
Robert Schäfer
3d47735b32
Merge pull request #441 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.18.11 
Bump nodemon from 1.18.10 to 1.18.11 in /backend
 2019-04-09 23:41:31 +02:00
Robert Schäfer
030e41c995
Merge branch 'master' into dependabot/npm_and_yarn/backend/nodemon-1.18.11 2019-04-09 22:13:02 +02:00
Robert Schäfer
cf612e6fda
Merge branch 'master' into 2019/kw15/disabled_post_fix_disabled_border_z-index 2019-04-09 22:07:45 +02:00
Robert Schäfer
04e8642d17
Merge pull request #435 from Human-Connection/2019/kw15/post_make_menu_sticky 
2019/kw15/post_make_menu_sticky
 2019-04-09 22:04:56 +02:00
Robert Schäfer
5b77c92c35 Display and test notification counter 2019-04-09 20:51:54 +02:00
Robert Schäfer
edfbd2a6ed Proper notification counter 2019-04-09 20:51:54 +02:00
Robert Schäfer
cf27f9e836 Refactor: Notification as a root component 2019-04-09 20:51:54 +02:00
Robert Schäfer
352b5ac7a4 Implement NotificationList with apollo 2019-04-09 20:51:54 +02:00
Robert Schäfer
3559cfd9a3 Intermediate store/notifications 2019-04-09 20:51:54 +02:00
Robert Schäfer
512835f202 Implement NotificationList without store implement 2019-04-09 20:51:54 +02:00
Robert Schäfer
13fe228b58 Implement first test case for NotificationList 2019-04-09 20:51:54 +02:00
Robert Schäfer
afa0153f55 Show post-card in notification et al. 
* add notification in seeds
* extremely odd styling - on the index page the notification looks OK,
on the post page, the post card elements appear more densely packed
 2019-04-09 20:51:54 +02:00
Robert Schäfer
4d2ba25576 Minimal implementation to let cypress test pass 2019-04-09 20:51:54 +02:00
Robert Schäfer
d0812dae09 Create a simple dropdown for notifications 2019-04-09 20:51:54 +02:00
Robert Schäfer
35e2640f37 Sketch 🥒 for #345 2019-04-09 20:51:54 +02:00
Robert Schäfer
f4fc2d6c30 Remove obsolete number prefix on cypress tests 
Cypress tests don't need to be executed in order so we don't need the
numbers anymore.

cc @appinteractive
 2019-04-09 20:51:54 +02:00
Robert Schäfer
b355a244ab Fix lint 2019-04-09 20:51:17 +02:00
Ulf Gebhardt
5e28ef32ab
lint fixes 2019-04-09 11:14:41 +02:00
Ulf Gebhardt
b235c640c5
lint fix 2019-04-09 11:09:03 +02:00
dependabot[bot]
5b64ba1dd1
Bump nodemon from 1.18.10 to 1.18.11 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.10 to 1.18.11.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.10...v1.18.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-09 04:52:26 +00:00
Ulf Gebhardt
42e39a6973
fixed disabled red border z-index in order not to cross the menu in profile, refactored css of postCard 2019-04-08 12:32:42 +02:00
Robert Schäfer
adde8a5965 Remove dots from matched @mention regex 2019-04-08 12:08:49 +02:00
Robert Schäfer
f372cdcbdb Avoid to send out notifications for email adresses 2019-04-08 12:01:09 +02:00
Ulf Gebhardt
1f31c29552
make post sticky - fixes https://github.com/Human-Connection/Human-Connection/issues/385 2019-04-08 11:39:39 +02:00
Robert Schäfer
93097d586c Merge remote-tracking branch 'origin/master' into create_notifications 2019-04-08 10:20:23 +02:00
Robert Schäfer
8e6fb3d9e2 Fix test 2019-04-08 10:19:57 +02:00
Robert Schäfer
cece32f55d
Merge pull request #431 from Human-Connection/dependabot/npm_and_yarn/backend/cheerio-1.0.0-rc.3 
Bump cheerio from 1.0.0-rc.2 to 1.0.0-rc.3 in /backend
 2019-04-08 10:12:51 +02:00
dependabot[bot]
419b80dae4
Bump cheerio from 1.0.0-rc.2 to 1.0.0-rc.3 in /backend 
Bumps [cheerio](https://github.com/cheeriojs/cheerio) from 1.0.0-rc.2 to 1.0.0-rc.3.
- [Release notes](https://github.com/cheeriojs/cheerio/releases)
- [Changelog](https://github.com/cheeriojs/cheerio/blob/1.0.0-rc.3/History.md)
- [Commits](https://github.com/cheeriojs/cheerio/compare/1.0.0-rc.2...1.0.0-rc.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-08 04:55:37 +00:00
Robert Schäfer
cf1f655451 Create notifications on CreatePost 2019-04-06 16:02:54 +02:00
Ulf Gebhardt
c1785af8e1
Merge branch 'master' into create_notifications 2019-04-06 09:44:43 +02:00
Robert Schäfer
471a7affb1
Merge pull request #362 from Human-Connection/quick-fix 
Fixes #361
 2019-04-06 00:28:46 +02:00
Ulf Gebhardt
1b9ce269cf
Merge branch 'master' into quick-fix 2019-04-05 20:00:14 +02:00
Ulf Gebhardt
256b4d92bb
Merge branch 'master' into create_notifications 2019-04-05 19:58:51 +02:00
Ulf Gebhardt
c7cb5f3eec
Merge pull request #396 from Human-Connection/github_emojis 
Use github emojis if possible
 2019-04-05 16:07:08 +02:00
Robert Schäfer
cb5280e6e8 Sketch test to create a notificaion for a mention 2019-04-05 14:35:41 +02:00
Robert Schäfer
c3b320380a
Merge pull request #368 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.3 
Bump @babel/core from 7.4.0 to 7.4.3 in /webapp
 2019-04-05 13:50:09 +02:00
dependabot[bot]
ca6acb4041
Bump @babel/core from 7.4.0 to 7.4.3 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.0 to 7.4.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.0...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-05 10:45:58 +00:00
Robert Schäfer
2b725aec78
Merge pull request #390 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-24.7.1 
Bump jest from 24.7.0 to 24.7.1 in /webapp
 2019-04-05 12:44:07 +02:00
Robert Schäfer
c543d7558c
Merge pull request #415 from Human-Connection/350-query_current_users_notifications 
350 query current users notifications
 2019-04-05 12:00:11 +02:00
dependabot[bot]
8b27a565e7
Bump jest from 24.7.0 to 24.7.1 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.7.0 to 24.7.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.7.0...v24.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-05 09:53:58 +00:00
Robert Schäfer
a6c2fcebde
Merge pull request #388 from Human-Connection/dependabot/npm_and_yarn/backend/babel-jest-24.7.1 
Bump babel-jest from 24.5.0 to 24.7.1 in /backend
 2019-04-05 11:51:49 +02:00
Robert Schäfer
710a8515d3 Fix lint 2019-04-05 11:20:19 +02:00
Robert Schäfer
bb3a8525db Only admins are allowed to query all notifications 2019-04-05 02:35:33 +02:00
Robert Schäfer
97d9b6d772 Add notifications to User 2019-04-05 02:35:33 +02:00
Robert Schäfer
03d4c93f96 Add Notification type 2019-04-05 02:35:33 +02:00