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

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
7a4fdf12eb Deploy by deleting all pods 
For now let's have it on all branches and check if it works. I will
change the line once it works.
 2019-03-02 21:09:41 +01:00
Robert Schäfer
0b678f7759 Now the environment variables finally show up 2019-03-02 20:59:33 +01:00
Robert Schäfer
036ce54152 Second try: maybe the env variables weren't set 2019-03-02 20:51:17 +01:00
Robert Schäfer
ac6cc8ab2c Check in encrypted kubeconfig file 
and test it with `kubectl get nodes`
 2019-03-02 20:45:01 +01:00
Robert Schäfer
b0c9d818fd Start an automated build by adding a .travis.yml 2019-03-02 20:37:10 +01:00
Matt Rider
cba5e10397 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-01 14:26:03 -03:00
Wolfgang Huß
6937c60ef8 Only admins are allowed to create badges 2019-03-01 15:49:11 +01:00
Wolfgang Huß
d8502ef3a9 Merge branch '194-create-unit-test-for-badges' of https://github.com/Human-Connection/Nitro-Backend into 194-create-unit-test-for-badges 2019-03-01 13:55:20 +01:00
Wolfgang Huß
6271c6e8a3 Add to .gitignore .DS_Store (#196) 2019-03-01 13:38:14 +01:00
Wolfgang Huß
ec64811379 Add to .gitignore .DS_Store 2019-03-01 13:17:07 +01:00
Wolfgang Huß
20b5cd521b Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-03-01 11:57:24 +01:00
Grzegorz Leoniec
9b9d16e8d4
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-01 11:51:47 +01:00
Grzegorz Leoniec
5255159f94
Merge remote-tracking branch 'origin/temporary_merge_branch' into 37-full-text-search-top-bar 2019-03-01 11:45:55 +01:00
Grzegorz Leoniec
fe99629fe8
Merge pull request #197 from Human-Connection/add-styleguide-dev-mode 
Add styleguide dev mode
 2019-03-01 11:43:37 +01:00
Grzegorz Leoniec
2edd5fe294
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-01 11:11:48 +01:00
mattwr18
09a022a338
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-01 07:08:11 -03:00
Matt Rider
5e592f666b Write unit test badge creation 
- for unauthenticated
- for authenticated admin

Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
 2019-02-28 16:16:14 -03:00
Robert Schäfer
7700a34804 Merge remote-tracking branch 'origin/master' into 37-full-text-search-top-bar 2019-02-28 18:55:31 +01:00
Robert Schäfer
8febf147ce Fix lint 2019-02-28 18:37:52 +01:00
Robert Schäfer
f3ab671f21 Soft delete middleware test passes 2019-02-28 18:37:52 +01:00
Robert Schäfer
911500a3bd Don't override given { deleted, disabled } = args 
@appinteractive I guess this was done unintentionally?
 2019-02-28 18:37:52 +01:00
Robert Schäfer
738ba4f51c DRY softDeleteMiddleware 2019-02-28 18:37:52 +01:00
Robert Schäfer
ce28de893b Write a test for #27 
Moderators are allowed to see disabled or deleted posts if they
ask for it.
 2019-02-28 18:37:52 +01:00
Grzegorz Leoniec
d6a44edb7c
Merge branch 'master' into add-styleguide-dev-mode 2019-02-28 17:41:07 +01:00
Robert Schäfer
157c3a1563
Merge pull request #199 from Human-Connection/194_stop_decoding_jwt_on_frontend 
194 stop decoding jwt on frontend
 2019-02-28 17:22:27 +01:00
Grzegorz Leoniec
66da05904a
Merge branch 'master' into add-styleguide-dev-mode 2019-02-28 14:42:06 +01:00
Grzegorz Leoniec
ca3fecebb7
Document the new styleguide developmen workflow in the readme. 2019-02-28 14:39:54 +01:00
Grzegorz Leoniec
ad220324f2
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 14:34:18 +01:00
Grzegorz Leoniec
086345cd35
Merge pull request #187 from Human-Connection/194_stop_decoding_jwt_on_frontend 
Implement currentUser query
 2019-02-28 14:33:12 +01:00
dependabot[bot]
ab6a9d017f
Merge pull request #196 from Human-Connection/dependabot/npm_and_yarn/@babel/preset-env-7.3.4 2019-02-28 12:18:25 +00:00
Grzegorz Leoniec
9427f3937f
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 12:23:55 +01:00
Grzegorz Leoniec
9679c67939
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 12:22:30 +01:00
dependabot[bot]
c0246332a6
Bump @babel/preset-env from 7.3.1 to 7.3.4 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.3.1 to 7.3.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.3.1...v7.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 10:01:09 +00:00
dependabot[bot]
80f028474b
Merge pull request #210 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.5.1 2019-02-28 09:57:49 +00:00
Grzegorz Leoniec
cd94f003f8
Fixed yarn.lock 2019-02-28 10:48:52 +01:00
Grzegorz Leoniec
da2f59145d
Merge branch 'master' into add-styleguide-dev-mode 2019-02-28 10:47:48 +01:00
dependabot[bot]
6933657530
Merge pull request #184 from Human-Connection/dependabot/npm_and_yarn/@babel/preset-env-7.3.4 2019-02-28 09:40:06 +00:00
Grzegorz Leoniec
066d8bcee2
Merged master in 2019-02-28 10:32:37 +01:00
Grzegorz Leoniec
5b33257f5a
Merged master in 2019-02-28 10:31:40 +01:00
dependabot[bot]
57c24f62d1
Bump @babel/preset-env from 7.3.1 to 7.3.4 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.3.1 to 7.3.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.3.1...v7.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 09:25:48 +00:00
dependabot[bot]
4152a2e393
Merge pull request #186 from Human-Connection/dependabot/npm_and_yarn/apollo-server-testing-2.4.8 2019-02-28 09:21:42 +00:00
Grzegorz Leoniec
a8b1a673d0
Merge remote-tracking branch 'origin/master' into 37-full-text-search-top-bar 2019-02-28 10:06:16 +01:00
dependabot[bot]
4b2ca9368b
Bump apollo-server-testing from 2.4.2 to 2.4.8 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.4.2 to 2.4.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.4.2...apollo-server-testing@2.4.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 08:58:00 +00:00
dependabot[bot]
e95d6d4ce3
Merge pull request #193 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.5.1 2019-02-28 08:52:22 +00:00
Grzegorz Leoniec
9e57f138cb
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 09:49:20 +01:00
Grzegorz Leoniec
88e5f36f6c
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 09:49:15 +01:00
Wolfgang Huß
d4a85cfbc1 Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-02-28 09:35:57 +01:00
dependabot[bot]
8ecd39b2ad
Bump apollo-cache-inmemory from 1.5.0 to 1.5.1 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.5.0...apollo-cache-inmemory@1.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 07:42:15 +00:00
dependabot[bot]
1e46ed68bc
Merge pull request #209 from Human-Connection/dependabot/npm_and_yarn/apollo-client-2.5.1 2019-02-28 07:39:48 +00:00
dependabot[bot]
65f8fc3567
Bump apollo-client from 2.5.0 to 2.5.1 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.5.0...apollo-client@2.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 04:29:35 +00:00