ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
senderfm
dba719ea1c english translation changes undone. 2019-06-12 12:54:33 +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
Robert Schäfer
45fc604c25
Merge pull request #797 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.8 
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend
 2019-06-12 10:27:45 +02:00
Robert Schäfer
c2bcc9f595
Merge pull request #754 from Human-Connection/402-userprofil-tab-click-function 
402 userprofil tab click function
 2019-06-12 10:24:41 +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
dependabot-preview[bot]
78607dfd0e
Bump graphql-shield from 5.3.7 to 5.3.8 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.7 to 5.3.8.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.7...v5.3.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-12 04:56:09 +00:00
Robert Schäfer
90107cfb18
Merge pull request #789 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-1.18.2 
Bump prettier from 1.17.1 to 1.18.2 in /backend
 2019-06-11 23:44:00 +02:00
Robert Schäfer
54c7c204c2 Run yarn run lint --fix 2019-06-11 23:10:26 +02: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
fc8792e7af Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-11 15:48:43 -03:00
Matt Rider
f80173697c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-11 15:48:00 -03: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
mattwr18
d010b62985
Merge pull request #796 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-5.3.7 
Bump graphql-shield from 5.3.6 to 5.3.7 in /backend
 2019-06-11 08:35:34 -03:00
dependabot-preview[bot]
db37d085f8
Bump graphql-shield from 5.3.6 to 5.3.7 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.6 to 5.3.7.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.6...v5.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-11 04:51:32 +00: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
Matt Rider
c889dc1785 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 
upstream into a topic branch.
 2019-06-10 08:12:56 -03:00
dependabot-preview[bot]
f18ae14741
Bump prettier from 1.17.1 to 1.18.2 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 1.17.1 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.17.1...1.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-10 11:12:27 +00: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
mattwr18
0f78fdcfa5
Merge pull request #790 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.4 
Bump tippy.js from 4.3.3 to 4.3.4 in /webapp
 2019-06-10 08:10:05 -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
0259eeee66
Merge pull request #771 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.2 
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend
 2019-06-08 11:48:23 -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
dependabot-preview[bot]
f0a4149b9e
Bump apollo-cache-inmemory from 1.6.1 to 1.6.2 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.1 to 1.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-cache-inmemory@1.6.1...apollo-cache-inmemory@1.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-07 22:07:23 +00:00
mattwr18
a0f9e90ce2
Merge pull request #783 from Human-Connection/remove_unnecessary_dependency_ms 
Replace dependency `ms` completely
 2019-06-07 19:06:11 -03:00
Robert Schäfer
ceaab92d19
Merge pull request #772 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.2 
Bump apollo-client from 2.6.1 to 2.6.2 in /webapp
 2019-06-08 00:05:12 +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
7bbf870d8d Clean up of backend tests 
- changed variable name, remove unneeded beforeEach
 2019-06-07 16:03:02 -03:00