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

6992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
00fd014dc1
Merge pull request #2265 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.0.19 
build(deps): bump cookie-universal-nuxt from 2.0.18 to 2.0.19 in /webapp
 2019-11-18 22:30:32 +01:00
Robert Schäfer
9a985d464c
Merge pull request #2257 from Human-Connection/bump_metascraper_modules 
build(deps): bump metascraper modules
 2019-11-18 22:00:26 +01:00
mattwr18
0b5b7f5cbd
Merge pull request #2273 from Human-Connection/stale_bot 
build: configure stale bot
 2019-11-18 21:47:53 +01:00
mattwr18
19d2e2cd41
Merge pull request #2243 from Human-Connection/refactor_neo4j-graphql-js 
Explicitly define our schema, improve performance
 2019-11-18 21:46:56 +01:00
Robert Schäfer
92b036604f
Merge pull request #2274 from Human-Connection/dependabot/npm_and_yarn/https-proxy-agent-2.2.4 
build(deps): [security] bump https-proxy-agent from 2.2.1 to 2.2.4
 2019-11-18 21:32:51 +01:00
mattwr18
71f7f9ad43
Merge pull request #2251 from Human-Connection/record_cypress_tests 
build: record and publish all cypress test results
 2019-11-18 21:31:19 +01:00
dependabot-preview[bot]
87273d7856
build(deps): [security] bump https-proxy-agent from 2.2.1 to 2.2.4 
Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.**
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 19:22:45 +00:00
roschaefer
c35df53fdc build: record and publish all cypress test results 2019-11-18 18:32:33 +01:00
Robert Schäfer
bf067a3761
Merge pull request #2261 from Human-Connection/add-emacs-backups-to-gitignore 
Add Emacs Backup Files To Gitignore (*~)
 2019-11-18 18:05:27 +01:00
roschaefer
8de2f1cc8d build: configure stale bot 
@tirokk I increased the days of inactivity to 60 and 30. You can disable
stale issues permanently by using a label "pinned".
 2019-11-18 18:01:01 +01:00
Robert Schäfer
9b01309838
Merge pull request #2267 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-6.6.0 
build(deps-dev): bump eslint-config-prettier from 6.5.0 to 6.6.0 in /webapp
 2019-11-18 17:09:05 +01:00
Robert Schäfer
ab819e2957
Merge pull request #2200 from Human-Connection/2187-language-does-not-change-on-edit 
2187 language does not change on edit
 2019-11-18 17:03:55 +01:00
Robert Schäfer
735a31ed00
Merge pull request #2101 from Human-Connection/1747-show-shouts 
1747 show shouts
 2019-11-18 17:00:43 +01:00
mattwr18
0cb75a1353
Merge pull request #2180 from Human-Connection/dependabot/docker/webapp/node-13.1.0-alpine 
build(deps): bump node from 13.0.1-alpine to 13.1.0-alpine in /webapp
 2019-11-18 15:59:44 +01:00
mattwr18
db86d248a7
Merge pull request #2078 from Human-Connection/fix-2042-back-link 
Fix #2042 Back Link To Login Page
 2019-11-18 15:59:12 +01:00
Robert Schäfer
bb038ed46b
Merge pull request #2250 from Human-Connection/yarn_install_all 
Helper script to install all packages
 2019-11-18 11:27:26 +01:00
Robert Schäfer
602c2fd9f9
Merge pull request #2247 from Human-Connection/remove_unused_port_configuration 
refactor: remove redundant port configuration
 2019-11-18 11:26:14 +01:00
dependabot-preview[bot]
9188d84c4b
build(deps-dev): bump eslint-config-prettier in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.5.0 to 6.6.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.5.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 04:20:52 +00:00
dependabot-preview[bot]
da8bdbb5e9
build(deps): bump cookie-universal-nuxt from 2.0.18 to 2.0.19 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.18...v2.0.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 04:19:45 +00:00
Moriz Wahl
cac529a73d Test is running fine 2019-11-17 19:26:15 +01:00
Moriz Wahl
657a41ff7b Removed language method 2019-11-17 18:40:08 +01:00
Moriz Wahl
b0b6c7f14a Add Emacs Backup Files To Gitignore (*~) 2019-11-17 16:14:40 +01:00
dependabot-preview[bot]
36ef2d9c96
build(deps): bump node from 13.0.1-alpine to 13.1.0-alpine in /webapp 
Bumps node from 13.0.1-alpine to 13.1.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 19:43:41 +00:00
roschaefer
5d570c24a7 Fix tests 2019-11-16 20:21:27 +01:00
roschaefer
978347ba7b Tell github-linguists to ignore snapshots 2019-11-16 20:09:05 +01:00
Robert Schäfer
7afad12626
Merge pull request #2246 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-standard-14.1.0 
build(deps-dev): bump eslint-config-standard from 12.0.0 to 14.1.0 in /webapp
 2019-11-16 17:25:50 +01:00
roschaefer
2fbc16ffe1 build(deps): bump metascraper modules 2019-11-16 15:10:07 +01:00
roschaefer
36062ffa8c Fix lint 2019-11-16 14:34:23 +01:00
dependabot-preview[bot]
d0e3d33848
build(deps-dev): bump eslint-config-standard in /webapp 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 12.0.0 to 14.1.0.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v12.0.0...v14.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 13:28:40 +00:00
Robert Schäfer
4b550e2c21
Merge pull request #2236 from Human-Connection/dependabot/npm_and_yarn/backend/cucumber-6.0.5 
build(deps-dev): bump cucumber from 6.0.3 to 6.0.5 in /backend
 2019-11-16 14:25:53 +01:00
dependabot-preview[bot]
ff0e895866
build(deps-dev): bump cucumber from 6.0.3 to 6.0.5 in /backend 
Bumps [cucumber](https://github.com/cucumber/cucumber-js) from 6.0.3 to 6.0.5.
- [Release notes](https://github.com/cucumber/cucumber-js/releases)
- [Changelog](https://github.com/cucumber/cucumber-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cucumber/cucumber-js/compare/v6.0.3...v6.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-15 17:56:00 +00:00
Robert Schäfer
e066715b2c
Merge pull request #2249 from Human-Connection/less_output_on_travis 
build: less verbose output on build server
 2019-11-15 18:52:44 +01:00
roschaefer
ba450a4f98 Helper script to install all packages 2019-11-15 18:02:04 +01:00
roschaefer
6b2b9fee93 Fix build 
I give up to run parallel frontends and backends for running fullstack
tests and development. Maybe it's even easier to have it that way.
 2019-11-15 17:32:07 +01:00
Robert Schäfer
f6550b9b00
Merge pull request #2248 from Human-Connection/2240-infinite-scrolling-out-of-control 
Fix infinite scrolling out of control
 2019-11-15 17:03:31 +01:00
roschaefer
4e34c668b3 build: less verbose output on build server 
I'm annoyed to scroll when I'm debugging the build server logs. I think,
if you run `jest` with an environment variable `CI` set to true, it will
not try to output colorized log and also does not output which test it's
currently running.

That should lead to the desired, smaller log on Travis CI.
 2019-11-15 17:02:52 +01:00
roschaefer
950df1cd07 Fix frontend tests 
I also removed one frontend test. The test case was checking an edge
case. We use `hasMore` as the single source of truth so I think it's
safe to remove this test case.
 2019-11-15 16:20:24 +01:00
Robert Schäfer
18ee5b4ac3
Merge pull request #2110 from Human-Connection/2106_unblock_a_user_in_the_user_settings 
2106-unblock a user in the user settings
 2019-11-15 15:51:52 +01:00
Robert Schäfer
fdb454c47a
Merge pull request #2241 from Human-Connection/fix-1936 
Fix 1936
 2019-11-15 15:50:44 +01:00
Robert Schäfer
fd4fee9aee
Merge pull request #2242 from Human-Connection/fix-1937 
fix(editor): Fix hashtags not working after embeded content
 2019-11-15 15:50:11 +01:00
Robert Schäfer
b6ecfa6ebb
Merge pull request #2185 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.19.1 
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp
 2019-11-15 15:49:29 +01:00
roschaefer
3fa7eeb038 @mattwr18 looks like you forgot $state 2019-11-15 15:37:16 +01:00
mattwr18
f8c5290be0 Clean up following @roschaefer PR review suggestions 2019-11-15 15:23:16 +01:00
mattwr18
a10a735e35 Tell vue-infinite-loader when complete or loaded 2019-11-15 14:56:44 +01:00
mattwr18
a6c169c2e0 Fix infinite scrolling out of control 2019-11-15 14:35:08 +01:00
roschaefer
56a940285b refactor: translations, tests 2019-11-15 14:29:33 +01:00
Alexander Friedland
767b4c8f15 Update webapp/locales/de.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
dcc9889cee Update webapp/locales/en.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
9bd1c59463 change unblk to unblock 2019-11-15 14:29:33 +01:00
Alexander Friedland
4b2da76709 change unblk TO unblock 
unblk TO unblock
 2019-11-15 14:29:33 +01:00