IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-17 10:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,459 Commits 5 Branches 2 Tags
Commit Graph

9459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
d38a1f089f
Merge branch 'master' into 1188-Delete_teaser_image 2019-12-19 18:26:05 +01:00
ogerly
b9676271ea Delete teaser image 2019-12-19 17:46:25 +01:00
mattwr18
7f2f9057e7 Update to version 0.2.0 2019-12-19 17:25:54 +01:00
mattwr18
66e28ea44a v0.2.0 2019-12-19 17:24:32 +01:00
mattwr18
3ef04f8391 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users 2019-12-19 17:16:48 +01:00
mattwr18
f7de76eea5 Tidy up a bit 
- Remove unused function
- Add wildcard to end of query to remove quirky behavior
- Favor more verbose variable naming
 2019-12-19 17:15:25 +01:00
mattwr18
7ee57033be Fix/extend cypress Search.feature 2019-12-19 17:14:45 +01:00
mattwr18
46191e5889 Refactor isOfFirstType to computed/styling updates 2019-12-19 17:13:58 +01:00
mattwr18
b79c292ef4 Fix failing component tests 
- Extract testing logic to SearchableInput spec
- write new tests for SearchResources
 2019-12-19 17:13:14 +01:00
Robert Schäfer
8d6205a865
Merge pull request #2556 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.8.12 
build(deps): bump metascraper-image from 5.8.10 to 5.8.12 in /backend
 2019-12-19 13:31:02 +01:00
dependabot-preview[bot]
12d5befe87
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [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.7.6...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 12:30:48 +00:00
Robert Schäfer
96d3cb1d0b
Merge pull request #2569 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.7.7 
build(deps-dev): bump @babel/core from 7.7.5 to 7.7.7
 2019-12-19 13:28:36 +01:00
Robert Schäfer
a21f7a9730
Merge pull request #2576 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.7.7 
build(deps-dev): bump @babel/cli from 7.7.5 to 7.7.7 in /backend
 2019-12-19 13:28:15 +01:00
mattwr18
efd4d1f2af
Merge pull request #2563 from Human-Connection/lokalise-2019-12-18_10-06-16 
Lokalise: Translations update
 2019-12-19 12:27:04 +01:00
mattwr18
3712f86b7b Merge branch 'master' of github.com:Human-Connection/Human-Connection into update_neo4j_driver 2019-12-19 12:16:14 +01:00
mattwr18
a5542c5b4c
Merge pull request #2580 from Human-Connection/dependabot/npm_and_yarn/webapp/style-resources-loader-1.3.3 
build(deps-dev): bump style-resources-loader from 1.3.2 to 1.3.3 in /webapp
 2019-12-19 12:13:52 +01:00
mattwr18
8f5dbe60c0
Merge pull request #2577 from Human-Connection/dependabot/docker/webapp/node-13.4.0-alpine 
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp
 2019-12-19 11:49:38 +01:00
mattwr18
6f02ac6b74
Merge pull request #2575 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.8.12 
build(deps): bump metascraper-title from 5.8.10 to 5.8.12 in /backend
 2019-12-19 11:48:56 +01:00
mattwr18
679f95d5a7
Merge pull request #2574 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.14 
build(deps-dev): bump apollo-server-testing from 2.9.13 to 2.9.14 in /backend
 2019-12-19 11:48:40 +01:00
dependabot-preview[bot]
f06c3a0db4
build(deps-dev): bump @babel/cli from 7.7.5 to 7.7.7 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.7.5 to 7.7.7.
- [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.7.5...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 10:48:24 +00:00
mattwr18
9b09ff16a2
Merge pull request #2572 from Human-Connection/dependabot/npm_and_yarn/backend/mustache-3.2.0 
build(deps): bump mustache from 3.1.0 to 3.2.0 in /backend
 2019-12-19 11:48:11 +01:00
dependabot-preview[bot]
95dfbe4a43
build(deps-dev): bump @babel/core from 7.7.5 to 7.7.7 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.5 to 7.7.7.
- [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.7.5...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 10:48:03 +00:00
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content 
Blur Images
 2019-12-19 11:46:38 +01:00
mattwr18
83489ef994
Merge pull request #2570 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.7.7 
build(deps-dev): bump @babel/node from 7.7.4 to 7.7.7 in /backend
 2019-12-19 11:46:06 +01:00
dependabot-preview[bot]
a0c34180a8
build(deps): bump metascraper-image from 5.8.10 to 5.8.12 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.8.10 to 5.8.12.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.10...v5.8.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 10:42:27 +00:00
mattwr18
0128fe0d96
Merge pull request #2567 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.7.7 
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7
 2019-12-19 11:42:08 +01:00
mattwr18
ef2959b531
Merge pull request #2566 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.8.12 
build(deps): bump metascraper-description from 5.8.10 to 5.8.12 in /backend
 2019-12-19 11:40:26 +01:00
Alina Beck
5c1242b999 reduce CounterIcon tests to only test logic 2019-12-19 13:07:07 +05:30
Alina Beck
56b1a74e64 let eslint do some magic 2019-12-19 12:53:38 +05:30
Alina Beck
ad27404059 fix failing component tests 2019-12-19 12:48:13 +05:30
Alina Beck
ea612bdf78 replace another batch of ds-buttons with base-buttons (wip) 2019-12-19 12:19:58 +05:30
Alina Beck
03d4ce7ab4 improve header responsiveness with styleguide overrides 2019-12-19 11:44:55 +05:30
Alina Beck
2941b1392e improve markup and design of Paginate component 2019-12-19 11:44:31 +05:30
Alina Beck
72f2aff455 add color variants to CounterIcon 2019-12-19 11:43:14 +05:30
Alina Beck
ee11f4e366 replace even more ds-buttons with base-buttons (wip) 2019-12-19 11:39:39 +05:30
dependabot-preview[bot]
ffa6825f06
build(deps-dev): bump style-resources-loader in /webapp 
Bumps [style-resources-loader](https://github.com/yenshih/style-resources-loader) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/yenshih/style-resources-loader/releases)
- [Changelog](https://github.com/yenshih/style-resources-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yenshih/style-resources-loader/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:21:36 +00:00
dependabot-preview[bot]
3816e79b6d
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp 
Bumps node from 13.3.0-alpine to 13.4.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:20:21 +00:00
dependabot-preview[bot]
0fcc59411f
build(deps): bump metascraper-title from 5.8.10 to 5.8.12 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.8.10 to 5.8.12.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.10...v5.8.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:19:35 +00:00
dependabot-preview[bot]
e3d51f044d
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.13 to 2.9.14.
- [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.9.13...apollo-server-testing@2.9.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:19:17 +00:00
dependabot-preview[bot]
4b5bf21d06
build(deps): bump mustache from 3.1.0 to 3.2.0 in /backend 
Bumps [mustache](https://github.com/janl/mustache.js) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/janl/mustache.js/releases)
- [Changelog](https://github.com/janl/mustache.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janl/mustache.js/compare/v3.1.0...v3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:18:39 +00:00
dependabot-preview[bot]
8f53ea500d
build(deps-dev): bump @babel/node from 7.7.4 to 7.7.7 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.7.4 to 7.7.7.
- [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.7.4...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:18:10 +00:00
dependabot-preview[bot]
f6f89ae803
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [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.7.6...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:17:30 +00:00
dependabot-preview[bot]
855e147381
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.8.10 to 5.8.12.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.8.10...v5.8.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-19 04:17:16 +00:00
Alina Beck
4e6ec6eba7 move dropdown-arrow class to main.scss 2019-12-19 08:40:04 +05:30
Alina Beck
f6cdf9ff64 removes LoadMore button 2019-12-19 08:39:27 +05:30
Alina Beck
85f628848b continue to replace ds-button with base-button (wip) 2019-12-19 08:38:04 +05:30
Alina Beck
f2a59c8a90 rename classes in EmbedComponent tests 2019-12-19 07:32:57 +05:30
mattwr18
cce28e6c7a Fix cypress tests 2019-12-19 00:01:42 +01:00
mattwr18
46c4602db1 Filter for blockedUsers/content, fix cypress 2019-12-18 20:42:06 +01:00
Alina Beck
99a8efa8df fix emotions buttons markup 2019-12-19 01:03:35 +05:30