ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
dependabot-preview[bot]
36ef2d9c96
build(deps): bump node from 13.0.1-alpine to 13.1.0-alpine in /webapp 
Bumps node from 13.0.1-alpine to 13.1.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 19:43:41 +00:00
roschaefer
36062ffa8c Fix lint 2019-11-16 14:34:23 +01:00
dependabot-preview[bot]
d0e3d33848
build(deps-dev): bump eslint-config-standard in /webapp 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 12.0.0 to 14.1.0.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v12.0.0...v14.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-16 13:28:40 +00:00
Robert Schäfer
f6550b9b00
Merge pull request #2248 from Human-Connection/2240-infinite-scrolling-out-of-control 
Fix infinite scrolling out of control
 2019-11-15 17:03:31 +01:00
roschaefer
950df1cd07 Fix frontend tests 
I also removed one frontend test. The test case was checking an edge
case. We use `hasMore` as the single source of truth so I think it's
safe to remove this test case.
 2019-11-15 16:20:24 +01:00
Robert Schäfer
18ee5b4ac3
Merge pull request #2110 from Human-Connection/2106_unblock_a_user_in_the_user_settings 
2106-unblock a user in the user settings
 2019-11-15 15:51:52 +01:00
Robert Schäfer
fdb454c47a
Merge pull request #2241 from Human-Connection/fix-1936 
Fix 1936
 2019-11-15 15:50:44 +01:00
Robert Schäfer
fd4fee9aee
Merge pull request #2242 from Human-Connection/fix-1937 
fix(editor): Fix hashtags not working after embeded content
 2019-11-15 15:50:11 +01:00
Robert Schäfer
b6ecfa6ebb
Merge pull request #2185 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.19.1 
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp
 2019-11-15 15:49:29 +01:00
roschaefer
3fa7eeb038 @mattwr18 looks like you forgot $state 2019-11-15 15:37:16 +01:00
mattwr18
f8c5290be0 Clean up following @roschaefer PR review suggestions 2019-11-15 15:23:16 +01:00
mattwr18
a10a735e35 Tell vue-infinite-loader when complete or loaded 2019-11-15 14:56:44 +01:00
mattwr18
a6c169c2e0 Fix infinite scrolling out of control 2019-11-15 14:35:08 +01:00
roschaefer
56a940285b refactor: translations, tests 2019-11-15 14:29:33 +01:00
Alexander Friedland
767b4c8f15 Update webapp/locales/de.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
dcc9889cee Update webapp/locales/en.json 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2019-11-15 14:29:33 +01:00
Alexander Friedland
9bd1c59463 change unblk to unblock 2019-11-15 14:29:33 +01:00
Alexander Friedland
4b2da76709 change unblk TO unblock 
unblk TO unblock
 2019-11-15 14:29:33 +01:00
ogerly
e7056dd100 fix lint 2019-11-15 14:29:33 +01:00
ogerly
958b88ceda 2106-unblock a user in the user settings 2019-11-15 14:29:33 +01:00
roschaefer
db25403429 Fix lint 2019-11-15 11:20:50 +01:00
dependabot-preview[bot]
c31238087d
build(deps-dev): bump eslint-plugin-jest in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.2 to 23.0.4.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.2...v23.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-15 04:21:57 +00:00
roschaefer
9b9b72d528 Fix lint 2019-11-15 00:22:00 +01:00
Marco Bomfim
218faedbd9 Merge branch 'fix-1937' of https://github.com/MarcoBomfim/Human-Connection into fix-1937 2019-11-14 16:16:28 -03:00
Marco Bomfim
2951c3b526 Merge branch 'fix-1936' of https://github.com/MarcoBomfim/Human-Connection into fix-1936 2019-11-14 16:10:23 -03:00
Alina Beck
9a7222fad7 validate that name prop is included in the list of svg icons 2019-11-14 14:11:33 +03:00
Alina Beck
848e7d76da move icons to main assets folder 2019-11-14 14:11:00 +03:00
Alina Beck
2504fff3ba make BaseComponents globally available 2019-11-14 13:56:53 +03:00
mattwr18
5ed54c220a Add portuguese translations 2019-11-14 11:11:04 +01:00
Alina Beck
b52480b8d4 add BaseIcon component 2019-11-14 13:04:49 +03:00
dependabot-preview[bot]
8ec91f46e7
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 1.18.2 to 1.19.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/1.18.2...1.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-14 09:55:41 +00:00
mattwr18
56f0c1a8e8
Merge pull request #2235 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.0.1 
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp
 2019-11-14 10:53:14 +01:00
mattwr18
5305577b69
Merge pull request #2205 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-6.6.0 
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp
 2019-11-14 10:26:05 +01:00
Wolfgang Huß
913fcc2cdb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	backend/src/schema/index.js
#	webapp/locales/pt.json
 2019-11-14 09:41:00 +01:00
Alina Beck
6213a25355
Merge branch 'master' into 1747-show-shouts 2019-11-14 09:37:54 +03:00
dependabot-preview[bot]
45d60b233d
build(deps-dev): bump eslint-plugin-vue from 6.0.0 to 6.0.1 in /webapp 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.0.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-14 04:21:13 +00:00
Alina Beck
9c0f8d92eb copy relevant icons from styleguide 2019-11-13 19:30:41 +03:00
Alina Beck
34239631a2 toggle shouts tab depending on user setting 2019-11-13 11:44:24 +03:00
Alina Beck
1625e0705e run update mutation when submitting shouts form 2019-11-13 11:02:53 +03:00
mattwr18
feb65a6c9c Update property name to be more descriptive 
- I wanted to trigger a build, since we had issues with our build server
today. I think this naming is more in the direction we want to go,
though. Maybe it could be makeShoutsPublic as @alina-beck used for the
translation keys... what do you think @kachulio
 2019-11-12 21:19:52 +01:00
mattwr18
e971aef3e8 Merge branch 'donation-info' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:05:09 +01:00
mattwr18
7ce3e25110 Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 21:04:54 +01:00
Alina Beck
1b16dab554 make font size smaller on tiny screens 2019-11-12 19:26:23 +03:00
Alina Beck
6e3bd19267 set up privacy page in settings 2019-11-12 19:13:56 +03:00
Alina Beck
63d223e368
Apply suggestions from code review 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-12 18:52:38 +03:00
mattwr18
797b8338be
Merge pull request #2197 from Human-Connection/2195-define-missing-getters 
Added Empty Definitions For Missing Getters And Mutations
 2019-11-12 15:54:45 +01:00
mattwr18
8b5cd48d3c Translate success message, guard clause for no Donations 2019-11-12 15:33:21 +01:00
mattwr18
3b5e40efaa Merge branch 'master' of github.com:Human-Connection/Human-Connection into donation-info 2019-11-12 15:18:10 +01:00
dependabot-preview[bot]
2b2aaa04e1
build(deps-dev): bump eslint from 5.16.0 to 6.6.0 in /webapp 
Bumps [eslint](https://github.com/eslint/eslint) from 5.16.0 to 6.6.0.
- [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.16.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-12 13:06:14 +00:00
mattwr18
10c932308c
Merge pull request #2204 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-svg-loader-0.15.0 
build(deps-dev): bump vue-svg-loader from 0.14.0 to 0.15.0 in /webapp
 2019-11-12 14:03:49 +01:00