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

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
c71f6fb07c
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-06 18:46:16 +01:00
Grzegorz Leoniec
d848929302
Improved countTo component 2019-03-06 18:45:57 +01:00
Robert Schäfer
389f447186
Merge branch 'master' into 27_disable_posts 2019-03-06 17:21:56 +01:00
Robert Schäfer
8072939458 Tiny performance improvement 2019-03-06 17:21:49 +01:00
Robert Schäfer
f40a67b7a8 Implement disabling of comments+users+posts 2019-03-06 17:13:36 +01:00
Robert Schäfer
1c34f10f96 Test refactoring: Check comments + posts 2019-03-06 17:13:36 +01:00
Grzegorz Leoniec
6617aaefc3
Merge branch 'master' into distinct-shouts-and-follows 2019-03-06 16:34:25 +01:00
Grzegorz Leoniec
7a00e7f1c7
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-06 13:23:04 +01:00
Grzegorz Leoniec
2813de4f8b
Fixed organization seeder 2019-03-06 13:20:33 +01:00
Grzegorz Leoniec
78c9b83282
Fixed follow stats 2019-03-06 13:08:26 +01:00
dependabot[bot]
09ec8c3602
Bump apollo-link-http from 1.5.11 to 1.5.12 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.11 to 1.5.12.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.11...apollo-link-http@1.5.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-06 04:31:31 +00:00
dependabot[bot]
995ae36f21
Merge pull request #188 from Human-Connection/dependabot/npm_and_yarn/@vue/cli-shared-utils-3.4.1 2019-03-06 03:40:42 +00:00
dependabot[bot]
70416b4722
Bump @vue/cli-shared-utils from 3.4.0 to 3.4.1 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.4.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-06 01:24:16 +00:00
dependabot[bot]
b3e42fc444
Merge pull request #225 from Human-Connection/dependabot/npm_and_yarn/@nuxtjs/axios-5.4.1 2019-03-06 01:21:53 +00:00
Robert Schäfer
5cff508bd6 Disable/enable fullfills tests 2019-03-06 01:07:04 +01:00
dependabot[bot]
4efe4f42e9
Bump @nuxtjs/axios from 5.3.6 to 5.4.1 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.3.6 to 5.4.1.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.3.6...v5.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-05 23:05:15 +00:00
dependabot[bot]
8fcd108eb6
Merge pull request #221 from Human-Connection/dependabot/npm_and_yarn/eslint-5.15.1 2019-03-05 23:02:08 +00:00
Robert Schäfer
0a73ddd46d Refactor: custom resolvers for moderation 2019-03-05 23:59:54 +01:00
Grzegorz Leoniec
865fdebc5f
Fixed linting issues inside tests 2019-03-05 18:58:17 +01:00
Grzegorz Leoniec
c2aea104f4
Added basic tests for follow mutation 2019-03-05 18:44:39 +01:00
Grzegorz Leoniec
4fdb1562f9
Added test for shoutedByCurrentUser flag on posts 2019-03-05 18:34:35 +01:00
Grzegorz Leoniec
a292a522e9
Fixed an issue and added basic testing for (un)shout 2019-03-05 18:30:28 +01:00
Robert Schäfer
2b7576521c Fix lint 
+ return more attributes in post factory for convenience
 2019-03-05 18:17:02 +01:00
Robert Schäfer
592f25b978 Implement update of .disabled field 2019-03-05 18:14:25 +01:00
Robert Schäfer
99cebc8d64 Implementation ready except disabled attr. 2019-03-05 17:45:10 +01:00
Grzegorz Leoniec
29dac5c5a3
Removed unused voted var from author component 2019-03-05 17:37:48 +01:00
Grzegorz Leoniec
8792f02932
Improved follow button optimistic behavior 2019-03-05 17:35:41 +01:00
Grzegorz Leoniec
d9b633c5ae
Make follow button update instant 2019-03-05 17:26:20 +01:00
Grzegorz Leoniec
d30649164a
Improved following and shout behavior 2019-03-05 17:19:35 +01:00
Robert Schäfer
f2e7e515a4 Check from: User! matches the authenticated user 2019-03-05 16:46:39 +01:00
Robert Schäfer
85d9d7043e Setup isModerator permission for disable relation 2019-03-05 16:25:01 +01:00
Robert Schäfer
420ea8a4d6 Scaffold some tests for disabledBy relation 2019-03-05 16:15:31 +01:00
Robert Schäfer
f644507e4f Intermediate commit 2019-03-05 15:47:03 +01:00
Grzegorz Leoniec
66edec0dc8
Translated shot button 2019-03-05 14:30:02 +01:00
Grzegorz Leoniec
656be9416a
Merge branch 'distinct-shouts-and-follows' of github.com:appinteractive/hc-prototype-api into distinct-shouts-and-follows 2019-03-05 14:18:27 +01:00
Grzegorz Leoniec
45a004662f
Disable shouting of own content 2019-03-05 14:18:22 +01:00
Grzegorz Leoniec
1423101ca5
Disable shouting for own content 2019-03-05 14:18:06 +01:00
Grzegorz Leoniec
ec85602b4f
Merge branch 'master' into distinct-shouts-and-follows 2019-03-05 14:17:25 +01:00
Grzegorz Leoniec
33ef91ee08
Fixed an issue with following state update 2019-03-05 13:47:33 +01:00
Grzegorz Leoniec
e20d3fb214
Improved following button and translated it 2019-03-05 13:43:09 +01:00
Robert Schäfer
979c7d4a18
Merge pull request #206 from Human-Connection/dependabot/npm_and_yarn/eslint-5.15.1 
Bump eslint from 5.15.0 to 5.15.1
 2019-03-05 13:03:27 +01:00
Grzegorz Leoniec
c27204d56e
Merge branch 'master' into distinct-shouts-and-follows 2019-03-05 12:54:24 +01:00
Grzegorz Leoniec
975c0c80f9
Added unshout functionality to shout button 2019-03-05 12:53:46 +01:00
Grzegorz Leoniec
30e7c57764
Fixed shout and follow behavior 2019-03-05 11:39:55 +01:00
Grzegorz Leoniec
dc13467294
Use new follow mutation 2019-03-05 11:21:19 +01:00
Grzegorz Leoniec
c40f6521d1
Use new shout mutation 2019-03-05 11:19:23 +01:00
Grzegorz Leoniec
d7b1ea88c4
Fixed shouts and follows 2019-03-05 11:18:59 +01:00
Matt Rider
8633f62a39 Modify test importing our styleguide 2019-03-05 07:10:48 -03:00
Matt Rider
1ac2c15947 Merge branch '37-full-text-search-top-bar' of github.com:Tirokk/Nitro-Web into 37-full-text-search-top-bar 2019-03-05 07:07:08 -03:00
Grzegorz Leoniec
e2add5a730
Added (un)shout and (un)follow mutations 2019-03-05 10:56:47 +01:00