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
861 Commits 5 Branches 2 Tags
Commit Graph

861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
796b2d8488 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-08 17:39:20 -03:00
Matt Rider
92aacf6900 Write more component tests 
- test the default props values
- test that is open changes when focused on or on blur
- test that the input is clearable, failing still
 2019-03-08 17:35:02 -03:00
Lala Sabathil
8a15ef99f6
Merge pull request #220 from Human-Connection/dependabot/npm_and_yarn/vue-jest-3.0.4 
Bump vue-jest from 3.0.3 to 3.0.4
 2019-03-08 20:24:15 +01:00
Matt Rider
bc96333bae Refactor cypress/component tests 2019-03-08 14:41:08 -03:00
dependabot[bot]
0e145c4934
Bump vue-jest from 3.0.3 to 3.0.4 
Bumps [vue-jest](https://github.com/eddyerburgh/vue-jest) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/eddyerburgh/vue-jest/releases)
- [Commits](https://github.com/eddyerburgh/vue-jest/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 17:22:18 +00:00
dependabot[bot]
c4f2457765
Merge pull request #231 from Human-Connection/dependabot/npm_and_yarn/tiptap-1.14.0 2019-03-08 17:19:41 +00:00
dependabot[bot]
3229dbc1d0
Bump tiptap from 1.13.0 to 1.14.0 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.13.0...tiptap@1.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 14:36:18 +00:00
Grzegorz Leoniec
243d604abc
Merge pull request #213 from Human-Connection/distinct-shouts-and-follows 
Fix follow and shout status
 2019-03-08 15:33:31 +01: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
Grzegorz Leoniec
7e844e7625
Added fuzzy searching 2019-03-07 11:54:48 +01:00
Grzegorz Leoniec
da3b10065c
Fixed and improved search and updated styleguide 2019-03-07 10:53:57 +01:00
Grzegorz Leoniec
23cfbb0687
Updated yarn.lock 2019-03-06 19:01:30 +01:00
Grzegorz Leoniec
63077d8a2f
Someone broke the package json :-\ 2019-03-06 18:57:41 +01:00
Grzegorz Leoniec
cd50d80671
Undo sorting of newsfeed 2019-03-06 18:49:53 +01:00
Grzegorz Leoniec
ab7c857750
Merged master in 2019-03-06 18:48:37 +01:00
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
Grzegorz Leoniec
6617aaefc3
Merge branch 'master' into distinct-shouts-and-follows 2019-03-06 16:34:25 +01:00
Grzegorz Leoniec
78c9b83282
Fixed follow stats 2019-03-06 13:08:26 +01: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
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
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
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