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

125 Commits

Author SHA1 Message Date
Matt Rider
dd9383ef40 Create two custom resolvers, get working with front end 
- Had difficulty adding a relationship with one custom resolver, if id for comment was not passed in, the comment was not created, hard coding it in also wasn't a good solution
 2019-04-16 23:12:13 -03:00
Matt Rider
674cdddfc3 Add Editor, cancel/submit buttons for comments 
- to PagesPost_id_slugIndex.vue
- handle simple comment creation using auto-generated resolver

Co-authored-by: Joseph "Kachulio" Ngugi <jngugi88@gmail.com>
 2019-04-16 13:45:07 -03:00
Robert Schäfer
5c71bbdc6f
Merge pull request #467 from Human-Connection/dependabot/npm_and_yarn/webapp/v-tooltip-2.0.1 
Bump v-tooltip from 2.0.0 to 2.0.1 in /webapp
 2019-04-15 20:34:36 +02:00
Robert Schäfer
4409792c20
Merge pull request #468 from Human-Connection/dependabot/npm_and_yarn/webapp/@vue/cli-shared-utils-3.6.0 
Bump @vue/cli-shared-utils from 3.5.1 to 3.6.0 in /webapp
 2019-04-15 20:33:48 +02:00
dependabot[bot]
bd5b3f4ffb
Bump @vue/cli-shared-utils from 3.5.1 to 3.6.0 in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.6.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:55:09 +00:00
dependabot[bot]
2762b080a2
Bump v-tooltip from 2.0.0 to 2.0.1 in /webapp 
Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/Akryum/vue-tooltip/releases)
- [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-15 04:54:01 +00:00
Robert Schäfer
85973be5b0 Contribute German translations for social media 2019-04-12 18:00:25 +02:00
Robert Schäfer
c0bff47275 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-12 17:49:14 +02:00
Robert Schäfer
d3ff3ca241 Merge remote-tracking branch 'origin/master' into 342-merge_documentation 2019-04-12 14:48:27 +02:00
Ulf Gebhardt
39c6c97eda
Merge pull request #440 from Human-Connection/2019/kw15/design_differences_post 
2019/kw15/design_differences_post
 2019-04-12 14:14:24 +02:00
Robert Schäfer
216fc2b67c DRY + Better naming: Testing flavours and Github 
cc @mattwr18

I would suggest that each subfolder like `/backend/`, `/webapp/`,
`/deployment/` and so on should have a file README.md. Thus, not only
gitbook will pick it up but also Github itself. Github is looking for a
file called README.md when iterating through subfolders.
 2019-04-12 13:48:47 +02:00
Matt Rider
444f01f879 Refactor test, component 
- Remove redundant code
- change socialMediaUrl to add the attributes().href since that's the url
- grab last element of url as username, makes an assumption, but a safer one
 2019-04-12 08:34:06 -03:00
Robert Schäfer
627487629b Merge more READMEs 2019-04-12 13:28:10 +02:00
Robert Schäfer
5339aa72d1 Rename h1 section titles 
This is a great way to find out how Gitbook maps the title: Is it the
filename or the first section header?
 2019-04-12 11:19:17 +02:00
Ulf Gebhardt
34faf9b8b3
missing test case 'gibberish' for RelativeDateTime 2019-04-12 11:16:45 +02:00
Ulf Gebhardt
54bfb17e31
tests for tag & category, directory refactoring, lint fixes,more 2019-04-12 11:00:54 +02:00
Ulf Gebhardt
b7228648fc
fixed tests (missing dependency), fixed relativeDateTime language 2019-04-12 10:05:43 +02:00
Ulf Gebhardt
e6ee0477cf
Merge branch 'master' into 2019/kw15/design_differences_post 2019-04-12 09:36:21 +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
mattwr18
4383431260
GitBook: [342-merge_documentation] 56 pages and 14 assets modified 2019-04-11 22:12:37 +00:00
Matt Rider
0bec423a81 Delete/move documentation markdown files 2019-04-11 19:02:55 -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
Matt Rider
edd37db8fe Update frontend to display urls, update currentUser 2019-04-10 20:33:37 -03: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
Robert Schäfer
0be445afb6 Sketch component test for @Tirokk 2019-04-10 16:23:24 +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
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
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
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
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