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
Robert Schäfer
d58076d0ff Consistency: Filename equals name of component 2019-04-10 18:53:46 +02:00
Robert Schäfer
79b29b25aa Check if String is accepted, too 2019-04-10 18:50:52 +02:00
Robert Schäfer
a7354a054e Fix test, remove vue-filter relativeDateTime 
cc @Tirokk @ulfgebhardt @appinteractive

This is a perfect example why I insist on writing tests. While debugging
@Tirokk and I discovered several design flaws and plugins that depend on
each other. The solution to all of this is not to use vue-filters plugin
at all! Vue-filters depends on Vuex, i18n, vuex-i18n, nuxt-modules and so
on.

This is just bad, bad, bad code. Start writing tests. Now.

We should start to refactor vue-filters and use components instead.
 2019-04-10 18:46:13 +02:00
Wolfgang Huß
68f0dde62f Refactored RelativeDateTime 
Removed timeouts for the sake of simplicity
 2019-04-10 17:29:03 +02:00
Wolfgang Huß
cc05ea11b5 Removed the responsability of the component "RelativeDateTime" to know if it is rendered in a browser 
cc @ulfgebhardt
 2019-04-10 16:46:32 +02:00
Wolfgang Huß
12fff83f27 Merge branch '2019/kw15/design_differences_post' of https://github.com/Human-Connection/Human-Connection into 2019/kw15/design_differences_post 2019-04-10 16:23:58 +02:00
Robert Schäfer
0be445afb6 Sketch component test for @Tirokk 2019-04-10 16:23:24 +02:00
Robert Schäfer
cec94bf381
Merge pull request #366 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/cli-7.4.3 
Bump @babel/cli from 7.2.3 to 7.4.3 in /backend
 2019-04-10 16:01:02 +02:00
Matt Rider
59e488f48a Merge branch '236-list-social-media-accounts' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-10 10:41:53 -03:00
Wolfgang Huß
c636d031be Refactored mutations "shout", "unshout" 
Formated "schema.graphql" for better readability.
"
 2019-04-10 15:24:58 +02:00
Robert Schäfer
4c808e135b Fix 400 error 
cc @mattwr18

What helped me to track down the problem was to compare the local
changes to master:

First, make it easy to compare with master:

1. `git fetch origin`
2. `git merge origin/master`
3. Resolve conflicts

Then track the error down:

1. `git checkout origin/master -- .`
2. `git reset`
3. Add more and more changes back and wait until the error shows up
  - `git checkout backend`
  - `git checkout webapp` bingo

See https://github.com/Human-Connection/Human-Connection/pull/237#issuecomment-481485741
 2019-04-10 15:20:43 +02:00
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
Wolfgang Huß
2feedc94e7 Refactored mutation "unfollow" 
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations
 2019-04-10 14:45:45 +02:00
Robert Schäfer
65076d24db
Merge pull request #196 from Human-Connection/dependabot/docker/backend/neo4j/neo4j-3.5.3 
Bump neo4j from 3.5.0 to 3.5.3 in /backend/neo4j
 2019-04-10 14:33:55 +02:00
dependabot[bot]
87c651e253 Bump @babel/cli from 7.2.3 to 7.4.3 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.2.3 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.2.3...v7.4.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-10 14:30:49 +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
Robert Schäfer
96d25bdc9d Display and test notification counter 2019-04-10 14:15:59 +02:00
Robert Schäfer
19d99bd4c0 Proper notification counter 2019-04-10 14:15:59 +02:00
Robert Schäfer
5b1348e6fb Refactor: Notification as a root component 2019-04-10 14:15:59 +02:00
Robert Schäfer
a0ef6b2dc3 Implement NotificationList with apollo 2019-04-10 14:15:59 +02:00
Robert Schäfer
8dd461d850 Implement NotificationList without store implement 2019-04-10 14:15:59 +02:00
Wolfgang Huß
6a01146647 Refactored mutation "follow" 
Done by @Tirokk and @mattwr18 .
 2019-04-10 14:11:13 +02:00
Robert Schäfer
8701b220c1 Implement first test case for NotificationList 2019-04-10 14:10:41 +02:00
Robert Schäfer
ead18a7554 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-10 14:09:55 +02:00
Robert Schäfer
0c8cc7380b Minimal implementation to let cypress test pass 2019-04-10 14:09:55 +02:00
Robert Schäfer
3ceb4373e3 Create a simple dropdown for notifications 2019-04-10 14:09:55 +02:00
Robert Schäfer
8475884338 Sketch 🥒 for #345 2019-04-10 14:09:55 +02:00
Robert Schäfer
8d77731bbf 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-10 14:09:55 +02:00
Robert Schäfer
a28da06a00
Merge pull request #445 from Human-Connection/346-mark_as_read 
Mark a notification in the backend as read
 2019-04-10 14:04:34 +02:00
Robert Schäfer
40c1f683ee
Merge pull request #442 from Human-Connection/dependabot/npm_and_yarn/webapp/nodemon-1.18.11 
Bump nodemon from 1.18.10 to 1.18.11 in /webapp
 2019-04-10 13:39:43 +02:00
Robert Schäfer
b6b000e805
Merge pull request #444 from Human-Connection/less_flaky_cucumbers 
Disabling activityPub middleware again
 2019-04-10 13:39:26 +02:00
Ulf Gebhardt
c70e6227ba
first implementation - unclear if specifications are correct 2019-04-10 13:35:24 +02:00
Robert Schäfer
56ed6260db
Merge branch 'master' into 2019/kw15/hide_all_unfuctional_content 2019-04-10 11:40:07 +02:00
Robert Schäfer
478c2cd271
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-10 11:39:57 +02:00
Robert Schäfer
8629b826b8
Merge branch 'master' into dependabot/npm_and_yarn/webapp/nodemon-1.18.11 2019-04-10 11:39:52 +02:00
Robert Schäfer
81b84916a3
Merge branch 'master' into less_flaky_cucumbers 2019-04-10 11:39:49 +02:00
Robert Schäfer
da2cfd4be3
Merge branch 'master' into 346-mark_as_read 2019-04-10 11:39:46 +02:00
Robert Schäfer
bbe36f3206
Merge pull request #446 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.2 
Bump graphql-shield from 5.3.1 to 5.3.2 in /backend
 2019-04-10 11:39:21 +02:00
Robert Schäfer
e61abed88c
Merge branch 'master' into 346-mark_as_read 2019-04-10 11:36:45 +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
Robert Schäfer
eab5d160f7
Merge branch 'master' into less_flaky_cucumbers 2019-04-10 11:29:06 +02:00
Wolfgang Huß
61c781c922 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations 2019-04-10 11:17:43 +02:00
Wolfgang Huß
587025e4d3 Start refactoring follow 2019-04-10 11:15:45 +02:00
Ulf Gebhardt
5d8da41bba
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-10 11:00:03 +02:00
dependabot[bot]
8d8c75d6c1
Bump graphql-shield from 5.3.1 to 5.3.2 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.1...v5.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-10 08:58:34 +00:00
Ulf Gebhardt
1c78e969c6
Merge branch 'master' into 2019/kw15/hide_all_unfuctional_content 2019-04-10 10:58:11 +02:00