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

7796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattwr18
084388a21e Follow new file structure 
- avoid nested directories
 2019-11-11 08:50:35 +01:00
mattwr18
f34c8f44e0 Update resolver for paginated notifications 2019-11-11 08:50:35 +01:00
mattwr18
4448c12f2e Add componenet test for AvatarMenu 
Co-authored-by: mindcodemediator
<mindcodemediator@users.noreply.github.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-11-11 08:50:35 +01:00
mattwr18
d83a424513 Add styling 
- to link in NotificationMenu
- make table more mobile responsive
- remove unneccessary props

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-11-11 08:50:35 +01:00
mattwr18
994a0b049d Extract AvatarMenu into its own component 2019-11-11 08:50:35 +01:00
mattwr18
58b1f7948c Follow @alina-beck and @Tirokk suggestions 
- following PR reviews
 2019-11-11 08:50:35 +01:00
mattwr18
e8cf51095a Add back missing translation 2019-11-11 08:50:35 +01:00
mattwr18
cf8124fb2d Clean up/add german translations 2019-11-11 08:50:35 +01:00
mattwr18
b79770469f Update notifications page 
- display more notifications by simplifying the table
- get sorting working
 2019-11-11 08:50:35 +01:00
mattwr18
7cdc12f4b9 Add notifications page with Notifications in table 
- At the moment, the notifications are displayed in a table, and have
the same functionality as the NotificationMenu where you can click on
the title of the Post and visit the Post

- Unsure about the styling, it would kind of be nice to have a more
condensed list to see more notifications per page, but still be able to
click on a row and visit the Post
 2019-11-11 08:50:35 +01:00
mattwr18
ceb77d2bb6
Merge pull request #1909 from Human-Connection/add-missing-portuguese-translations 
Add missing portuguese translation
 2019-11-11 08:49:19 +01:00
Wolfgang Huß
74bc1963f6 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-11 08:32:53 +01:00
Alina Beck
719c978603
Apply suggestions from code review 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-11 10:13:10 +03:00
Alina Beck
263ee16e3d
Merge pull request #2159 from Human-Connection/migrate-design-tokens 
Migrate design tokens
 2019-11-11 10:06:10 +03:00
Vasily Belolapotkov
dc09240c20 sync with 'master' to cleanup PR 2019-11-10 11:48:39 +03:00
roschaefer
7c278d7c7f fix: send 403 if you try to edit another's post 
This also fixes the glitch that you click on "Edit post" and the
contribution form is empty.
 2019-11-08 17:30:29 +01:00
roschaefer
6c947f782d Fix CSS classes 2019-11-08 17:30:05 +01:00
Wolfgang Huß
553a3ca2cb Implement 'decide' button and functionality 2019-11-08 17:29:09 +01:00
roschaefer
4108bb7d71 Merge remote-tracking branch 'origin/2119_Create_Post_consistent_form_input_validation' into 2119_Create_Post_consistent_form_input_validation-improvements 2019-11-08 16:32:16 +01:00
Wolfgang Huß
c2444a5288 Changed layout 2019-11-08 16:26:46 +01:00
Wolfgang Huß
49bea62fa7 Clarified comments in 'decide' resolver 2019-11-08 10:01:49 +01:00
Wolfgang Huß
3020a38de2 Rename variable 2019-11-08 09:56:18 +01:00
Wolfgang Huß
f2ab84a5e9 Change database script 2019-11-08 09:56:06 +01:00
Wolfgang Huß
1a4ca722ca Corrected icon color related to decision status 2019-11-08 09:46:47 +01:00
Wolfgang Huß
353687766e Change 'DECIDED' property 'updatedAt' to always be set 2019-11-08 09:41:28 +01:00
Wolfgang Huß
f4a62b03dc Clarify 'decide' resolver, rename to 'latest' property 2019-11-08 09:12:49 +01:00
Wolfgang Huß
526e4c642b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-08 08:28:47 +01:00
dependabot-preview[bot]
4834556623
build(deps-dev): bump cypress-file-upload from 3.4.0 to 3.5.0 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.4.0...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-08 04:21:08 +00:00
dependabot-preview[bot]
fe2beaeedc
build(deps): bump date-fns from 2.6.0 to 2.7.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.6.0...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-08 04:21:05 +00:00
dependabot-preview[bot]
a47e495537
build(deps-dev): bump date-fns from 2.6.0 to 2.7.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.6.0...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-08 04:20:40 +00:00
roschaefer
a2dbe47f1f Fix tests 2019-11-08 00:50:20 +01:00
roschaefer
62b393b0f0 Refactoring of Categories Select component 2019-11-07 23:23:47 +01:00
Wolfgang Huß
2a23bbf101 Refactor frontend and 'reports' query again 2019-11-07 15:54:26 +01:00
ogerly
dd03f4b7f0 Fix Add Language check for form submit 2019-11-07 15:40:58 +01:00
roschaefer
c83a808825 Refactor content length validation with transform 2019-11-07 14:22:05 +01:00
roschaefer
253032468f Refactor: Re-use validation via error slot 2019-11-07 14:17:22 +01:00
ogerly
e4cbf9246b better style and dom 2019-11-07 13:00:28 +01:00
Alexander Friedland
826924ad7e
change 
this.$i18n.set(this.user.locale || 'en')
 2019-11-07 11:42:58 +01:00
ogerly
f739dd8f11 fix css - checkbutton cursor: default 2019-11-07 11:39:07 +01:00
ppelegrin
09064c57fa Manting portuguese translation 2019-11-07 11:37:10 +01:00
mattwr18
9c60775c81 Merge branch 'master' of github.com:Human-Connection/Human-Connection into migrate-design-tokens 2019-11-07 10:41:39 +01:00
dependabot-preview[bot]
eaefce1390
build(deps-dev): bump @babel/core from 7.6.4 to 7.7.2 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.6.4 to 7.7.2.
- [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.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 09:41:23 +00:00
mattwr18
1fd3fd8e41
Merge pull request #2158 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.2 
build(deps-dev): bump @babel/core from 7.7.0 to 7.7.2 in /webapp
 2019-11-07 10:39:23 +01:00
mattwr18
a344919154
Merge pull request #2157 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-svg-loader-0.14.0 
build(deps-dev): bump vue-svg-loader from 0.12.0 to 0.14.0 in /webapp
 2019-11-07 10:38:52 +01:00
dependabot-preview[bot]
fa33b640d8
build(deps): bump merge-graphql-schemas from 1.7.2 to 1.7.3 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.7.2 to 1.7.3.
- [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.2...1.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 09:18:01 +00:00
mattwr18
28c9bb17c6
Merge pull request #2151 from Human-Connection/2150_remove-graphql-request 
Remove graphql-requests
 2019-11-07 10:16:04 +01:00
mattwr18
cb2b8ddad7
Merge pull request #2148 from Human-Connection/2128-close-all-sessions 
close all open sessions
 2019-11-07 10:05:59 +01:00
Alexander Friedland
f023fa40c9
Merge pull request #2126 from Human-Connection/1994-load-latest-posts-on-logo-click 
Implement refresh posts, fix duplicate posts bug
 2019-11-07 09:53:03 +01:00
Alexander Friedland
377b0eb2b3
Merge pull request #2118 from Human-Connection/fix-2057 
Fix: Email is Case-Sensitive
 2019-11-07 09:52:47 +01:00
ogerly
32c5ea1d52 fix category if fail, fix lint 2019-11-07 09:23:00 +01:00