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
3,916 Commits 5 Branches 2 Tags
Commit Graph

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
9929aa4626 Rnamed "sessionRes" to "transactionRes" 
Even in the rewards mutation.
 2019-04-12 08:41:53 +02:00
dependabot[bot]
783e8daef6
Bump v-tooltip from 2.0.0-rc.33 to 2.0.0 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0-rc.33 to 2.0.0.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/commits/v2.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-12 04:48:41 +00:00
Matt Rider
366c5d776b Fix lint 2019-04-11 22:28:18 -03:00
Matt Rider
1e4fad8425 Add cucumber scenario, component tests 2019-04-11 21:23:17 -03:00
Matt Rider
8f32df2597 Add translation, linkify avatar 2019-04-11 21:22:33 -03:00
Matt Rider
e9e6104699 Readd .github directory 
- deleted in the gitbook ui
 2019-04-11 19:16:19 -03:00
mattwr18
4383431260
GitBook: [342-merge_documentation] 56 pages and 14 assets modified 2019-04-11 22:12:37 +00:00
Matt Rider
9bede1913b Move .gitbook/assets to root level 
- contain images for the other markdown files
 2019-04-11 19:03:47 -03:00
Matt Rider
0bec423a81 Delete/move documentation markdown files 2019-04-11 19:02:55 -03:00
Matt Rider
4393c66a7e Add general installation instruction 2019-04-11 18:59:55 -03:00
Matt Rider
807642f91c Add Docker installation instructions 2019-04-11 18:20:37 -03:00
Matt Rider
6d703c73d1 Add Installation, assets directory 
- with screenshot of where to fork a repo
 2019-04-11 17:53:53 -03:00
Matt Rider
60c56f8872 Start adding social media card section to user profile 2019-04-11 16:38:31 -03:00
Matt Rider
9bdd0742c9 Update tests, start test driving new scenario 
- tests had become outdated thanks to new implementation details, namely that a socialMedia node is being created and associated with a user instead of it being an attribute of the User
- scenario to ensure other user's can view my social media
 2019-04-11 16:35:22 -03:00
Wolfgang Huß
95a0567e69 Query of users "publicKey" 'throws "Not Authorised!"' 
Changes password and permission middleware.

Thanks for your big help @roschaefer !
 2019-04-11 20:01:20 +02:00
Ulf Gebhardt
7e258bc3d3
basic stuff from alpha 2019-04-11 17:24:05 +02:00
Robert Schäfer
4a9a1b5aab
Merge pull request #448 from Human-Connection/dependabot/docker/backend/neo4j/neo4j-3.5.4 
Bump neo4j from 3.5.3 to 3.5.4 in /backend/neo4j
 2019-04-11 15:33:30 +02:00
Wolfgang Huß
6794156c86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-11 10:54:12 +02:00
dependabot[bot]
90752629e1
Bump neo4j from 3.5.3 to 3.5.4 in /backend/neo4j 
Bumps neo4j from 3.5.3 to 3.5.4.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-11 04:54:37 +00:00
Matt Rider
edd37db8fe Update frontend to display urls, update currentUser 2019-04-10 20:33:37 -03:00
Robert Schäfer
e3f3e081cc
Merge pull request #416 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.6.1 
Bump nuxt from 2.4.5 to 2.6.1 in /webapp
 2019-04-10 19:49:20 +02:00
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