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
Wolfgang Huß
ca8bb9e434 Added timing as constant 2019-09-27 16:11:24 +02:00
Wolfgang Huß
f968c12ccf Implement updating by time and add new ones to the list 2019-09-27 16:11:24 +02:00
Wolfgang Huß
73cc068469 Fix lost translation 2019-09-27 16:11:24 +02:00
Wolfgang Huß
cb28837e84 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-09-27 13:14:19 +02:00
dependabot-preview[bot]
357d4969ba
Bump graphql from 14.5.7 to 14.5.8 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.7 to 14.5.8.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 07:25:49 +00:00
Robert Schäfer
0869aeb58e
Merge pull request #1719 from Human-Connection/1718-fix-comment-editor-styling-update-bug 
Fix bug UpdateComment, Fix styling on Comment
 2019-09-26 23:14:33 +02:00
Wolfgang Huß
7f7bde9ab9 Started to implement report infos 2019-09-26 10:03:09 +02:00
mattwr18
ef5cf2e629 Update maintenance page email to support@... 2019-09-26 09:27:00 +02:00
dependabot-preview[bot]
036b948faf
Bump eslint-loader from 3.0.0 to 3.0.1 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.0 to 3.0.1.
- [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/v3.0.0...v3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 04:22:10 +00:00
mattwr18
1d5dcf5324
Merge pull request #1676 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.7 
Bump graphql from 14.5.6 to 14.5.7 in /webapp
 2019-09-25 22:57:36 +02:00
Alexander Friedland
deb21f6edb
Merge branch 'master' into Allow_embedded_code_in_posts_permanent_memory 2019-09-25 19:11:05 +02:00
ogerly
e8f771b59a first mega PR crazy update, all work 2019-09-25 18:39:01 +02:00
mattwr18
0f40df7cb4 Fix bug UpdateComment, Fix styling on Comment 
- There was a bug that updates to comments were not being displayed
because of a v-show... https://vuejs.org/v2/guide/conditional.html#v-if-vs-v-show
Basically, what it says that is important for this bug is
"v-if...ensures that event listeners and child components inside the
conditional block are properly destroyed and re-created during toggles"

- Since we are using the editor to display comments in ContentViewer, we
need to set the min-height to 0px

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Robert Schäfer <git@roschaefer.de>
 2019-09-25 13:39:18 +02:00
Wolfgang Huß
db9810b436
Merge pull request #1685 from Human-Connection/add-comment-story 
Add Comment story, add spacing above user info
 2019-09-25 10:48:20 +02:00
Vasily Belolapotkov
e1751347fc fix failing client tests 2019-09-25 10:32:35 +03:00
mattwr18
7b22711dfe
Merge pull request #1694 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.6.2 
Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp
 2019-09-25 08:29:43 +02:00
mattwr18
766c670269 Fix import path 2019-09-25 08:26:24 +02:00
mattwr18
ee99673cec Add Comment story, add spacing above user info 2019-09-25 08:26:24 +02:00
dependabot-preview[bot]
7d9953a5a2
Bump graphql from 14.5.6 to 14.5.7 in /webapp 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.6 to 14.5.7.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.6...v14.5.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-25 06:22:59 +00:00
roschaefer
59232cefe7 Remove repeating labels from emote button 
Our dear @Hardy-Peaceglobal mentioned that when he had a look on the app
on my mobile.
 2019-09-24 11:59:44 +02:00
Vasily Belolapotkov
50feeed8bf fix the bug with scrolling post comments into view 2019-09-24 12:47:42 +03:00
dependabot-preview[bot]
14d7695f62
Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 09:04:40 +00:00
mattwr18
718b8b73c8
Merge pull request #1696 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.6.2 
Bump @babel/core from 7.6.0 to 7.6.2 in /webapp
 2019-09-24 11:01:59 +02:00
mattwr18
5e35fd6546
Merge pull request #1689 from Human-Connection/1659-remove-sleep-icon 
Remove sleep icon from comments list
 2019-09-24 10:59:29 +02:00
dependabot-preview[bot]
4d67b46492
Bump @babel/core from 7.6.0 to 7.6.2 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.0...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 04:32:06 +00:00
Alina Beck
a85fab04b6 remove failing test because specs have changed 2019-09-23 22:38:13 +01:00
roschaefer
bafc530366 Bugfix create user page - missing submit buttons 2019-09-23 22:15:53 +02:00
Alina Beck
3026b923e0 use translated title for comment list 2019-09-23 21:08:20 +01:00
Alina Beck
7104896150 remove sleep icon from comment list 2019-09-23 20:46:41 +01:00
ogerly
044e2bfed9 Allow embedded code in posts permanent in database 2019-09-23 20:08:45 +02:00
ogerly
4b11168687 confirm embeded iframes only frontend style 2019-09-23 16:11:20 +02:00
roschaefer
353b846124 Fix #1631 
I don't have time to really test this right now, feel free to do that
before merge.
 2019-09-23 15:04:33 +02:00
mattwr18
9646a3d7b9
Merge pull request #1678 from Human-Connection/improve-comments-output 
Improve comments output
 2019-09-23 12:45:26 +02:00
Robert Schäfer
3295ea4331
Merge pull request #1674 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.18 
Bump cookie-universal-nuxt from 2.0.17 to 2.0.18 in /webapp
 2019-09-23 12:32:04 +02:00
mattwr18
a55fab16d2
Merge pull request #1651 from Human-Connection/1650-change_slug 
Change your own slug
 2019-09-23 10:06:32 +02:00
mattwr18
c8a2b03e98 Add removeHtml function in comments tests 2019-09-23 10:04:15 +02:00
mattwr18
4b65d6d1ca
Merge pull request #1668 from Human-Connection/pwa 
Make Human Connection a Progressive Web App
 2019-09-23 09:40:17 +02:00
ogerly
e4c7c1125d zwischenspeichern 2019-09-23 09:11:41 +02:00
mattwr18
6542a0a584 RemoveHtml before counting 
- to decide whether to collapse or not
- reduce the innerHtml length to 180
 2019-09-23 08:54:38 +02:00
mattwr18
d6ae96f94b Use same npm package as excerptMiddleware in truncate 
- We want to remove the html from the count, and trucate just the
content; otherwise, we can have a situation where a person mentions
several people, but only the the first user's name appears, and not a
predetermined number of characters.
 2019-09-23 08:47:10 +02:00
dependabot-preview[bot]
5aa2359363
Bump cookie-universal-nuxt from 2.0.17 to 2.0.18 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.17 to 2.0.18.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.17...v2.0.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 04:21:58 +00:00
roschaefer
cd3829e84d Update manifest.json 2019-09-22 23:49:55 +02:00
roschaefer
6e35b37e49 Fix lint 2019-09-22 23:27:56 +02:00
roschaefer
2e57a17064 Setup @nuxt/pwa 
Following this tutorial here: https://pwa.nuxtjs.org/setup.html
 2019-09-22 22:21:12 +02:00
mattwr18
c771504275 Remove contentExcerpt from comments 
- this does not work with html content:
 2019-09-21 13:30:56 +02:00
mattwr18
dc18ac3723 Fix bug- mentions/links in comments scrubbed 2019-09-21 10:52:45 +02:00
mattwr18
7fe1d39303 Increase limit for displaying show more/less link 
- the limit was too short because of the html saved for mentions and
link
 2019-09-21 10:45:55 +02:00
roschaefer
b58b4dca4f Write a test for UniqueSlugForm 2019-09-20 22:37:38 +02:00
roschaefer
c378505293 Add one test case for update user form 2019-09-20 20:30:57 +02:00
roschaefer
e8f47cb004 Frontend validations for regex 2019-09-20 20:24:04 +02:00