ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,481 Commits 117 Branches 1,511 Tags
Commit Graph

8481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alina Beck
ad385490bc follow @mattwr18 PR review 
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
 2020-02-17 10:44:52 +01:00
Alina Beck
f1efdbad7d fix final failing cypress test 2020-02-12 00:27:40 +01:00
Alina Beck
53931a38e5 fix cypress tests 2020-02-11 19:47:05 +01:00
Alina Beck
278868133f use base-card on user profile 2020-02-11 18:31:14 +01:00
Alina Beck
408b77a3e7 use base-card on post page 2020-02-11 18:19:40 +01:00
Alina Beck
9895c32b0b replace remaining instances of ds-card with base-card 2020-02-11 17:45:32 +01:00
Alina Beck
60818c5902 replace CardWithColumns with new and improved BaseCard 2020-02-11 16:57:25 +01:00
Alina Beck
3c8c9d51e1 re-refactor LoginForm, ContributionForm and TeaserImage 2020-02-11 16:34:35 +01:00
Alina Beck
37959d8167 refactor BaseCard to use slots and props 2020-02-11 16:10:45 +01:00
Alina Beck
9c3378807c introduce CardWithColumns component 2020-02-11 11:23:34 +01:00
Alina Beck
1eac8ed14d add variants to BaseCard 2020-02-11 11:17:04 +01:00
Alina Beck
d460819dee move client-only wrapper into LocaleSwitch component 
so we don't have to wrap <locale-switch> in <client-only> every time we use it
 2020-02-11 11:14:59 +01:00
Alina Beck
09dee69ee0 rename PostCard to PostTeaser 2020-02-11 10:07:16 +01:00
Alina Beck
6671d893e6 refactor PostCard (wip) 2020-02-11 09:20:45 +01:00
Alina Beck
cea538e2f1 refactor Notification component 2020-02-10 17:56:18 +01:00
Alina Beck
861b9aff94 clean up LoginForm 2020-02-10 15:46:49 +01:00
Alina Beck
0a9da862ed replace instances of ds-card with base-card 2020-02-10 15:45:09 +01:00
Alina Beck
509892b6ca refactor DeleteData template and CSS 2020-02-10 12:40:38 +01:00
Alina Beck
41ef496d6b refactor CategoriesSelect template 2020-02-05 21:45:28 +01:00
Alina Beck
1d435392ff refactor ContributionForm template 2020-02-05 21:39:50 +01:00
Alina Beck
e14cbf8173 refactor TeaserImage component 2020-02-05 20:43:47 +01:00
Alina Beck
f29d486da0 replace ds-card in CommentForm 2020-02-03 20:10:44 +01:00
Alina Beck
d2148bdd47 Merge branch 'master' into migrate-styleguide-card 2020-02-03 19:23:22 +01:00
mattwr18
34ec61153a
Fix typo (#2966) 2020-02-03 15:06:08 +01:00
mattwr18
331ef9a920
Merge pull request #2941 from Human-Connection/update-to-version-0.3.0 
chore: Update to v0.3.0
v0.3.0 		2020-02-03 10:35:03 +01:00
mattwr18
dbe2c4cdd5 Update to v0.3.0 2020-01-31 19:48:38 +01:00
mattwr18
35fd8f280f v0.3.0 2020-01-31 19:48:13 +01:00
dependabot-preview[bot]
367084155b
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /webapp (#2939) 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 18:29:10 +01:00
mattwr18
4170e62f7a
Merge pull request #2608 from Human-Connection/1680-Direct_answer_on_Comment 
feat: 🍰 Direct Reply On Comment
 2020-01-31 16:30:29 +01:00
mattwr18
987d01f88c
Merge pull request #2938 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.8.4 
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /backend
 2020-01-31 15:47:30 +01:00
mattwr18
6a60c5639f
Merge pull request #2930 from Human-Connection/2929-fix-deploy-script 
fix: deploy script with new naming convention
 2020-01-31 14:46:12 +01:00
mattwr18
ce42b2b8e9 Update cypress test casing 2020-01-31 14:45:27 +01:00
dependabot-preview[bot]
e3447d0776
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 13:27:08 +00:00
mattwr18
befbe83680
Merge pull request #2940 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /backend
 2020-01-31 14:25:09 +01:00
mattwr18
9f198f4849
Merge pull request #2934 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.8.4 
build(deps-dev): bump @babel/cli from 7.8.3 to 7.8.4 in /backend
 2020-01-31 14:03:00 +01:00
mattwr18
c8c71a52c6 Follow @Tirokk PR review suggestions 
- Favor lowercase for words in a sentence after the first
- Use exclamation marks for successful actions that use a toastr
- place events at the end of the list on components
- place class above events
- it would be nice to come to a consensus based on best practices, like
  I had a doubt and places the class definition below the props, is that
what others do?
 2020-01-31 13:09:37 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
dependabot-preview[bot]
a1625b47ec
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 11:44:14 +00:00
mattwr18
a1bd16e6bb
Merge pull request #2935 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.8.4 
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4
 2020-01-31 12:42:26 +01:00
mattwr18
44250d2f66
Merge pull request #2932 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /webapp
 2020-01-31 12:42:06 +01:00
dependabot-preview[bot]
42bc556185
build(deps-dev): bump @babel/cli from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:44:35 +00:00
dependabot-preview[bot]
d5b664ece4
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:44:28 +00:00
dependabot-preview[bot]
16bec1a33e
build(deps-dev): bump @babel/core from 7.8.3 to 7.8.4 
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 07:43:40 +00:00
mattwr18
9827cfcf75
Merge pull request #2937 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.9.4 
build(deps): bump @nuxtjs/axios from 5.9.3 to 5.9.4 in /webapp
 2020-01-31 08:43:06 +01:00
mattwr18
bed8a1f015
Merge pull request #2936 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.8.4 
build(deps-dev): bump @babel/node from 7.8.3 to 7.8.4 in /backend
 2020-01-31 08:42:28 +01:00
mattwr18
acd2b020d3
Merge pull request #2933 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.8.4 
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4
 2020-01-31 08:41:48 +01:00
dependabot-preview[bot]
30e77c38ec
build(deps): bump @nuxtjs/axios from 5.9.3 to 5.9.4 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.3 to 5.9.4.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.9.3...v5.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:21:28 +00:00
dependabot-preview[bot]
45e3adc6ca
build(deps-dev): bump @babel/node from 7.8.3 to 7.8.4 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:21:17 +00:00
dependabot-preview[bot]
e227d21054
build(deps-dev): bump @babel/preset-env from 7.8.3 to 7.8.4 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.3 to 7.8.4.
- [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.8.3...v7.8.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 04:20:33 +00:00
mattwr18
87b58bcf9c Fix deploy script with new naming convention 2020-01-30 13:40:30 +01:00