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

3556 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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]
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
Robert Schäfer
c1969ac12b
Merge pull request #2535 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.28.6 
build(deps): bump tiptap-extensions from 1.28.5 to 1.28.6 in /webapp
 2019-12-17 21:47:56 +01:00
Robert Schäfer
71e9090833
Merge pull request #2542 from Human-Connection/2541-fix-master-build-add-explicit-query 
Fix maintenance service/LocaleSwitch import
 2019-12-17 19:11:15 +01:00
dependabot-preview[bot]
947db53990
build(deps): bump tiptap-extensions from 1.28.5 to 1.28.6 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.5 to 1.28.6.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.5...tiptap-extensions@1.28.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 16:23:22 +00:00
mattwr18
e15b7c8d03
Merge pull request #2523 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.8 
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /webapp
 2019-12-17 17:21:00 +01:00
mattwr18
52cd5ac332
Merge pull request #2521 from Human-Connection/dependabot/npm_and_yarn/webapp/stack-utils-2.0.1 
build(deps): bump stack-utils from 1.0.2 to 2.0.1 in /webapp
 2019-12-17 17:20:42 +01:00
Moriz Wahl
2242c001b4 SearchInput components created 2019-12-17 16:56:37 +01:00
mattwr18
3abfe13dcc Fix maintenance service/LocaleSwitch import 2019-12-17 16:15:11 +01:00
Alina Beck
7568837963 refactor counter icon 2019-12-17 18:13:53 +05:30
dependabot-preview[bot]
565c58224d
build(deps): bump apollo-client from 2.6.4 to 2.6.8 in /webapp 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.4 to 2.6.8.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.4...v2.6.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 09:24:48 +00:00
Robert Schäfer
360078f023
Merge pull request #2519 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.2 
build(deps-dev): bump eslint-plugin-prettier from 3.1.1 to 3.1.2 in /webapp
 2019-12-17 10:23:00 +01:00
Robert Schäfer
15b762507b
Merge pull request #2527 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-cache-inmemory-1.6.5 
build(deps): bump apollo-cache-inmemory from 1.6.3 to 1.6.5 in /webapp
 2019-12-17 10:20:52 +01:00
dependabot-preview[bot]
2e0a488345
build(deps): bump stack-utils from 1.0.2 to 2.0.1 in /webapp 
Bumps [stack-utils](https://github.com/tapjs/stack-utils) from 1.0.2 to 2.0.1.
- [Release notes](https://github.com/tapjs/stack-utils/releases)
- [Commits](https://github.com/tapjs/stack-utils/compare/v1.0.2...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 09:20:33 +00:00
Robert Schäfer
47688fd5b0
Merge pull request #2537 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.26.6 
build(deps): bump tiptap from 1.26.5 to 1.26.6 in /webapp
 2019-12-17 10:17:38 +01:00