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

638 Commits

Author SHA1 Message Date
Robert Schäfer
f9d25828d5 Add reset password page 2019-06-15 11:47:24 +02:00
Robert Schäfer
64c5245f5a Update date-fns manually to get passed this bug: 
```
 ERROR  Failed to compile with 16 errors

This dependency was not found:

* date-fns/addSeconds in ./plugins/vue-filters.js

To install it, you can run: npm install --save date-fns/addSeconds

These relative modules were not found:

* ../../../../_lib/isSameUTCWeek/index.js in ./node_modules/date-fns/esm/locale/be/_lib/formatRelative/index.js, ./node_modules/date-fns/esm/locale/lv/_lib/formatRelative/index.js and 4 others
* ../_lib/format/formatters/index.js in ./node_modules/date-fns/format/index.js
* ../_lib/format/longFormatters/index.js in ./node_modules/date-fns/format/index.js
* ../_lib/getTimezoneOffsetInMilliseconds/index.js in ./node_modules/date-fns/format/index.js, ./node_modules/date-fns/formatRelative/index.js
* ../_lib/protectedTokens/index.js in ./node_modules/date-fns/format/index.js
* ../_lib/toInteger/index.js in ./node_modules/date-fns/format/index.js, ./node_modules/date-fns/subMilliseconds/index.js
* ../addMilliseconds/index.js in ./node_modules/date-fns/subMilliseconds/index.js
* ../differenceInCalendarDays/index.js in ./node_modules/date-fns/formatRelative/index.js
ℹ Waiting for file changes
```
 2019-06-15 11:25:01 +02:00
Matt Rider
35878d3fa9 Merge branch 'dependabot/npm_and_yarn/webapp/tiptap-1.21.0' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.21.0 2019-06-14 17:24:18 -03:00
Wolfgang Huß
23185fa29e Fix a problem in PostMutations.js which came in through merging the master 2019-06-14 20:25:25 +02:00
Wolfgang Huß
68dcbacaff Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/components/ContributionForm/index.vue
#	webapp/graphql/PostMutations.js
 2019-06-14 19:02:33 +02:00
Wolfgang Huß
0b0fd6e825 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/post/_id/_slug/index.vue
#	webapp/pages/profile/_id/_slug.vue
 2019-06-14 18:56:02 +02:00
mattwr18
dd627535e4
Merge pull request #795 from Human-Connection/781-language-of-contribution 
Create Posts with a specified language, or fallback
 2019-06-14 13:53:22 -03:00
Wolfgang Huß
736dc7d601 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 2019-06-14 18:46:44 +02:00
Wolfgang Huß
472bfc2a88 Used PostMutations in PostHelpers now 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-14 18:44:56 +02:00
Matt Rider
1c10e0863f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-14 13:31:39 -03:00
Matt Rider
614a7eebc1 Refactor ContributionForm to deal with posts with no languages 2019-06-14 13:30:00 -03:00
Matt Rider
57b2b6a864 Merge branch '404-delete-user-account-and-data' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:38:08 -03:00
Matt Rider
664a8b327f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:37:45 -03:00
Wolfgang Huß
3af6f4e822 Little german approvements … 2019-06-14 14:42:30 +02:00
Robert Schäfer
d8621c6a31
Merge pull request #828 from Human-Connection/821-follow_up 
Follow up on #820
 2019-06-14 11:41:00 +02:00
Wolfgang Huß
58b36372b9 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js

Defined missing `$filter.truncate` which made console errors in the webapp Jest test.
 2019-06-14 11:11:22 +02:00
Wolfgang Huß
45bd1299ce Rewrote the PostHelpers and put them in a utils folder 2019-06-14 10:37:43 +02:00
Robert Schäfer
76e0d7ef06 Follow up on #820 
I forgot the most important part: Proxy teaser image urls.
 2019-06-14 09:59:46 +02:00
dependabot-preview[bot]
514694a3b2
Bump date-fns from 2.0.0-alpha.32 to 2.0.0-alpha.33 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.32 to 2.0.0-alpha.33.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.32...v2.0.0-alpha.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-14 05:00:56 +00:00
mattwr18
82769634c6
Merge pull request #815 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-alpha.32 
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /webapp
 2019-06-13 21:17:03 -03:00
Matt Rider
a099c209a8 Fix cypress tests 2019-06-13 19:54:47 -03:00
Matt Rider
5266de2c62 Set dropdown with language of post if exists 
follow `PR` review by @Tirokk
 2019-06-13 17:29:33 -03:00
Matt Rider
306da8a4e3 Revert _slug.vue to master 2019-06-13 16:05:20 -03:00
Matt Rider
3c3db87c1b Add back deleted translations 
- mistakenly deleted when working through merge conflict
 2019-06-13 15:34:45 -03:00
Wolfgang Huß
482ac1572b Refactored and created the tests of DeletePostCallback 
Created a folder `utils` for PostHelpers.js.
Fixed a new incoming problem of the master with deleting Posts on the User Profile.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-13 19:23:13 +02:00
Robert Schäfer
b8c5db48a6 Implement prefix of image urls with a filter 
Fix #820

Ok, so after I would have to use the same method in three different
locations (`<ds-card>` expects an `image` attribute but cannot render
entire components) I decided to implement the prefix of image urls with
a filter rather than a component. The downside of this is that we have
to add the filter on a lot of component tests. The benefit is less
components and hopefully less complexity.
 2019-06-13 16:56:41 +02:00
dependabot-preview[bot]
e7b42736ca
Bump date-fns from 2.0.0-alpha.31 to 2.0.0-alpha.32 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.31 to 2.0.0-alpha.32.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.31...v2.0.0-alpha.32)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 04:56:18 +00:00
Matt Rider
3ab69b5fde Improve mobile responsiveness 2019-06-12 19:44:09 -03:00
Matt Rider
8d72532098 Fix test, import locales 
Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-06-12 19:29:51 -03:00
Matt Rider
97e8fa1af8 Style, update languageOptions to contain all 
- languages we support for translations
 2019-06-12 18:08:20 -03:00
Matt Rider
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03:00
Matt Rider
aa6551e35d Remove comments 2019-06-12 15:59:33 -03:00
Matt Rider
70567857e8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-12 15:51:38 -03:00
Matt Rider
83c7773d1b Add checkboxes to delete posts/comments 
- fix tests
- rename files/directory to DeleteData to be more accurate
 2019-06-12 15:07:16 -03:00
Wolfgang Huß
cd0074ec86 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js
#	webapp/pages/profile/_id/_slug.vue
 2019-06-12 18:22:50 +02:00
Wolfgang Huß
8bb33f23a9 Forgot to add some files 2019-06-12 18:04:00 +02:00
Wolfgang Huß
1339734281 Rename DeleteModal to ConfirmModel and write some refactor some tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 18:02:50 +02:00
Wolfgang Huß
8eb089d218 Rename event deletePost to removePostFromList 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 15:58:23 +02:00
Robert Schäfer
ebe951f05b Update tiptap to 1.21.0 2019-06-12 10:43:44 +02:00
Robert Schäfer
fa5b16ddd5
Merge pull request #798 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.22.2 
Bump tiptap-extensions from 1.22.1 to 1.22.2 in /webapp
 2019-06-12 10:28:14 +02:00
Wolfgang Huß
1c6016ddcc Refactored the PostHelpers to an imported lib instead a mixin 2019-06-12 09:05:43 +02:00
dependabot-preview[bot]
1c614cc009
Bump tiptap-extensions from 1.22.1 to 1.22.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.22.1 to 1.22.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.22.1...tiptap-extensions@1.22.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-12 05:00:32 +00:00
Robert Schäfer
8beba9c8b2 Remove obsolete translations 
@ogerly I saw that you added tooltips to the menu bars. However, it is
not "Your posts" that you see there, it's the posts of the user whose
profile you are looking at.

As a fix, I removed the tooltips in an earlier merge commit, because I think
they don't improve user experience here.
 2019-06-11 23:01:26 +02:00
Matt Rider
4407d6648a Add component tests, translations 2019-06-11 15:47:10 -03:00
Robert Schäfer
5eaac8b077 Document loading spinner implementation with test 
Because it's slightly odd how I avoid a duplicate loading spinner, I
 thought this is a good target for a test.
 2019-06-11 18:48:01 +02:00
Robert Schäfer
d1364e4aed Merge remote-tracking branch 'origin/master' into 402-userprofil-tab-click-function 2019-06-11 17:41:17 +02:00
Matt Rider
5986ab2070 Create Posts with a specified language, or fallback 2019-06-10 17:12:00 -03:00
Matt Rider
ccce29512e Fix styling 2019-06-10 14:53:10 -03:00
Matt Rider
507890a7aa Add CSS styling to danger message box 
- lost the CSS when removed buefy
 2019-06-10 14:11:44 -03:00
Matt Rider
1c506bd21c Merge in master, follow PR review suggestions 
- @roschaefer suggested to 'Ask the user to type in the name of the resource that should be destroyed'
- he also showed concern for setting `wrapper.setData({ deleteEnabled: true })`, this commit allows interaction in the component tests with the input field that sets deleteEnabled to true if it matches the resource that should be destroyed
- this `PR` also removes the use of buefy and it's underlying bulma since we don't need a switch or check boxes
- german translations have also been added
 2019-06-10 13:36:08 -03:00