ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-02-06 09:56:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,711 Commits 102 Branches 1,591 Tags
Commit Graph

6711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ewald Arnold
991debb282 cleanup 2019-11-17 10:57:35 +01:00
Ewald Arnold
f450b3a87e extend docs 2019-11-17 10:06:32 +01:00
Ewald Arnold
18c14940d1 add screenshots and basic text around 2019-11-11 16:26:10 +01:00
Ewald Arnold
c10f37f1cb add collector for translations 2019-11-07 18:36:18 +01:00
Ewald Arnold
f5d45f379a added some admin screens 2019-11-06 08:34:30 +01:00
Ewald Arnold
f11bb94515 more doc 2019-11-05 19:25:12 +01:00
Ewald Arnold
ddcd68da5e more doc 2019-11-05 19:23:54 +01:00
Ewald Arnold
52ac418fe4 draft for loaklise doc 2019-11-05 18:40:52 +01:00
Ewald Arnold
8e5313e08f draft for loaklise doc 2019-11-05 18:37:43 +01:00
Ewald Arnold
1a41245ea9 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection 2019-11-05 17:07:18 +01:00
mattwr18
f64b71e746
Merge pull request #2121 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.2 
build(deps): bump merge-graphql-schemas from 1.7.0 to 1.7.2 in /backend
 2019-11-05 11:09:25 +01:00
mattwr18
2e03a8d286
Merge pull request #2122 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-loader-15.7.2 
build(deps-dev): bump vue-loader from 15.7.1 to 15.7.2 in /webapp
 2019-11-05 11:08:56 +01:00
mattwr18
4f58e738b6
Merge pull request #2120 from Human-Connection/dependabot/npm_and_yarn/webapp/async-validator-3.2.1 
build(deps-dev): bump async-validator from 3.2.0 to 3.2.1 in /webapp
 2019-11-05 10:23:44 +01:00
dependabot-preview[bot]
997778c05d
build(deps-dev): bump vue-loader from 15.7.1 to 15.7.2 in /webapp 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.7.1 to 15.7.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.7.1...v15.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 08:36:44 +00:00
dependabot-preview[bot]
852f7d92bc
build(deps): bump merge-graphql-schemas from 1.7.0 to 1.7.2 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.7.0 to 1.7.2.
- [Release notes](https://github.com/Urigo/merge-graphql-schemas/releases)
- [Changelog](https://github.com/Urigo/merge-graphql-schemas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Urigo/merge-graphql-schemas/compare/v1.7.0...v1.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 08:36:34 +00:00
dependabot-preview[bot]
3a1f878ce3
build(deps-dev): bump async-validator from 3.2.0 to 3.2.1 in /webapp 
Bumps [async-validator](https://github.com/yiminghe/async-validator) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/yiminghe/async-validator/releases)
- [Changelog](https://github.com/yiminghe/async-validator/blob/master/HISTORY.md)
- [Commits](https://github.com/yiminghe/async-validator/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-05 08:36:26 +00:00
mattwr18
bbd678caa6
Merge pull request #2075 from Human-Connection/frontend-migration-plan 
🍰 Add migration plan and frontend code guidelines to our docs
 2019-11-04 21:10:29 +01:00
Robert Schäfer
53da982d58
Merge pull request #2116 from Human-Connection/update-feature-template 
Update feature template
 2019-11-04 20:44:16 +01:00
Alina Beck
24143f8350 ask for a more detailed description in the feature template 2019-11-04 16:27:36 +03:00
mattwr18
51af6b589a
Merge pull request #2114 from Human-Connection/update-to-version-0.1.9 
Update to version 0.1.9
 2019-11-04 14:13:02 +01:00
mattwr18
0644380afc Update to version 0.1.9 2019-11-04 12:39:18 +01:00
mattwr18
a05d63e34e v0.1.9 2019-11-04 12:38:45 +01:00
mattwr18
abbd090eb7
Merge pull request #1956 from Human-Connection/cropper-enhancements 
Refactor and tidy up crop image implementation
v0.1.9 		2019-11-04 11:13:21 +01:00
mattwr18
d3922a8149
Merge pull request #2059 from Human-Connection/2045-filter-posts-by-language 
🍰 First Implementation Of Filtering Posts By Language
 2019-11-04 10:20:13 +01:00
Alina Beck
9caf3e7d8a follow even more suggestions by @mattwr18 2019-11-04 12:19:53 +03:00
Alina Beck
c7ef9ba04a
Apply suggestions from code review 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-04 11:45:17 +03:00
mattwr18
a78a58ad8d Mock $t in TeaserImage test 2019-11-02 17:02:19 +01:00
Ewald Arnold
4e0b1d06e3 added Russian to locales 2019-11-02 16:18:18 +01:00
Brent Vardy
99816f1c21 update cancel crop to keep previous image 
- Also refactor to split into more methods

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 12:09:28 +00:00
Brent Vardy
dfb59516d0 Add abiltiy to cancel out of cropper and remove image 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:48:56 +00:00
Brent Vardy
2670b48694 removed unused code and refactor cropper 
- Removed unused code
- updated confirm button to be ds-button component
- split into multiple functions

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-11-02 11:07:06 +00:00
Brent Vardy
daf40bbb7c Merge branch 'master' into cropper-enhancements 2019-11-02 09:42:38 +00:00
Robert Schäfer
f8b4e1f78f
Merge pull request #2105 from Human-Connection/dependabot/npm_and_yarn/cypress-3.6.0 
build(deps-dev): bump cypress from 3.5.0 to 3.6.0
 2019-11-01 14:51:50 +01:00
Alexander Friedland
34283b6d6c
Merge pull request #2108 from Human-Connection/2102-Notifications_query_ignores_poll_interval_and_queries_infinitely 
Fix: Poll Interval
 2019-11-01 13:09:50 +01:00
ogerly
4cb46b6178 Fix: Poll Interval 2019-11-01 12:11:54 +01:00
dependabot-preview[bot]
6b0829516b
build(deps-dev): bump cypress from 3.5.0 to 3.6.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.5.0...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-01 10:29:46 +00:00
mattwr18
805415a13a
Merge pull request #2104 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.4.0 
build(deps-dev): bump cypress-plugin-retries from 1.3.0 to 1.4.0
 2019-11-01 09:11:30 +01:00
dependabot-preview[bot]
4305142daa
build(deps-dev): bump cypress-plugin-retries from 1.3.0 to 1.4.0 
Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.3.0...v1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-01 07:11:12 +00:00
mattwr18
bf71434fba
Merge pull request #2082 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.7.17 
build(deps): bump metascraper-title from 5.7.14 to 5.7.17 in /backend
 2019-10-31 22:33:10 +01:00
mattwr18
eeeccc7fd3
Merge pull request #2098 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-publisher-5.7.17 
build(deps): bump metascraper-publisher from 5.7.14 to 5.7.17 in /backend
 2019-10-31 22:32:55 +01:00
mattwr18
d987bb22ce
Merge pull request #2096 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.7.17 
build(deps): bump metascraper-description from 5.7.14 to 5.7.17 in /backend
 2019-10-31 22:32:42 +01:00
Robert Schäfer
3e9403ec14
Merge pull request #2097 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.7.17 
build(deps): bump metascraper-audio from 5.7.14 to 5.7.17 in /backend
 2019-10-31 19:07:27 +01:00
dependabot-preview[bot]
f503dc09f5
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 17:07:35 +00:00
dependabot-preview[bot]
206b5e8ce7
build(deps): bump metascraper-publisher in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 17:07:22 +00:00
dependabot-preview[bot]
ffa1038b86
build(deps): bump metascraper-title from 5.7.14 to 5.7.17 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.7.14 to 5.7.17.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.7.14...v5.7.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-31 17:06:58 +00:00
Robert Schäfer
2e1f26ff82
Merge pull request #2086 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.7.17 
build(deps): bump metascraper-url from 5.7.14 to 5.7.17 in /backend
 2019-10-31 18:04:50 +01:00
Robert Schäfer
edac772591
Merge pull request #2090 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.7.17 
build(deps): bump metascraper-image from 5.7.6 to 5.7.17 in /backend
 2019-10-31 18:04:41 +01:00
Robert Schäfer
600adfddc6
Merge pull request #2093 from Human-Connection/ogerly-patch-1 
deleted posts no longer displayed in user profile
 2019-10-31 18:04:14 +01:00
KapilJ
d8e4697f1d
Merge pull request #2062 from Human-Connection/1953-TwoNotifications 
Send only one notification for mention and comment
 2019-10-31 12:45:28 -04:00
roschaefer
5715d3e9d5 Add vuex store tests for language filter 2019-10-31 17:32:18 +01:00