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

883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
85ffd67a49 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-12 12:49:48 -03:00
Robert Schäfer
6e003d428b
Merge pull request #233 from Human-Connection/get_rid_of_resource_type 
Update ReportModal to work with back end
 2019-03-12 13:52:30 +01:00
Robert Schäfer
3b7ffde4c2 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into get_rid_of_resource_type 2019-03-12 13:26:56 +01:00
mattwr18
56531dab62
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-12 08:31:45 -03:00
Grzegorz Leoniec
610aa470fb
Merge pull request #250 from Human-Connection/lokalise-2019-03-12_10-42-56 
Lokalise: Translations update
 2019-03-12 10:44:07 +01:00
lokalise-bot
d1be013c3c Lokalise: update of locales/pt.json 2019-03-12 10:43:01 +01:00
lokalise-bot
bcedf11c69 Lokalise: update of locales/pl.json 2019-03-12 10:43:00 +01:00
Grzegorz Leoniec
39933995c5
Merge pull request #240 from Human-Connection/update_translations 
Update translations
 2019-03-12 10:42:31 +01:00
Matt Rider
c4dff9a916 Add tests for onDelete, query functions 2019-03-11 18:36:32 -03:00
Matt Rider
168278d76a Add component tests checking custom functions 
- clear()
- handleInput()
- onEnter()
 2019-03-11 17:59:24 -03:00
Matt Rider
caf56ca967 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-11 09:20:43 -03:00
Robert Schäfer
221958ba10 Merge remote-tracking branch 'victorrms2/patch-1' into update_translations 2019-03-09 22:33:17 +01:00
Robert Schäfer
6f558db8aa Upload/Download translations from lokalise.co 
@appinteractive @mattwr18 @Tirokk I did the following steps:

1. Upload current translations for `en` and `de` to lokalise.co
  * this did not update or create any keys, instead
    all keys were skipped (apparently already there)
2. Download the translations on lokalise with the following settings:
  * ICU message with numeric pluralization
  * Don't escape forward slashes
  * Indent with 2 spaces
 2019-03-09 22:02:43 +01:00
Victor
a3e4633329
Small changes on translation mistakes - Portuguese 
The translation of "post" is "postagem", and not "pastagem". Pastagem means where the cow eats grass.
The "admin" was as "Administrator", while the correct word is "Administrador".

I'm not sure about what "Shouts" are, but I don't really know if the word "Gritos" is the properly for this thing. In portuguese, when you say "Grito", the literal translation of "Shouts" you think of a person screaming, and I don't think that's was the intention. If somebody could explain me what a "Shout" means in this code I could help in a more accurate translation.
 2019-03-09 17:47:34 -03:00
dependabot[bot]
4aa640a2e5
Merge pull request #232 from Human-Connection/dependabot/npm_and_yarn/tiptap-extensions-1.14.0 2019-03-09 00:03:47 +00:00
dependabot[bot]
013192f048
Bump tiptap-extensions from 1.13.0 to 1.14.0 
Bumps [tiptap-extensions](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-extensions@1.13.0...tiptap-extensions@1.14.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 21:45:59 +00:00
dependabot[bot]
5673ba831d
Merge pull request #235 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.3.1 2019-03-08 21:43:41 +00:00
Matt Rider
3355c5d85e Remove unused variable 2019-03-08 17:46:06 -03:00
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
dependabot[bot]
a374099a1e
Bump babel-jest from 24.1.0 to 24.3.1 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.1.0 to 24.3.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.3.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 19:26:40 +00: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
Robert Schäfer
47eaf7dea0 Fix cypress test with more specific matcher 2019-03-08 01:41:28 +01:00
Robert Schäfer
ba369d82fe Fix translations, lint and some tests 2019-03-08 01:39:28 +01:00
Matt Rider
842d68c129 Update ReportModal to work with back end 2019-03-07 20:59:13 -03: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