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

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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