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

5504 Commits

Author SHA1 Message Date
Robert Schäfer
102a03f552 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-10 15:17:18 +02:00
dependabot[bot]
9bf9b62485 Bump nuxt from 2.4.5 to 2.6.1 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.4.5 to 2.6.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.4.5...v2.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-10 14:51:01 +02:00
Ulf Gebhardt
9261067273
lint fixes 2019-04-10 14:30:18 +02:00
Ulf Gebhardt
6961f50b78
removed moment lib, added readme for RelativeDateTime & moved it to subdirectory 2019-04-10 14:26:55 +02:00
Robert Schäfer
87fbdb576d
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-10 14:22:13 +02:00
Ulf Gebhardt
d28ef3e7c4
Merge pull request #434 from Human-Connection/2019/kw15/hide_all_unfuctional_content 
2019/kw15/hide_all_unfuctional_content
 2019-04-10 14:17:58 +02:00
Ulf Gebhardt
c70e6227ba
first implementation - unclear if specifications are correct 2019-04-10 13:35:24 +02:00
Robert Schäfer
1f8c91f2d4
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-10 11:35:10 +02:00
Ulf Gebhardt
5d8da41bba
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-10 11:00:03 +02:00
Ulf Gebhardt
1c78e969c6
Merge branch 'master' into 2019/kw15/hide_all_unfuctional_content 2019-04-10 10:58:11 +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
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
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
92be747112
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-09 22:13:20 +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
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
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
Matt Rider
4de8407620 Rename variable, mutation 
- result is not a good name in this case because we know what is coming back, the result is a socialMedia node
- update the mutation name in the front end
 2019-04-08 12:05:57 -03:00
Matt Rider
a1ebb89d64 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-08 11:57:35 -03:00
Ulf Gebhardt
0e09b0fb74
fixed design differences between alpha & nitro - Post Page 
- [X] Title and Author Position reversed
- [X] Design & Format of Post-Date + Position
- [X] No Category Names
- [X] Actions/Reactions & Tags reversed
 2019-04-08 15:53:00 +02:00
Ulf Gebhardt
e51fd361ed
fixed position of new post button to fit all devices and be completely visible at any time 2019-04-08 12:45:03 +02: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
Ulf Gebhardt
1f31c29552
make post sticky - fixes https://github.com/Human-Connection/Human-Connection/issues/385 2019-04-08 11:39:39 +02:00
Ulf Gebhardt
5d1cb43e8c
hide all unfunctional content - fixes https://github.com/Human-Connection/Human-Connection/issues/429 2019-04-08 10:48:04 +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
Matt Rider
4d4978c0f2 Merge github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-05 07:29:44 -03: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
38949ac9b4
Merge pull request #391 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-24.7.1 
Bump babel-jest from 24.6.0 to 24.7.1 in /webapp
 2019-04-04 12:49:45 +02:00
dependabot[bot]
8bd437be07
Bump babel-jest from 24.6.0 to 24.7.1 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.6.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/commits/v24.7.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-04 09:00:25 +00:00