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

5716 Commits

Author SHA1 Message Date
mattwr18
538b2b77de Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 14:21:12 +02:00
Robert Schäfer
a7042c5fbc
Merge pull request #1461 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.2.0 
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /webapp
 2019-09-04 14:12:05 +02:00
dependabot-preview[bot]
58d2a8e996
Bump nodemon from 1.19.1 to 1.19.2 in /webapp 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.1...v1.19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:54:56 +00:00
dependabot-preview[bot]
4decb2c60a
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:53:48 +00:00
mattwr18
25bd96eedf Remove package-lock.json 
- we are using yarn as a package manager
 2019-09-04 10:58:33 +02:00
mattwr18
b3964a1439 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 10:46:44 +02:00
mattwr18
fdee7efa03 Fix lint 2019-09-04 08:12:11 +02:00
ogerly
643b931167 Merge branch 'C-1187-terms-and-conditions-confirmed-function' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 07:04:17 +02:00
ogerly
c64ff67a55 Fixed constant for terms and conditions created in folder for constant 2019-09-04 07:03:56 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
dependabot-preview[bot]
7bb52343f1
Bump cross-env from 5.2.0 to 5.2.1 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-03 22:02:27 +00:00
mattwr18
290bdf5ff4
Merge pull request #1440 from Human-Connection/1414-soft_delete 
1414 Implement soft delete
 2019-09-03 23:59:52 +02:00
roschaefer
5f14b4c45f Fix lint 2019-09-03 23:19:55 +02:00
mattwr18
9bb0884f89 Follow @alina-beck's PR suggestions 
- save regex to descriptive variables
 2019-09-03 22:10:02 +02:00
roschaefer
99dd6ea20a Centralize fragments, fix @mattwr18's bugs 
Most of those bugs weren't even introduced in this PR, e.g. the missing
`this.$i18n` for the comments mutations.
 2019-09-03 21:28:29 +02:00
roschaefer
bb3f419532 Refactor graphql queries and fix bug 
It's sometimes unbelievable how many bugs you find when doing
refactoring. This time there was some apparent confusion about
`commentsCount` and `commentedCount`. The counters on the post card were
never showing the correct number.
 2019-09-03 21:28:29 +02:00
roschaefer
933e092549 Fix frontend tests 2019-09-03 21:28:29 +02:00
roschaefer
491a626031 Replace deleteComment with a more KISS solution 2019-09-03 21:28:29 +02:00
mattwr18
31862ad7d8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-03 19:00:28 +02:00
Robert Schäfer
649c51c705
Merge pull request #1452 from Human-Connection/separate-text-at-words 
Use hyphens to separate words properly
 2019-09-03 18:12:02 +02:00
mattwr18
2d9cd96867 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-03 17:44:53 +02:00
Alina Beck
f34ff188eb disable scrolling behind popover 2019-09-03 11:44:22 +01:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
ogerly
1b9303ceaf Jest tests for the Terms and Conditions in frontend and backend 2019-09-03 09:46:18 +02:00
Alina Beck
0fd0cdbe34 separate post title and content with hyphens 2019-09-02 16:46:41 +01:00
Matt Rider
accb8ae505 Follow @alina-beck's suggestions 
- set items to the full list of hashtags or users to avoid unnecessarily reassigning the items variable based on suggestionType
- refactor tests to trigger onFilter, which calls filterSuggestionList, then check that it returns a maximum of 15 items both for queries and empty queries
- fix description with incorrect type(users, instead of hashtags)
- return 15 items, not 14
 2019-09-02 15:43:18 +02:00
Matt Rider
d1309d2b8f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-02 12:51:11 +02:00
Matt Rider
cf10b650ae Limit suggestions list to 15, add component tests 2019-09-02 10:42:37 +02:00
roschaefer
98194ef54a Follow @mattwr18's suggestions 2019-08-30 16:00:32 +02:00
roschaefer
30a95e5713 Fix lint 2019-08-30 16:00:32 +02:00
roschaefer
cbcba8f08d Follow @Tirokk's suggestion 2019-08-30 16:00:32 +02:00
roschaefer
66b12090a7 Fix cypress tests 2019-08-30 16:00:32 +02:00
roschaefer
f635b0cbd5 Fix frontend tests 2019-08-30 16:00:32 +02:00
roschaefer
c585b23d7a Fix notification queries in webapp 2019-08-30 16:00:32 +02:00
Robert Schäfer
080288d0bc
Merge pull request #1431 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-node-9.2.0 
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /webapp
 2019-08-30 15:47:00 +02:00
Alexander Friedland
a8e1583481
_err remove 2019-08-30 14:15:38 +02:00
Robert Schäfer
0a5052ba96
Merge pull request #1397 from Human-Connection/performance-improvement 
Check there are ids in the badIds array
 2019-08-30 14:08:13 +02:00
mattwr18
f275799856
Merge pull request #1351 from Human-Connection/1333-fix_checks_for_deleted_and_disabled 
Fix database import, pagination and counters on user profile page
 2019-08-30 13:51:41 +02:00
dependabot-preview[bot]
ba65848070
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /webapp 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.1.0 to 9.2.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.1.0...v9.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 11:40:29 +00:00
Robert Schäfer
c620bec10f
Merge pull request #1434 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-8.0.0 
Bump sass-loader from 7.3.1 to 8.0.0 in /webapp
 2019-08-30 13:38:28 +02:00
Robert Schäfer
5dff0c0396
Merge pull request #1435 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.16.0 
Bump eslint-plugin-jest from 22.15.2 to 22.16.0 in /webapp
 2019-08-30 13:38:03 +02:00
Robert Schäfer
ea2c5904fa
Merge pull request #1436 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-izitoast-1.2.1 
Bump vue-izitoast from 1.2.0 to 1.2.1 in /webapp
 2019-08-30 13:37:47 +02:00
ogerly
27e7bf6279 Cypress tests ok ,terms and conditions after hard work ready to merge 2019-08-30 09:51:00 +02:00
Wolfgang Huß
03e5374ab7 Shorten hashtags in suggestion menu 2019-08-30 08:42:31 +02:00
Matt Rider
cf60397477 Fix failing cypress test, add steps 
- Added step to expose the search feature was completely broken after my latest commit.
- when a user blocks another user, the search functionality just stopped working.
- reverted changes to @roschaefer hacky fix of the search functionality
 2019-08-30 07:47:57 +02:00
Matt Rider
42018f0bf4 Merge branch 'master' of github.com:Human-Connection/Human-Connection into performance-improvement 2019-08-30 07:17:19 +02:00
dependabot-preview[bot]
86d0157cee
Bump graphql from 14.5.3 to 14.5.4 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.3 to 14.5.4.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.3...v14.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 04:23:53 +00:00
dependabot-preview[bot]
25b7ccfee8
Bump vue-izitoast from 1.2.0 to 1.2.1 in /webapp 
Bumps [vue-izitoast](https://github.com/arthurvasconcelos/vue-izitoast) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/arthurvasconcelos/vue-izitoast/releases)
- [Changelog](https://github.com/arthurvasconcelos/vue-izitoast/blob/master/CHANGELOG.md)
- [Commits](https://github.com/arthurvasconcelos/vue-izitoast/compare/1.2.0...1.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 04:23:22 +00:00
dependabot-preview[bot]
9af97105ba
Bump eslint-plugin-jest from 22.15.2 to 22.16.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.2 to 22.16.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.15.2...v22.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 04:22:37 +00:00
dependabot-preview[bot]
f75096394d
Bump sass-loader from 7.3.1 to 8.0.0 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.3.1 to 8.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.3.1...v8.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 04:21:59 +00:00