IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-02-06 09:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
883 Commits 5 Branches 6 Tags
Commit Graph

883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
66edec0dc8
Translated shot button 2019-03-05 14:30:02 +01:00
Grzegorz Leoniec
1423101ca5
Disable shouting for own content 2019-03-05 14:18:06 +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
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
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
Matt Rider
87b20d4e89 Merge branch '37-full-text-search-top-bar' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-05 06:28:33 -03:00
Matt Rider
3b8eff00dd Merge branch '37-full-text-search-top-bar' of github.com:Tirokk/Nitro-Web into 37-full-text-search-top-bar 2019-03-05 06:23:29 -03:00
dependabot[bot]
fd87c0dd7d
Bump eslint from 5.14.1 to 5.15.1 
Bumps [eslint](https://github.com/eslint/eslint) from 5.14.1 to 5.15.1.
- [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.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-05 04:18:55 +00:00
Grzegorz Leoniec
28fe77db6b
Use Styleguide 0.5.5 2019-03-04 17:18:55 +01:00
Grzegorz Leoniec
78f6da8399
Fixed Search Input 2019-03-04 11:24:48 +01:00
Grzegorz Leoniec
76c4e4cd8f
Show status of follows and shouts for currently logged in user 2019-03-03 19:30:54 +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
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
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
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
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
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
Grzegorz Leoniec
9e57f138cb
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 09:49:20 +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
Matt Rider
450a79c634 Merge branch 'master', modify cypress search test 2019-02-27 22:59:03 -03:00
mattwr18
631961bb82
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-27 14:55:19 -03:00
dependabot[bot]
020d5db216
Merge pull request #206 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.5.0 2019-02-27 16:18:13 +00:00
dependabot[bot]
c3c5b71408
Bump apollo-cache-inmemory from 1.4.3 to 1.5.0 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.4.3 to 1.5.0.
- [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.4.3...apollo-cache-inmemory@1.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-27 14:01:58 +00:00
dependabot[bot]
c0eee44c18
Merge pull request #203 from Human-Connection/dependabot/npm_and_yarn/apollo-client-2.5.0 2019-02-27 13:58:23 +00:00
mattwr18
5b01457d6f
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-27 08:58:15 -03:00
Robert Schäfer
461ff054b9 Fix cypress test AboutMeAndLocations 2019-02-27 12:42:29 +01:00
dependabot[bot]
aa33e7448b
Bump apollo-client from 2.4.13 to 2.5.0 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.4.13 to 2.5.0.
- [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.4.13...apollo-client@2.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-27 11:40:30 +00:00
dependabot[bot]
4542085bb5
Merge pull request #207 from Human-Connection/dependabot/npm_and_yarn/nuxt-2.4.5 2019-02-27 11:36:44 +00:00
Matt Rider
2d0c608380 Fix lint 2019-02-27 08:12:59 -03:00
Robert Schäfer
41072e6fa8 Update currentUser with $store.commit 
I find this much cleaner that to dispatch `fetchCurrentUser`. It gets
along with one less request, too.
 2019-02-27 11:06:23 +01:00