3916 Commits

Author SHA1 Message Date
Lala Sabathil
803bd237bd
Merge branch 'master' into get_rid_of_resource_type 2019-03-08 12:36:09 +01:00
Lala Sabathil
699c612709
Merge branch 'master' into distinct-shouts-and-follows 2019-03-08 12:35:22 +01:00
Lala Sabathil
4631d36c71
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-08 12:34:22 +01:00
Lala Sabathil
f54227ffbf
Merge pull request #215 from Human-Connection/dependabot/npm_and_yarn/jest-24.3.1
Bump jest from 24.1.0 to 24.3.1
2019-03-08 12:31:41 +01:00
Lala Sabathil
94f51c58e3
Update README.md 2019-03-08 12:28:21 +01:00
Grzegorz Leoniec
c854e8e98c
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-08 12:07:35 +01:00
dependabot[bot]
c8ba2f6558
Bump jest from 24.1.0 to 24.3.1
Bumps [jest](https://github.com/facebook/jest) from 24.1.0 to 24.3.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.1.0...v24.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-08 10:59:31 +00:00
Grzegorz Leoniec
74b9dc1575
Merge remote-tracking branch 'origin/master' into 37-full-text-search-top-bar 2019-03-08 11:56:51 +01:00
Grzegorz Leoniec
dfc28acfe5
Do nodemon restart on .js and .graphql files 2019-03-08 11:56:15 +01:00
Lala Sabathil
427db438a4
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-08 11:50:27 +01:00
Lala Sabathil
d930c2d245
Merge branch 'master' into distinct-shouts-and-follows 2019-03-08 11:50:05 +01:00
Lala Sabathil
76197657bf
Merge branch 'master' into get_rid_of_resource_type 2019-03-08 11:49:38 +01:00
Lala Sabathil
477972f2ba
Merge pull request #216 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.3.1
Bump babel-jest from 24.1.0 to 24.3.1
2019-03-08 11:44:23 +01:00
Lala Sabathil
c2dd92200d
Update README.md 2019-03-08 11:14:35 +01:00
Lala Sabathil
7aec9eabf1
Update README.md 2019-03-08 11:13:24 +01:00
Lala Sabathil
3eaf95b90c
Update README.md 2019-03-08 11:05:04 +01:00
Lala Sabathil
51b2874d5d
Update README.md 2019-03-08 11:04:38 +01:00
Lulalaby
4bcdfcf4b7 Removed old Repos 2019-03-08 11:00:55 +01:00
root
9d953ee125 Updated Submodules 2019-03-08 10:50:16 +01:00
Lala Sabathil
5c3333c505
Merge pull request #163 from Human-Connection/Lulalaby-patch-1
Update .gitmodules
2019-03-08 10:41:57 +01:00
Lala Sabathil
5d78dbd97a
Update .gitmodules
Added other Nitro Repos
2019-03-08 10:41:48 +01:00
Lala Sabathil
c91ca1d0ab
Merge pull request #147 from Human-Connection/Repos-stats
Show all repos build stats
2019-03-08 10:35:08 +01:00
Lala Sabathil
84d496bf84
Update README.md 2019-03-08 10:33:28 +01:00
Lala Sabathil
326fb217a2
Update README.md 2019-03-08 10:29:00 +01:00
Lala Sabathil
ad0e5c9a67
Update README.md
Updated Frontend & Repo to Nitro
2019-03-08 10:27:45 +01:00
Lala Sabathil
f1f0a48d54
Merge pull request #162 from Human-Connection/dependabot/submodules/Nitro-Backend-2d24fc9
Bump Nitro-Backend from `2813de4` to `2d24fc9`
2019-03-08 10:19:35 +01:00
dependabot[bot]
e906bb42fd
Bump Nitro-Backend from 2813de4 to 2d24fc9
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `2813de4` to `2d24fc9`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](2813de4f8b...2d24fc9945)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-08 04:41:32 +00:00
dependabot[bot]
13d7f677e8
Bump babel-jest from 24.1.0 to 24.3.1
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.1.0 to 24.3.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.3.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-08 04:23:50 +00:00
Robert Schäfer
47eaf7dea0 Fix cypress test with more specific matcher 2019-03-08 01:41:28 +01:00
Robert Schäfer
ba369d82fe Fix translations, lint and some tests 2019-03-08 01:39:28 +01:00
mattwr18
6d2d4f305f
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-07 21:08:20 -03:00
Lala Sabathil
c50c4b78d9
Merge branch 'master' into distinct-shouts-and-follows 2019-03-08 01:00:19 +01:00
Matt Rider
842d68c129 Update ReportModal to work with back end 2019-03-07 20:59:13 -03:00
Matt Rider
11ca909b85 Write cypress tests
- Press enter starts search
- Press escape clears search
- Select entry goes to post
- Select dropdown content
2019-03-07 19:28:50 -03:00
Robert Schäfer
f68e289016 Fix lint 2019-03-07 22:44:43 +01:00
Robert Schäfer
0529e2b2b0 Refactor report mutation, return a proper Report 2019-03-07 22:42:32 +01:00
Matt Rider
61a45d39ea Respond with reporter, resource 2019-03-07 17:43:00 -03:00
Matt Rider
d00e4fad39 Merge branch 'master' of github.com:Human-Connection/Nitro-Backend into get_rid_of_resource_type 2019-03-07 16:16:25 -03:00
Robert Schäfer
95e9c14cc6 Refactor report mutation/type to reduce redundancy
We don't need to save the type of the reported resource. We can derive
it.
2019-03-07 20:13:39 +01:00
Robert Schäfer
4596041186 Refactor mutations without Resource type 2019-03-07 20:13:25 +01:00
Robert Schäfer
2d24fc9945
Merge pull request #207 from Human-Connection/27_disable_posts
Disable posts
2019-03-07 19:14:33 +01:00
Robert Schäfer
1377455cda Disable/enable should return the Resource 2019-03-07 18:31:54 +01:00
Lala Sabathil
ccb7241bf7
Merge branch 'master' into 27_disable_posts 2019-03-07 16:46:34 +01:00
Lala Sabathil
d3ed4ad75f
Merge branch 'master' into distinct-shouts-and-follows 2019-03-07 16:45:52 +01:00
Lala Sabathil
0c2a8783d6
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-07 16:45:28 +01:00
Lala Sabathil
ae88db1dbe
Merge pull request #208 from Human-Connection/dependabot/npm_and_yarn/apollo-link-http-1.5.12
Bump apollo-link-http from 1.5.11 to 1.5.12
2019-03-07 16:44:39 +01:00
Lala Sabathil
b6cc03cbe8
Merge branch 'master' into dependabot/npm_and_yarn/apollo-link-http-1.5.12 2019-03-07 16:23:39 +01:00
Lala Sabathil
6341e467f9
Merge pull request #159 from Human-Connection/dependabot/submodules/Nitro-Web-d848929
Bump Nitro-Web from `d857252` to `d848929`
2019-03-07 16:11:44 +01:00
Lala Sabathil
c90fcea15c
Merge pull request #160 from Human-Connection/dependabot/submodules/Nitro-Backend-2813de4
Bump Nitro-Backend from `c5c62d2` to `2813de4`
2019-03-07 16:11:35 +01:00
Armin
d16a1f62ff Refactoring + adding helmet for some basic security 2019-03-07 15:22:34 +01:00