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

1350 Commits

Author SHA1 Message Date
Wolfgang Huß
0bc4c558ae Refactore the import and hashtags to all unicode characters 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-29 17:02:02 +02:00
Robert Schäfer
2070a49b64
Merge pull request #1406 from Human-Connection/fix-editor-bugs 
Fix Editor Bugs
 2019-08-28 23:55:31 +02:00
Alina Beck
9b405377f9 fix input height in all browsers 2019-08-28 20:16:17 +01:00
Robert Schäfer
079ced0593
Merge pull request #1400 from Human-Connection/1391-fix-bug-where-apollo-cache-not-updated-on-comment-deletion 
Update the apollo cache
 2019-08-28 19:37:59 +02:00
dependabot-preview[bot]
acd9dbf6b5
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /webapp 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 18:17:05 +00:00
Alina Beck
6e5ee7ea87
Merge branch 'master' into fix-editor-bugs 2019-08-27 16:45:36 +01:00
Alina Beck
604789b32e check for empty values 2019-08-27 16:37:28 +01:00
Alina Beck
10e11a4e9b style suggestion lists 2019-08-27 16:14:52 +01:00
Alina Beck
d28864ab73 just focus on input if there is one 2019-08-27 15:41:04 +01:00
Robert Schäfer
0bf0ca0b8d
Merge pull request #1398 from Human-Connection/fix-deprecation-warnings 
Update to use <client-only> instead of <no-ssr>
 2019-08-27 16:00:09 +02:00
Robert Schäfer
8a729122c3
Merge pull request #1270 from Human-Connection/1062-notification-about-comment-on-post 
🍰 1062 notification about comment on post
 2019-08-27 15:59:46 +02:00
mattwr18
fbf2f05e00
Merge pull request #1381 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.1 
Bump date-fns from 2.0.0 to 2.0.1 in /webapp
 2019-08-27 15:20:39 +02:00
Alina Beck
a1c402ce8d style editor input field 2019-08-27 13:36:00 +01:00
Matt Rider
470da18381 Revert to using async/await, follow @appinteractive PR suggestions 2019-08-27 09:55:05 +02:00
Matt Rider
ed76482daa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1391-fix-bug-where-apollo-cache-not-updated-on-comment-deletion 2019-08-27 09:25:09 +02:00
Matt Rider
6976336ef0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into fix-deprecation-warnings 2019-08-27 09:20:27 +02:00
Matt Rider
c8b5779f87 Upgrade nuxt 
- for some reason there were two versions of vue-client-only in the yarn.lock, one old version which was blocking it from passing the build, and a newer one based on the use of <client-only>, upgrading nuxt sorted out the yarn.lock
 2019-08-27 09:16:41 +02:00
mattwr18
fa7d76b316
Merge pull request #1404 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc12 
Bump @nuxtjs/apollo from 4.0.0-rc11 to 4.0.0-rc12 in /webapp
 2019-08-27 09:10:37 +02:00
dependabot-preview[bot]
8b3dc2052a
Bump date-fns from 2.0.0 to 2.0.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0 to 2.0.1.
- [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...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 07:07:59 +00:00
mattwr18
3b08dbe939
Merge pull request #1386 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-3.0.0 
Bump eslint-loader from 2.2.1 to 3.0.0 in /webapp
 2019-08-27 09:07:25 +02:00
mattwr18
27871d16f6
Merge pull request #1401 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-utils-1.4.2 
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /webapp
 2019-08-27 08:34:29 +02:00
dependabot-preview[bot]
f852da7273
Bump @nuxtjs/apollo from 4.0.0-rc11 to 4.0.0-rc12 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc11 to 4.0.0-rc12.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.11...v4.0.0-rc.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 04:22:50 +00:00
mattwr18
4023849600
Merge pull request #1376 from Human-Connection/fix-infinite-loading 
Fix infinite-loading infinitely loading
 2019-08-26 21:44:19 +02:00
dependabot-preview[bot]
ab79f3c633
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /webapp 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes a security fix.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 18:21:42 +00:00
Matt Rider
ba1e62da21 Update the apollo cache 2019-08-26 18:54:21 +02:00
Alina Beck
f47502ade1 survive empty urls 2019-08-26 16:38:33 +01:00
Matt Rider
2af4151918 Update to use <client-only> instead of <no-ssr> 2019-08-26 17:09:24 +02:00
Alina Beck
1df3cb1ed1 get link input to work 2019-08-26 16:08:46 +01:00
roschaefer
8b31cefebe If this commit fixes the build, docs are broken 
The latest commit has some cypress tests failing when only a few posts
are visible on the index page. If this explicit default fixes the tests,
the documentation cannot be quite right in saying that it's the default.

FYI: @mattwr18
 2019-08-26 16:58:11 +02:00
Wolfgang Huß
7498d88a44 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-26 15:44:32 +02:00
roschaefer
194665bf2e Remove explicit default, see if cypress tests fail 2019-08-26 13:56:32 +02:00
Alina Beck
62e34bf5b0 refactor suggestion list 2019-08-26 12:46:46 +01:00
mattwr18
e89a74f1c6
Merge pull request #1383 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.0.3 
Bump babel-eslint from 10.0.2 to 10.0.3 in /webapp
 2019-08-26 13:43:42 +02:00
roschaefer
c9b5f8e8d3 Fix infinite-loading infinitely loading 2019-08-26 13:39:01 +02:00
mattwr18
6e47011970
Merge pull request #1379 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.3 
Bump graphql from 14.5.0 to 14.5.3 in /webapp
 2019-08-26 13:36:46 +02:00
Alina Beck
5c4ec0dd19 use constants for keycodes and mention types 2019-08-26 11:58:15 +01:00
dependabot-preview[bot]
881277270d
Bump eslint-loader from 2.2.1 to 3.0.0 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v2.2.1...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:26:48 +00:00
dependabot-preview[bot]
7f94273e61
Bump babel-eslint from 10.0.2 to 10.0.3 in /webapp 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:25:44 +00:00
dependabot-preview[bot]
d4f43b6264
Bump graphql from 14.5.0 to 14.5.3 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.0 to 14.5.3.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.0...v14.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:24:00 +00:00
Alina Beck
dc70da8826 make optional extensions a computed property 2019-08-24 12:42:34 +01:00
Alina Beck
6b452a2217 refactor duplicate code 2019-08-24 11:59:59 +01:00
Alina Beck
af985ba95c rename suggestions menu to suggestion list 2019-08-24 10:44:37 +01:00
Alina Beck
62775a93d6 put link input in separate component 2019-08-24 10:42:24 +01:00
Alina Beck
2c0b2ed482 place tippy popup in renderless component 2019-08-23 23:21:24 +01:00
Alina Beck
fbe4de347b extract suggestions menu into separate component 2019-08-23 22:30:05 +01:00
roschaefer
894a59ecc7 Fix flickering create-button 2019-08-23 20:05:08 +02:00
Alina Beck
cbb0d79331 put link bubble back in (wip) 2019-08-23 17:37:17 +01:00
Alina Beck
ee00a3b3df replace floating and bubble menu with menu bar 2019-08-23 15:49:20 +01:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
Wolfgang Huß
a10e2e3a9b Make user profile follow(ed) lists exceeds 5 users and X more better translatable 
Slite adjustment of `more` to `more …`
 2019-08-23 14:37:52 +02:00