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

1087 Commits

Author SHA1 Message Date
Robert Schäfer
aa6855434d Emit submitted from PasswordReset component 2019-06-17 15:20:02 +02:00
Robert Schäfer
0e3eb43276 Split PasswordResetPage into subcomponents 2019-06-17 15:20:02 +02:00
Matt Rider
35428fbaaa Add test for LocaleSwitch 2019-06-17 10:07:53 -03:00
Matt Rider
01eb25eca6 Update CommentForm with vuex 2019-06-15 16:15:49 -03:00
Matt Rider
4adc450f43 Fix failing test 
- add Vuex, with editor/placeholder getter
 2019-06-15 15:53:30 -03:00
Matt Rider
e583486143 Set up editor placeholder to use Vuex 
- to make reactive
- safer than using global event buses ($root.$emit)

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-06-15 15:23:51 -03:00
mattwr18
53ce72908b
Merge pull request #833 from Human-Connection/832-fix-empty-placeholder-new-contributions 
Add placeholder for new contributions
 2019-06-15 08:52:23 -03:00
mattwr18
54ca9a6e0c
Merge pull request #831 from Human-Connection/804-turn-root-listener-off 
Turn off $root listeners in beforeDestroy
 2019-06-15 08:51:54 -03:00
Matt Rider
ebb73c8782 Add placeholder for new contributions 2019-06-14 17:18:09 -03: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
Matt Rider
7d00b73530 Turn off $root listeners in beforeDestroy 2019-06-14 14:02:22 -03: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
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ß
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
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
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
ALau2088
d91221fe7e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-13 10:22:25 -07: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
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
Wolfgang Huß
1c6016ddcc Refactored the PostHelpers to an imported lib instead a mixin 2019-06-12 09:05:43 +02:00
Matt Rider
4407d6648a Add component tests, translations 2019-06-11 15:47:10 -03: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
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
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
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
Matt Rider
70aa77bd2e Get user deletion working from UI 2019-06-07 13:37:59 -03:00