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

7041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alina Beck
699c9600f2 copy-paste all tokens from nitro-styleguide 2019-11-06 10:04:05 +03:00
dependabot-preview[bot]
b6959837cf
build(deps-dev): bump @babel/preset-env from 7.6.3 to 7.7.1 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.3 to 7.7.1.
- [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.6.3...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:22:42 +00:00
dependabot-preview[bot]
bad6a46294
build(deps-dev): bump @babel/register from 7.6.2 to 7.7.0 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.6.2 to 7.7.0.
- [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.6.2...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:21:36 +00:00
dependabot-preview[bot]
af95360704
build(deps): bump graphql-middleware from 4.0.1 to 4.0.2 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:20:51 +00:00
dependabot-preview[bot]
bea37818ac
build(deps-dev): bump @babel/cli from 7.6.4 to 7.7.0 in /backend 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.6.4 to 7.7.0.
- [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.6.4...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-06 04:20:15 +00:00
mattwr18
5609622e4a
Merge pull request #2123 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.1 
build(deps): bump graphql-shield from 7.0.0 to 7.0.1 in /backend
 2019-11-05 19:39:48 +01:00
ppelegrin
15c671c4a8 Finish portuguese translations 2019-11-05 19:24:20 +01:00
roschaefer
807ac00a12 Fix backend tests 2019-11-05 18:06:10 +01:00
Alina Beck
62d0ed1858 update contribution guidelines 2019-11-05 17:34:19 +03:00
roschaefer
20b47b873e refactor: add new email, display server response 2019-11-05 15:23:31 +01:00
mattwr18
2ea0364242 Implement refresh posts, fix duplicate posts bug 
- on logo click
- scrollToTop
- remove duplicate records

Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2019-11-05 14:57:54 +01:00
roschaefer
2a53eb2e6c refactor: use email of backend response in Signup 2019-11-05 14:24:02 +01:00
mattwr18
f64b71e746
Merge pull request #2121 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.2 
build(deps): bump merge-graphql-schemas from 1.7.0 to 1.7.2 in /backend
 2019-11-05 11:09:25 +01:00
mattwr18
2e03a8d286
Merge pull request #2122 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-loader-15.7.2 
build(deps-dev): bump vue-loader from 15.7.1 to 15.7.2 in /webapp
 2019-11-05 11:08:56 +01:00
mattwr18
4f58e738b6
Merge pull request #2120 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.1 
build(deps-dev): bump async-validator from 3.2.0 to 3.2.1 in /webapp
 2019-11-05 10:23:44 +01:00
dependabot-preview[bot]
194c826e8c
build(deps): bump graphql-shield from 7.0.0 to 7.0.1 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.0...v7.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 08:37:10 +00:00
dependabot-preview[bot]
997778c05d
build(deps-dev): bump vue-loader from 15.7.1 to 15.7.2 in /webapp 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.7.1 to 15.7.2.
- [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.1...v15.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 08:36:44 +00:00
dependabot-preview[bot]
852f7d92bc
build(deps): bump merge-graphql-schemas from 1.7.0 to 1.7.2 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.7.0 to 1.7.2.
- [Release notes](https://github.com/Urigo/merge-graphql-schemas/releases)
- [Changelog](https://github.com/Urigo/merge-graphql-schemas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Urigo/merge-graphql-schemas/compare/v1.7.0...v1.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 08:36:34 +00:00
dependabot-preview[bot]
3a1f878ce3
build(deps-dev): bump async-validator from 3.2.0 to 3.2.1 in /webapp 
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 08:36:26 +00:00
roschaefer
0cf59743ab refactor: replace 'isemail' with 'validator' 
..and use `normalizeEmail` everywhere in the webapp.
 2019-11-05 00:24:12 +01:00
roschaefer
61a8914989 Always normalize email in backend 2019-11-05 00:06:15 +01:00
roschaefer
bcf06dff25 Implement backend lookup with normalizeEmail 2019-11-05 00:06:15 +01:00
roschaefer
1d15176500 Write a test for #2057 2019-11-05 00:06:15 +01:00
Stephen Hogsten
3f7a7913c0 convert email to lowercase before submitting 2019-11-05 00:06:15 +01:00
mattwr18
bbd678caa6
Merge pull request #2075 from Human-Connection/frontend-migration-plan 
🍰 Add migration plan and frontend code guidelines to our docs
 2019-11-04 21:10:29 +01:00
roschaefer
fea0b60c2d Fix lint errors 2019-11-04 20:55:08 +01:00
ppelegrin
7e070208e0 Continue portuguese translations 2019-11-04 20:49:50 +01:00
Robert Schäfer
53da982d58
Merge pull request #2116 from Human-Connection/update-feature-template 
Update feature template
 2019-11-04 20:44:16 +01:00
roschaefer
a704709ba3 fix: resolver returned undefined for nameRU 
This registers the language Russian in the backend. Unfortunately, the
locations seem to be implemented with a hard coded attribute for each
language. 😞

We should refactor this.
 2019-11-04 20:39:28 +01:00
Alina Beck
24143f8350 ask for a more detailed description in the feature template 2019-11-04 16:27:36 +03:00
mattwr18
51af6b589a
Merge pull request #2114 from Human-Connection/update-to-version-0.1.9 
Update to version 0.1.9
 2019-11-04 14:13:02 +01:00
mattwr18
0644380afc Update to version 0.1.9 2019-11-04 12:39:18 +01:00
mattwr18
a05d63e34e v0.1.9 2019-11-04 12:38:45 +01:00
mattwr18
abbd090eb7
Merge pull request #1956 from Human-Connection/cropper-enhancements 
Refactor and tidy up crop image implementation
 2019-11-04 11:13:21 +01:00
mattwr18
d3922a8149
Merge pull request #2059 from Human-Connection/2045-filter-posts-by-language 
🍰 First Implementation Of Filtering Posts By Language
 2019-11-04 10:20:13 +01:00
Alina Beck
9caf3e7d8a follow even more suggestions by @mattwr18 2019-11-04 12:19:53 +03:00
Alina Beck
c7ef9ba04a
Apply suggestions from code review 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-04 11:45:17 +03:00
Alexander Friedland
60c2bba271
fix missing bracket 
fix missing bracket
 2019-11-03 19:14:44 +01:00
Alexander Friedland
97bd1b4816
in ru.json i started this once 
in ru.json i started this once. as a template you can use german or english. both languages are complete. you can copy and paste the ru.json. what is not translated. default will be shown in english.
 2019-11-03 19:12:20 +01:00
Ewald Arnold
5fbe0da2ae add empty russian template 2019-11-03 17:31:10 +01:00
Tomas Bednarik
c3d28af321 Clickable tags by nuxt-link 2019-11-03 12:34:56 +01:00
mattwr18
a78a58ad8d Mock $t in TeaserImage test 2019-11-02 17:02:19 +01:00
Ewald Arnold
4e0b1d06e3 added Russian to locales 2019-11-02 16:18:18 +01:00
Brent Vardy
99816f1c21 update cancel crop to keep previous image 
- Also refactor to split into more methods

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 12:09:28 +00:00
Brent Vardy
dfb59516d0 Add abiltiy to cancel out of cropper and remove image 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:48:56 +00:00
Brent Vardy
2670b48694 removed unused code and refactor cropper 
- Removed unused code
- updated confirm button to be ds-button component
- split into multiple functions

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:07:06 +00:00
Brent Vardy
daf40bbb7c Merge branch 'master' into cropper-enhancements 2019-11-02 09:42:38 +00:00
Robert Schäfer
f8b4e1f78f
Merge pull request #2105 from Human-Connection/dependabot/npm_and_yarn/cypress-3.6.0 
build(deps-dev): bump cypress from 3.5.0 to 3.6.0
 2019-11-01 14:51:50 +01:00
Alexander Friedland
056f2d32a1
change 
this.$i18n.set(this.user.locale)
 2019-11-01 13:23:06 +01:00
Alexander Friedland
9a246dea8d
remove getter locale 
remove getter locale
 2019-11-01 13:14:46 +01:00