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

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
8821b1c7f1
Merge pull request #438 from Human-Connection/2019/kw15/new_post_button_position 
2019/kw15/new_post_button_position
 2019-04-10 10:56:22 +02:00
Ulf Gebhardt
23c2b6889b
Merge branch 'master' into 2019/kw15/new_post_button_position 2019-04-10 10:25:07 +02:00
Ulf Gebhardt
ff86088260
Merge pull request #443 from Human-Connection/2019/kw15/Access_Settings_from_Profile_as_Owner 
2019/kw15/Access_Settings_from_Profile_as_Owner
 2019-04-10 10:23:18 +02:00
Ulf Gebhardt
c8d01d80cf
Merge branch 'master' into 2019/kw15/Access_Settings_from_Profile_as_Owner 2019-04-10 10:07:06 +02: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
mattwr18
9c64220c92
Merge branch 'master' into 236-list-social-media-accounts 2019-04-09 21:06:41 -03:00
Robert Schäfer
b63200ac8e Authorize and whitelist Notifications 2019-04-10 01:58:18 +02:00
Robert Schäfer
26caff5a9b Fix lint 2019-04-10 01:58:18 +02:00
Robert Schäfer
0476c15163 Remove dots from matched @mention regex 2019-04-10 01:58:18 +02:00
Robert Schäfer
58019c8975 Avoid to send out notifications for email adresses 2019-04-10 01:58:18 +02:00
Robert Schäfer
771779348a Fix test 2019-04-10 01:58:18 +02:00
Robert Schäfer
bab748e506 Create notifications on CreatePost 2019-04-10 01:58:18 +02:00
Robert Schäfer
4dead6e6f7 Sketch test to create a notificaion for a mention 2019-04-10 01:58:18 +02:00
Matt Rider
e584f3801a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-09 19:45:53 -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
17046f029c
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-10 00:43:59 +02:00
Robert Schäfer
2b6a18aa6d
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-10 00:42:18 +02:00
Robert Schäfer
607cee7f70
Merge branch 'master' into 2019/kw15/new_post_button_position 2019-04-10 00:41:58 +02:00
Robert Schäfer
8c937bcb2d
Merge branch 'master' into 2019/kw15/Access_Settings_from_Profile_as_Owner 2019-04-10 00:41:40 +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
89914f9a1a Disabling activityPub middleware again 
I thought it might be a good thing to create RSA keys at least for
cucumber testing. At least that's where we test activitityPub. But it
caused too flaky tests and broken builds. @Mastercuber if you need to
create a user and you need the RSA keys, don't create it through seeds
but through the actual server.
 2019-04-09 23:47:13 +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
92be747112
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-09 22:13:20 +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
98e7d28457
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-09 22:12:56 +02:00
Robert Schäfer
98138f2500
Merge branch 'master' into 2019/kw15/new_post_button_position 2019-04-09 22:10:04 +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
5c540b618e
Access Settings from Profile as Owner -> link was already present, but text was misleading (corrected), removed eslint exception 2019-04-09 13:24:00 +02:00
Ulf Gebhardt
5e28ef32ab
lint fixes 2019-04-09 11:14:41 +02:00
Ulf Gebhardt
03eb58ed3b
lint fixes 2019-04-09 11:13:19 +02:00
Ulf Gebhardt
93ab590903
lint fixes 2019-04-09 11:10:50 +02:00
Ulf Gebhardt
b235c640c5
lint fix 2019-04-09 11:09:03 +02:00
Ulf Gebhardt
bc868044ef
lint fix 2019-04-09 11:07:41 +02:00
Ulf Gebhardt
0664fc044c
added missing dependency moment 2019-04-09 11:03:28 +02:00
dependabot[bot]
6c43941429
Bump nodemon from 1.18.10 to 1.18.11 in /webapp 
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:54:12 +00:00