IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-14 08:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,490 Commits 5 Branches 2 Tags
Commit Graph

2500 Commits

Author SHA1 Message Date
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
mattwr18
14041ff396
Merge pull request #794 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.18.2 
Bump prettier from 1.18.0 to 1.18.2 in /webapp
 2019-06-10 08:12:00 -03:00
mattwr18
8c247e1b72
Merge pull request #793 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.22.1 
Bump tiptap-extensions from 1.21.0 to 1.22.1 in /webapp
 2019-06-10 08:11:27 -03:00
mattwr18
8f149c9751
Merge pull request #792 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.16 
Bump cookie-universal-nuxt from 2.0.14 to 2.0.16 in /webapp
 2019-06-10 08:10:50 -03:00
dependabot-preview[bot]
d85f63078f
Bump prettier from 1.18.0 to 1.18.2 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.18.0 to 1.18.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.18.0...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:55:09 +00:00
dependabot-preview[bot]
46ccaf6b95
Bump tiptap-extensions from 1.21.0 to 1.22.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.21.0 to 1.22.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.21.0...tiptap-extensions@1.22.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:54:10 +00:00
dependabot-preview[bot]
3461de56f8
Bump cookie-universal-nuxt from 2.0.14 to 2.0.16 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.14 to 2.0.16.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.14...v2.0.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:53:37 +00:00
dependabot-preview[bot]
8226c900fd
Bump tippy.js from 4.3.3 to 4.3.4 in /webapp 
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 04:52:38 +00:00
ALau2088
ae9d508ada Revise "updated":"Changes Saved" 2019-06-08 15:59:15 -07:00
ALau2088
22f166adac merge upstream/552-update_comment 2019-06-08 15:55:51 -07:00
Matt Rider
a110a067fa Add teaser image to contribution form 2019-06-08 14:24:55 -03:00
mattwr18
75fa7af5d8
Merge pull request #780 from Human-Connection/add_translations_to_user_profile 
Translate network tab on the left profile page
 2019-06-08 11:45:39 -03:00
Robert Schäfer
15b7043d00 Write a test for "load more" button 
The crucial test is still missing: Write a test to check that no more
than one loading spinner is visible all the time.

@Tirokk FYI I wrote a page component test and made sure that the test
will also fail if the implementation is broken.
 2019-06-08 01:50:08 +02:00
Matt Rider
409b626425 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-07 19:11:21 -03:00
mattwr18
d32f577c8c
Update en.json 2019-06-07 19:08:40 -03:00
Matt Rider
e542a8dc83 Make mobile responsive 2019-06-07 18:46:39 -03:00
Matt Rider
eb45e68896 Fix lint 2019-06-07 18:17:15 -03:00
Matt Rider
18d3e36c19 Write component tests, move header close to icon 2019-06-07 18:13:49 -03:00
senderfm
f6af85c93c Language Packs Spanish and French current status 2019-06-07 20:33:16 +02:00
Matt Rider
70aa77bd2e Get user deletion working from UI 2019-06-07 13:37:59 -03:00
Wolfgang Huß
b2e1873ade Refactored to modalData for Delete Comment and Posts 
The error is gone with this.
 2019-06-07 18:04:12 +02:00
Matt Rider
fcb5ab8f1e Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-07 12:14:12 -03:00
Robert Schäfer
9384f85ebf Use jest's expectation matchers if possible 
@Tirokk jest has a lot of assertion matchers that will give you better
error messages than the default ones:
https://jestjs.io/docs/en/expect.html#tohavelengthnumber
 2019-06-07 16:53:30 +02:00
Matt Rider
6e420d68d1 Improved UI 
- add buefy for slider and checkboxes
- update/translate text
- add warning
- transition
 2019-06-07 10:16:55 -03:00
dependabot-preview[bot]
9bccf2b849
Bump apollo-client from 2.6.1 to 2.6.2 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.1...apollo-client@2.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 12:39:39 +00:00
Robert Schäfer
94ea9c9530 Fix lint 2019-06-07 13:48:59 +02:00
Robert Schäfer
54ef104f62
Merge pull request #766 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.18.0 
Bump prettier from 1.17.1 to 1.18.0 in /webapp
 2019-06-07 13:20:10 +02:00
Robert Schäfer
7ab6ce4ed2 Fix typo in translation keys 2019-06-07 13:10:04 +02:00
Robert Schäfer
a06733fbfd Translate network tab on the left profile page 2019-06-07 13:01:47 +02:00
dependabot-preview[bot]
4194c6f3c1
Bump date-fns from 2.0.0-alpha.29 to 2.0.0-alpha.31 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.29 to 2.0.0-alpha.31.
- [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.29...v2.0.0-alpha.31)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 04:57:42 +00:00
dependabot-preview[bot]
1627655c64
Bump prettier from 1.17.1 to 1.18.0 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 to 1.18.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.17.1...1.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 04:56:04 +00:00
Robert Schäfer
574b42a2a7 "commentedCount" is different from "commentsCount" 
One is how many comments you wrote, one is how many **posts** are there
with at least one comment of you.

E.g. you can comment twice on the same post. You will have a
`commentedCount` increase of 1 but a `commentsCount` of 2.

FYI @ogerly @Tirokk
 2019-06-07 01:39:09 +02:00
Robert Schäfer
d3a70321b8 Show a loading spinner for better UX 2019-06-07 01:39:09 +02:00
Robert Schäfer
de0bcd949a Fix test 2019-06-07 01:39:09 +02:00
Robert Schäfer
08778f3798 Remove unnecessary refetching 
First of all this removes a bug, but it also shows that apollo triggers
the rerendering of dependent components.

FYI @mattwr18
 2019-06-07 01:38:02 +02:00
Robert Schäfer
c9ef1bc5ce Implement switching of tabs and updating list 2019-06-07 01:38:02 +02:00
Robert Schäfer
4278c75d52 Refactor profile page, separate requests 2019-06-06 23:31:27 +02:00
senderfm
92241576b3 Implement active Tabs 2019-06-06 19:34:28 +02:00
mattwr18
bc8dd22a91
Merge pull request #762 from Human-Connection/refactor_filter_bubble 
Refactor filter bubble
 2019-06-06 14:18:00 -03:00
Matt Rider
ffa15bf728 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-06 14:15:02 -03:00
Matt Rider
f53d091691 Add error handling component tests 2019-06-06 13:50:10 -03:00
Matt Rider
cbd78a34dc Merge branch 'master' of github.com:Human-Connection/Human-Connection into refactor_filter_bubble 2019-06-06 13:36:24 -03:00
Matt Rider
55458abbff Merge branch 'master' of github.com:Human-Connection/Human-Connection into undo_location_reload 2019-06-06 12:36:08 -03:00
Wolfgang Huß
f944142e4b Very first approach to resolve callback problem in direction of customization of Modals 2019-06-06 16:33:35 +02:00
Robert Schäfer
ab719eca3e
Merge pull request #732 from Human-Connection/688-hover-effect-user-image-upload 
Hover effect user image upload
 2019-06-06 15:54:50 +02:00
Robert Schäfer
55cfb99a06
Merge pull request #742 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.3 
Bump tippy.js from 4.3.2 to 4.3.3 in /webapp
 2019-06-06 15:52:49 +02:00
Robert Schäfer
46288858ac
Merge pull request #756 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.4 
Bump @nuxtjs/axios from 5.5.3 to 5.5.4 in /webapp
 2019-06-06 15:52:20 +02:00