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

817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
76c4e4cd8f
Show status of follows and shouts for currently logged in user 2019-03-03 19:30:54 +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
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
9e57f138cb
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 09:49:20 +01:00