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

4170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
senderfm
1fa4e75b07 merge origin 2019-07-10 17:26:02 +02:00
senderfm
acebf94b83 fix lint error 2019-07-10 17:20:08 +02:00
senderfm
4dfb16cb7c merge master 2019-07-10 09:20:54 -03:00
senderfm
0fbf43af53 lint ok, specs for too long and too short content and title 2019-07-10 09:20:53 -03:00
senderfm
0dd600746a maximum number of characters in content without html tags is 2000, characters are counted and number is displayed. regex is strongly shortened. 2019-07-10 09:20:12 -03:00
senderfm
a5d76c26ae fixed specs, test ok 2019-07-10 09:19:35 -03:00
senderfm
55ce9c1afb HcContributionForm submit is disabled by default replace all editor html tags 2019-07-10 09:19:35 -03:00
senderfm
f057205158 HcContributionForm submit is disabled by default 2019-07-10 09:19:35 -03:00
senderfm
116ff124ed merge remote branch 2019-07-10 14:11:40 +02:00
senderfm
f7ec19f960 merge master 2019-07-10 13:58:11 +02:00
senderfm
f870b8ea29 lint ok, specs for too long and too short content and title 2019-07-10 13:30:05 +02:00
Robert Schäfer
e6e9b1b7d7
Merge pull request #994 from Human-Connection/signup_as_admin 
Signup new users as admin
 2019-07-10 11:46:50 +02:00
Robert Schäfer
808f703a4f
Merge pull request #1009 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend
 2019-07-10 11:05:21 +02:00
Robert Schäfer
238d6b98de
Merge pull request #1013 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp
 2019-07-10 11:04:50 +02:00
Robert Schäfer
b7b47e4dde
Merge pull request #1007 from Human-Connection/remove_right_padding 
Follow up of #958
 2019-07-10 11:04:23 +02:00
Alexander Friedland
f47e897750
Merge branch 'master' into 806-HcContributionForm-submit-is-not-disabled-by-default 2019-07-10 09:43:11 +02:00
Robert Schäfer
0d3f48e258
Merge pull request #1014 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.6.8 
Bump apollo-server from 2.6.6 to 2.6.8 in /backend
 2019-07-10 09:34:58 +02:00
senderfm
3481b1f24b maximum number of characters in content without html tags is 2000, characters are counted and number is displayed. regex is strongly shortened. 2019-07-10 09:18:47 +02:00
Robert Schäfer
6f4e1b6f30 Fix cypress 2019-07-10 09:01:57 +02:00
Robert Schäfer
6f011b3421
Merge pull request #1008 from Human-Connection/dependabot/npm_and_yarn/cypress-3.4.0 
Bump cypress from 3.3.2 to 3.4.0
 2019-07-10 08:51:07 +02:00
dependabot-preview[bot]
7a2eb2a026
Bump @babel/preset-env from 7.4.5 to 7.5.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.5 to 7.5.4.
- [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.4.5...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:37 +00:00
dependabot-preview[bot]
ede3d7bc72
Bump @babel/preset-env from 7.5.2 to 7.5.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.2 to 7.5.4.
- [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.5.2...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:50:33 +00:00
Robert Schäfer
9096af75b0
Merge pull request #1012 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /backend
 2019-07-10 08:49:19 +02:00
Robert Schäfer
049f19043f
Merge pull request #1010 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp
 2019-07-10 08:48:15 +02:00
dependabot-preview[bot]
7f68fd6c9b
Bump apollo-server from 2.6.6 to 2.6.8 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.6 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.6.6...apollo-server@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 06:44:08 +00:00
Robert Schäfer
a2021d857e
Merge pull request #1011 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.6.8 
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend
 2019-07-10 08:41:53 +02:00
Robert Schäfer
6c7ce73c5d
Merge pull request #1015 from Human-Connection/dependabot/npm_and_yarn/backend/lodash-4.17.13 
Bump lodash from 4.17.11 to 4.17.13 in /backend
 2019-07-10 08:40:39 +02:00
Alexander Friedland
6703b54b0e
Merge pull request #999 from Human-Connection/381-footer 
footer created imprint and all language ok
 2019-07-10 06:40:36 +02:00
dependabot-preview[bot]
e0d8e4a008
Bump lodash from 4.17.11 to 4.17.13 in /backend 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:26:43 +00:00
dependabot-preview[bot]
a6de369277
Bump @babel/core from 7.5.0 to 7.5.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [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.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:25:20 +00:00
dependabot-preview[bot]
a0d9c6dbaa
Bump apollo-server-testing from 2.6.7 to 2.6.8 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.7 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.7...apollo-server-testing@2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:40 +00:00
dependabot-preview[bot]
db4122da09
Bump @babel/core from 7.5.0 to 7.5.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [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.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:24:01 +00:00
dependabot-preview[bot]
133012145c
Bump cypress from 3.3.2 to 3.4.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-10 04:23:04 +00:00
Robert Schäfer
d90bb90d0c Follow up of #958 
I think I deleted the styling by using bot `:width` and `style`
property. I'm not quite sure if this resolves our problem. Anyways
I don't see a reason for having a right padding so I just removed it.
 2019-07-10 02:11:12 +02:00
Robert Schäfer
54947b113d
Merge pull request #958 from Human-Connection/984-minimum-size-of-body 
🐛 [Bug]  full ads width use with small devices
 2019-07-10 02:00:29 +02:00
Robert Schäfer
65679d417d Move page components into single file 
+ Spice it up a little by translating the page component's title.
 2019-07-10 01:25:34 +02:00
Robert Schäfer
310cc52ddf Don't remove the previous styling 2019-07-10 01:23:36 +02:00
Robert Schäfer
ce397b6746 Fix English locale 2019-07-10 00:03:26 +02:00
Robert Schäfer
17743043ca Always prefer <nuxt-link> over <a> 
@ogerly, if we link into another page of our application, we should
always use `nuxt-link`. It is a feature of NuxtJs and it does
prefetching, among other things. So it improves the performance of
our site!
 2019-07-09 23:35:34 +02:00
Robert Schäfer
4b308886ff
Merge pull request #976 from Human-Connection/961-thumbnail-for-the-contributions-must-get-a-maximum-height 
large images are set to maximum height
 2019-07-09 23:21:27 +02:00
Robert Schäfer
4b09284011 Merge remote-tracking branch 'origin_https/master' into 984-minimum-size-of-body 2019-07-09 22:52:58 +02:00
Robert Schäfer
4207aee09d DRY up password validations 2019-07-09 22:12:40 +02:00
Robert Schäfer
47a9d38790 Consistency for email success messages 2019-07-09 22:12:40 +02:00
Robert Schäfer
90aa1822b5 Disable the form button with a slot scope 2019-07-09 22:12:40 +02:00
Robert Schäfer
813a6b5c50 Subpages of registration/ must be unauthenticated 2019-07-09 22:12:40 +02:00
Robert Schäfer
29bbeaa0fa Fix tests by calling wrapper.html() once more 
I really don't understand why, but apparently `wrapper.html()` does some
re-rendering which in our cases fixes the tests, because we reach the
new sub component in the DOM tree.
 2019-07-09 22:12:40 +02:00
Robert Schäfer
d76923c471 Copy all relevant files changed from branch signup 2019-07-09 22:12:40 +02:00
Alexander Friedland
a4a875c2e1
Merge pull request #993 from Human-Connection/user_role_not_nullable 
User role not nullable
 2019-07-09 20:50:03 +02:00
Wolfgang Huß
458229eb77
Merge pull request #848 from Human-Connection/779-tags-of-contribution-in-text 
Tags in the Text of a Contribution like Mentions
 2019-07-09 16:47:17 +02:00
Robert Schäfer
a5f655058e
Merge pull request #989 from Human-Connection/fix_env_var_name 
Neo4j uses a different name for its env vars
 2019-07-09 15:21:22 +02:00