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

10123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alina Beck
da9403794d move embed related css to EmbedComponent, rename classes 2019-12-19 01:02:48 +05:30
Alina Beck
c4959bb851 use computed property to enable/disable delete button 2019-12-19 01:02:15 +05:30
Alina Beck
7c7a800bc2 replace ds-button with base-button (wip) 2019-12-19 00:50:27 +05:30
mattwr18
d74d2072ba Separate concerns in components 
- SearchResources is a feature component that handles communication with
the backend and fetches the search results
- Those results are passed to SearchableInput which displays the results
in a ds-select dropdown and handles interacting with them
- SearchInput renders the SearchHeading, SearchPost, and HcUser generic
components
- Would love to make the SearchableInput more generic and reusable, or
create a new reusable component for this, but I think this will happen
just when we migrate the Search.vue from the styleguide

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2019-12-18 19:50:01 +01:00
Alina Beck
7cf8aec283 add ghost style for special use cases 2019-12-18 23:59:43 +05:30
Alina Beck
d6560438e5 add button type to allow submit buttons 2019-12-18 23:13:40 +05:30
Alina Beck
63549d987e add button size small 2019-12-18 22:55:28 +05:30
ogerly
779e8e6e7a Merge branch '1746-Blur_explicit_Image_Content' of https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-18 16:45:48 +01:00
ogerly
d2a17373b0 last step ? 2019-12-18 16:43:24 +01:00
mattwr18
57a4309b30
Merge pull request #2544 from Human-Connection/2543-add-back-layout-changes 
Add back layout changes/update db_manipulation
 2019-12-18 16:16:00 +01:00
mattwr18
2de3ea8e1d
Merge pull request #2560 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.8.12 
build(deps): bump metascraper-soundcloud from 5.8.10 to 5.8.12 in /backend
 2019-12-18 16:15:53 +01:00
mattwr18
557253de31
Merge pull request #2559 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.8.12 
build(deps): bump metascraper-author from 5.8.7 to 5.8.12 in /backend
 2019-12-18 16:15:36 +01:00
mattwr18
c19cbf6131
Merge pull request #2558 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.8.12 
build(deps): bump metascraper from 5.8.9 to 5.8.12 in /backend
 2019-12-18 16:15:21 +01:00
mattwr18
ada30d4880
Merge pull request #2547 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.8.12 
build(deps): bump metascraper-youtube from 5.8.9 to 5.8.12 in /backend
 2019-12-18 16:15:04 +01:00
mattwr18
e002ed0b49 Add back layout changes/update db_manipulation 
- we had removed these changes till we could deploy them by themselves
and run the db_manipulation

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-12-18 15:39:42 +01:00
Alina Beck
2e26e3f3f9
Apply suggestions from code review 
change FAQ link text
 2019-12-18 17:36:24 +05:30
dependabot-preview[bot]
705b781681
build(deps): bump metascraper from 5.8.9 to 5.8.12 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.8.9 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.9...v5.8.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 10:41:31 +00:00
dependabot-preview[bot]
5731b0381c
build(deps): bump metascraper-soundcloud in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.8.10 to 5.8.12.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 10:41:29 +00:00
dependabot-preview[bot]
fbbb23b313
build(deps): bump metascraper-youtube from 5.8.9 to 5.8.12 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.8.9 to 5.8.12.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 10:41:27 +00:00
mattwr18
6b049b52db
Merge pull request #2557 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.8.12 
build(deps): bump metascraper-video from 5.8.10 to 5.8.12 in /backend
 2019-12-18 11:39:16 +01:00
dependabot-preview[bot]
b1a449b6a5
build(deps): bump metascraper-author from 5.8.7 to 5.8.12 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.8.7 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.7...v5.8.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 10:35:13 +00:00
mattwr18
8507658416
Merge pull request #2555 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.8.12 
build(deps): bump metascraper-date from 5.8.7 to 5.8.12 in /backend
 2019-12-18 11:33:30 +01:00
mattwr18
356aa578af
Merge pull request #2554 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.8.12 
build(deps): bump metascraper-logo from 5.8.10 to 5.8.12 in /backend
 2019-12-18 11:33:10 +01:00
mattwr18
46c5194637
Merge pull request #2551 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.14 
build(deps): bump apollo-server-express from 2.9.13 to 2.9.14 in /backend
 2019-12-18 11:32:51 +01:00
mattwr18
2db75f82df
Merge pull request #2550 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.4.0 
build(deps-dev): bump css-loader from 3.3.2 to 3.4.0 in /webapp
 2019-12-18 11:32:13 +01:00
mattwr18
57e5489268
Merge pull request #2548 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.19.0 
build(deps-dev): bump cypress-cucumber-preprocessor from 1.18.0 to 1.19.0
 2019-12-18 11:31:55 +01:00
Alina Beck
c74bfde652 refactor to use only one value for the blurImage status 2019-12-18 15:26:45 +05:30
Alina Beck
edaac117eb remove code related to imageAspectRatio 2019-12-18 15:26:45 +05:30
lokalise-bot
b70ff73bba Lokalise: update of webapp/locales/ru.json 2019-12-18 10:06:18 +01:00
Alina Beck
c83f158ca4 Merge branch 'master' into migrate-styleguide-buttons 2019-12-18 12:59:23 +05:30
ogerly
0213d64ba5 change const height = Math.min, remove 2000 2019-12-18 07:56:36 +01:00
dependabot-preview[bot]
984c7306f2
build(deps): bump metascraper-video from 5.8.10 to 5.8.12 in /backend 
Bumps [metascraper-video](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-18 04:21:41 +00:00
dependabot-preview[bot]
85f7b01be3
build(deps): bump metascraper-date from 5.8.7 to 5.8.12 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.8.7 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.7...v5.8.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 04:20:50 +00:00
dependabot-preview[bot]
5a41a70582
build(deps): bump metascraper-logo from 5.8.10 to 5.8.12 in /backend 
Bumps [metascraper-logo](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-18 04:20:35 +00:00
dependabot-preview[bot]
69d3107cbc
build(deps): bump apollo-server-express in /backend 
Bumps [apollo-server-express](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-express@2.9.13...apollo-server-express@2.9.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 04:20:10 +00:00
dependabot-preview[bot]
bff3cfe2d7
build(deps-dev): bump css-loader from 3.3.2 to 3.4.0 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.3.2...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-18 04:19:40 +00:00