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

2395 Commits

Author SHA1 Message Date
Alina Beck
d685ff9e7b translate and style user count 2019-12-03 13:25:20 +03:00
Alina Beck
9801369343 merge table rows 2019-12-03 13:07:24 +03:00
Alina Beck
4585dc7e8c table cell content design tweaks 2019-12-03 12:45:28 +03:00
Alina Beck
febabf9303 rename table header translations 2019-12-03 12:25:19 +03:00
Alina Beck
21a3ff4bc8 render just one thead and tbody for the reports table 2019-12-03 12:03:41 +03:00
Alina Beck
150ffef35a style report list header 2019-12-03 11:37:58 +03:00
mattwr18
bcbce2a34a Refactor modalData to use mapMutations, computed 
- clean it up some
 2019-12-02 20:50:55 +01:00
mattwr18
7db3696819 Return createdAt/updatedAt for Report 2019-12-02 20:50:28 +01:00
mattwr18
e1c56346cc Add story/spec for ReportsTable component/refactor 
- use data-test to target elements in tests
 2019-12-02 20:50:10 +01:00
mattwr18
46b6483c90 Add story/spec for CounterIcon component 2019-12-02 20:48:12 +01:00
mattwr18
00d5f58b00 Move components to features, style table[WIP] 
- In conversations with @alina-beck, she suggested we move the
ReportsTable and FiledTable to features since it is tightly coupled to
Reports... we can work towards a table that is "dumb" and just takes the
data and displays it in another PR
- Add extra column for Current status
- Fix widths
 2019-12-02 11:26:11 +01:00
roschaefer
3409a34374 Always show the menu to switch filters 2019-11-30 02:22:53 +01:00
roschaefer
74a65a9114 Be more specific "Current status" inst. of "Type" 2019-11-30 02:21:29 +01:00
roschaefer
9fd895fc42 Use <button> instead of <a> 
If you don't want to link somewhere, use a button instead of an anchor,
fellas. 😉
 2019-11-30 01:31:57 +01:00
mattwr18
985d53e52b Fix broken tests 2019-11-29 20:49:46 +01:00
mattwr18
7441dbf28c Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-29 20:43:09 +01:00
mattwr18
107f10edc9 Update table styling 2019-11-29 15:29:11 +01:00
mattwr18
b7f0bc7164
Merge pull request #2375 from Human-Connection/keep_dots_in_emails 
Don't remove sub-addresses in emails
 2019-11-29 14:14:25 +01:00
mattwr18
a8a9abb4e4 Refactor/Add new components 2019-11-29 14:02:53 +01:00
mattwr18
3c0a24825c Move components to _new structure/refactor 
- extract more components
 2019-11-29 13:27:39 +01:00
mattwr18
9401d4e1e1 [WIP] Extract code into own components 2019-11-28 17:38:44 +01:00
mattwr18
9990fe2cb2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-28 16:14:23 +01:00
mattwr18
3d8435dde1 Get frontend working with data from backend 2019-11-28 16:13:48 +01:00
roschaefer
973d3f899a Remove dots of gmail addresses 
I had a chat with our moderator Daniel. He asks us to remove dots from
gmail accounts. He finds it more consistent and he has no problem to
write a mail to a gmail address without dots. He is OK to save the
email address different from how a user memorizes it.
 2019-11-28 14:02:11 +01:00
roschaefer
7146e0a9b2 Fix lint 2019-11-28 13:48:09 +01:00
mattwr18
21be2c08ba Update to return resource instead of to 
- more verbose makes it easier to understand
 2019-11-28 13:44:00 +01:00
roschaefer
9e2baf25d2 Don't remove dots in emails 2019-11-28 11:22:09 +01:00
dependabot-preview[bot]
0a5a0668c8
build(deps): bump @nuxtjs/apollo in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc17 to 4.0.0-rc18.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.17...v4.0.0-rc.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-28 04:19:49 +00:00
mattwr18
4861ab26dd
Merge pull request #2369 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-23.0.5 
build(deps-dev): bump eslint-plugin-jest from 23.0.4 to 23.0.5 in /webapp
 2019-11-27 18:15:51 +01:00
mattwr18
f42eea15a6
Merge pull request #2323 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.8.1 
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp
 2019-11-27 18:11:08 +01:00
mattwr18
e6fdb70a07 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-27 18:09:24 +01:00
mattwr18
1f7d8a023e Update reports query in frontend 2019-11-27 17:45:32 +01:00
Moriz Wahl
d47ebb936e use .filter to find items 2019-11-27 14:28:57 +01:00
Moriz Wahl
809ef47a03 only one expect per it block 2019-11-27 14:28:57 +01:00
Moriz Wahl
3d3a121dc5 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
e4883b5175 method tests added 2019-11-27 14:28:57 +01:00
Moriz Wahl
a14b3cb39a spec file added with basic test logic 2019-11-27 14:28:57 +01:00
Moriz Wahl
3b49744b51 directory created a path names changed 2019-11-27 14:28:57 +01:00
Alina Beck
2b1f0b1c4a
Merge pull request #2288 from Human-Connection/migrate-styleguide-icons 
Migrate styleguide icons
 2019-11-27 13:28:56 +03:00
Alina Beck
1dc68cbae8 follow @Roschaefer suggestions 2019-11-27 11:51:30 +03:00
dependabot-preview[bot]
448c29a39b
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.4 to 23.0.5.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.4...v23.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 04:22:56 +00:00
mattwr18
2f249a73c5 Rename REPORTED Claim to FILED Report 2019-11-26 15:35:48 +01:00
dependabot-preview[bot]
dba23268c7
build(deps): bump date-fns from 2.7.0 to 2.8.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.7.0 to 2.8.1.
- [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.7.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-26 09:20:37 +00:00
mattwr18
700182e29a
Merge pull request #2340 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.7.4 
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /webapp
 2019-11-26 10:18:51 +01:00
mattwr18
d9344655a4
Merge pull request #2319 from Human-Connection/dependabot/npm_and_yarn/webapp/validator-12.1.0 
build(deps): bump validator from 12.0.0 to 12.1.0 in /webapp
 2019-11-26 10:17:14 +01:00
mattwr18
ff404e3c37 Fix graphql mutation for returned Claim 2019-11-25 19:02:58 +01:00
mattwr18
6a66176e28
Merge pull request #2350 from Human-Connection/2349-fix-updating-post-image-submit-bug 
Fix updating post by adding/changing image bug submits form
 2019-11-25 15:37:20 +01:00
dependabot-preview[bot]
587fb81599
build(deps): bump validator from 12.0.0 to 12.1.0 in /webapp 
Bumps [validator](https://github.com/chriso/validator.js) from 12.0.0 to 12.1.0.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/12.0.0...12.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 10:42:16 +00:00
dependabot-preview[bot]
69ea174ac8
build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.2 to 7.7.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.7.2...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-25 10:41:55 +00:00
Alina Beck
171d876bfd
Update webapp/components/_new/generic/BaseIcon/BaseIcon.vue 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-25 13:39:52 +03:00