ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
b2520258a3 Improve specification of posts resolver 
* only authors are alllowed to update/delete their own posts
* set disabled+deleted to false if not provided
 2019-03-04 18:41:05 +01:00
Grzegorz Leoniec
cbf697c031
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-04 17:37:23 +01:00
Grzegorz Leoniec
28fe77db6b
Use Styleguide 0.5.5 2019-03-04 17:18:55 +01:00
Robert Schäfer
6f116b6963 Remove custom error page 
I find the custom error page out of scope of this PR so I will create
another tracking PR to get this feature merged as soon as possible.

See: https://github.com/Human-Connection/Nitro-Web/pull/216
 2019-03-04 15:56:56 +01:00
Grzegorz Leoniec
adcedb264f
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-04 15:56:32 +01:00
Grzegorz Leoniec
4d0af7688d
Merge pull request #192 from Human-Connection/27_disable_posts 
Show disabled or deleted posts for moderators
 2019-03-04 15:55:38 +01:00
Grzegorz Leoniec
9d1c1e76a8
Merge branch 'master' into distinct-shouts-and-follows 2019-03-04 15:51:42 +01:00
Robert Schäfer
1672db0dfb Implement custom error page 
We need styling and additional translation for other
HTTP error codes.

CC @appinteractive
 2019-03-04 15:39:09 +01:00
Robert Schäfer
cfbd19b428 Quickfix of different virtual DOM on client/server 2019-03-04 15:39:09 +01:00
Robert Schäfer
eaa2017ba4 This technically lets the cypress tests pass 
@appinteractive when I run the whole apollo request in `asyncData` I get
errors that there is a mismatch of the virtual DOM trees for client and
server. Any ideas?
 2019-03-04 15:39:09 +01:00
Robert Schäfer
804cb796b8 Fix lint 2019-03-04 15:39:09 +01:00
Robert Schäfer
370748ce55 Sketch cypress test to hide posts from the public 2019-03-04 15:39:09 +01:00
Robert Schäfer
82bbdd12c4
Merge branch 'master' into 27_disable_posts 2019-03-04 15:35:46 +01:00
Robert Schäfer
f496b3f329
Merge pull request #202 from Human-Connection/dependabot/npm_and_yarn/eslint-5.15.0 
Bump eslint from 5.14.1 to 5.15.0
 2019-03-04 15:35:24 +01:00
Grzegorz Leoniec
78f6da8399
Fixed Search Input 2019-03-04 11:24:48 +01:00
dependabot[bot]
b23380d593
Bump eslint from 5.14.1 to 5.15.0 
Bumps [eslint](https://github.com/eslint/eslint) from 5.14.1 to 5.15.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.14.1...v5.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-04 04:21:10 +00:00
Grzegorz Leoniec
76c4e4cd8f
Show status of follows and shouts for currently logged in user 2019-03-03 19:30:54 +01:00
Grzegorz Leoniec
f39e27c47c
Added followedByCurrentUser and shoutedByCurrentUser 2019-03-03 19:29:40 +01:00
Grzegorz Leoniec
257183ac3f
added currentUserId to cypher params 2019-03-03 19:29:25 +01:00
Grzegorz Leoniec
83b36e8e35
Output distinct counts 2019-03-03 15:55:11 +01:00
dependabot[bot]
802736e562
Merge pull request #183 from Human-Connection/dependabot/npm_and_yarn/@babel/core-7.3.4 2019-03-03 14:40:23 +00:00
Robert Schäfer
4a64755df7
Merge branch 'master' into 27_disable_posts 2019-03-03 15:27:27 +01:00
Robert Schäfer
cb78a30195 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/@babel/core-7.3.4 2019-03-03 15:27:02 +01:00
Robert Schäfer
db30f4d2d4
Merge pull request #195 from Human-Connection/194-create-unit-test-for-badges 
[WIP] Write API test badge creation
 2019-03-03 15:22:21 +01:00
Robert Schäfer
c4b9d9011b
Merge branch 'master' into 194-create-unit-test-for-badges 2019-03-03 14:34:53 +01:00
Robert Schäfer
8d1eb6026a Let all tests pass 💚 2019-03-03 14:35:08 +01:00
Robert Schäfer
fb2b407be0 Extend @Tirokk 's test to Create and Update 2019-03-03 14:32:29 +01:00
Robert Schäfer
f25708875a Refactor badges test 
CC @Tirokk @grenzfrequence

* the top level block should correspond with the name of the resolver
  * the block below should be `CreatePost` or `UpdatePost`
* the arguments of client.request are `query/mutation`, `variables` but
  you passed in the `headers` which should go into `new
  GraphQlClient(host, options)`
* re-use the very same mutation to avoid bugs in the tests
* use `await expect(someAsyncMethod).resolves.toEqual(expected)` style for
  extra test assurance
 2019-03-03 14:01:50 +01:00
Robert Schäfer
44a4e3e32f
Merge branch 'master' into 27_disable_posts 2019-03-03 13:34:22 +01:00
Robert Schäfer
e6a980d2ff Add badge to README, only deploy on master branch 2019-03-02 21:15:15 +01:00
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