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

2586 Commits

Author SHA1 Message Date
Alina Beck
b71638d29f use scss variables in base button component 2020-01-09 14:31:25 +05:30
Alina Beck
04e5ecc87d fix tests and lint errors 2020-01-09 13:48:30 +05:30
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
Alina Beck
1b9249c685 manage button states and color schemes with mixin 2020-01-09 13:13:33 +05:30
Alina Beck
be30b55f65 fix styling of terms-and-conditions button 2020-01-08 14:31:37 +05:30
Alina Beck
53a504010c allow overflow for notifications counter 2020-01-08 14:28:21 +05:30
Alina Beck
5d2af860db wrap create-post link around button on user profile 2020-01-08 13:53:02 +05:30
Alina Beck
cc38fa2b0a make content-menu clickable on post-card 2020-01-08 13:49:07 +05:30
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
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
Alina Beck
85f628848b continue to replace ds-button with base-button (wip) 2019-12-19 08:38:04 +05:30
Alina Beck
7c7a800bc2 replace ds-button with base-button (wip) 2019-12-19 00:50:27 +05:30
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
Alina Beck
c83f158ca4 Merge branch 'master' into migrate-styleguide-buttons 2019-12-18 12:59:23 +05:30
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
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
Alina Beck
5a30001db8 rearrange BaseButton stories 2019-12-17 14:46:54 +05:30
Alina Beck
93233a5c76 style button loading state 2019-12-17 14:35:49 +05:30
Alina Beck
69a69ad0c9 migrate loading spinner 2019-12-17 14:02:59 +05:30
Alina Beck
ab9ad46b14 style button variants 2019-12-17 13:29:29 +05:30
Alina Beck
557fa3211d rearrange button stories 2019-12-17 13:01:50 +05:30
Alina Beck
92856afa3c sort storybook stories alphabetically 2019-12-17 12:51:05 +05:30
dependabot-preview[bot]
b552bfd349
build(deps-dev): bump vue-loader from 15.7.2 to 15.8.3 in /webapp 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.7.2 to 15.8.3.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.7.2...v15.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:21:48 +00:00
dependabot-preview[bot]
ddd11d1621
build(deps): bump tiptap from 1.26.5 to 1.26.6 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.26.5 to 1.26.6.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.26.5...tiptap@1.26.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-17 04:21:00 +00:00
mattwr18
c2bb406502
Merge pull request #2512 from Human-Connection/refactor_content_menu 
Refactor: content menu
 2019-12-16 16:13:45 +01:00
dependabot-preview[bot]
b6cfb2ccb3
build(deps-dev): bump eslint-plugin-prettier in /webapp 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 15:12:32 +00:00
dependabot-preview[bot]
ffb6fc3135
build(deps): bump apollo-cache-inmemory from 1.6.3 to 1.6.5 in /webapp 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.3 to 1.6.5.
- [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-cache-inmemory@1.6.3...apollo-cache-inmemory@1.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 15:12:18 +00:00
mattwr18
928689affa
Merge pull request #2511 from Human-Connection/fix_unique_fragment_issue 
Fix duplicate fragment `user` issue
 2019-12-16 16:08:20 +01:00
mattwr18
e8c4624250 Remove string-hash package 2019-12-16 11:48:28 +01:00
mattwr18
83ab648e93 Add back @roschaefer changes 
- maintain reactive placeholders
 2019-12-16 11:42:37 +01:00
mattwr18
70c63297d4 Revert unrelated changes 
- @roschaefer, I reverted the changes you made that were unrelated to
the server-side rendering issue with the editor... maybe we can put in a
separate PR with them, or a subset of them that doesn't remove the
reactivity of the editor placholder(?)
 2019-12-16 11:06:47 +01:00
mattwr18
65b92786b7 Revert unrelated changes 2019-12-16 11:00:55 +01:00
roschaefer
71b2eac175 refactor: content menu 
I hoped this would fix the bug with the editor sometimes not being shown
when clicking "Edit Post" but it does not.
 2019-12-14 20:16:09 +01:00