ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 20:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,282 Commits 104 Branches 1,559 Tags
Commit Graph

2282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Ngugi
b30c5fbd94
Merge branch 'master' into bg-fix-mobile-friendliness-122 2019-01-26 06:42:36 +03:00
Grzegorz Leoniec
4d973ede81
Merge pull request #3 from Human-Connection/add_instructions_for_exposing_services_with_minikube 
Add instructions to expose/access the services
 2019-01-25 21:30:43 +01:00
Grzegorz Leoniec
8c74605a48
Merge pull request #150 from Human-Connection/fix_JWT_quotes 
Fix jwt quotes
 2019-01-25 20:42:13 +01:00
Robert Schäfer
4f9f26a1da Add instructions to expose/access the services 2019-01-25 18:26:22 +01:00
Robert Schäfer
ba92a62bf7 Fix JWT 500 error during testing in docker 
JWT errors again (no quotation marks in the backend but in frontend)
I thought I had fixed it already
 2019-01-25 17:52:48 +01:00
Robert Schäfer
cf9a30328d Don't seed log redirect to /dev/null 
The seeding does not log each request to stdout anymore so it does not
clutter our build server log anymore
 2019-01-25 17:51:41 +01:00
Grzegorz Leoniec
687192d521
Added Mapbox token 2019-01-25 15:23:32 +01:00
Grzegorz Leoniec
e74cfd62aa
Merge pull request #2 from Human-Connection/add-documentation-fix-kubectl-commands 
Add instructions to docs, fix kubectl commands
 2019-01-25 08:07:30 +01:00
Sam Joseph
2cbda437c8
Create CODE_OF_CONDUCT.md 2019-01-24 15:36:37 +00:00
Grzegorz Leoniec
99fbd52f6e
Added create and edit pages 2019-01-23 21:37:05 +01:00
Grzegorz Leoniec
0673e0f823
Improved Editor 2019-01-23 21:36:53 +01:00
Grzegorz Leoniec
83cc6e5377
Added more content menu translations 2019-01-23 21:36:29 +01:00
Grzegorz Leoniec
de1c758b8a
Improved ContentMenu 2019-01-23 21:36:12 +01:00
Grzegorz Leoniec
b53152ee27
Added editor icons 2019-01-23 21:35:49 +01:00
dependabot[bot]
0efe94aae3
Merge pull request #129 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-import-2.15.0 2019-01-23 13:00:35 +00:00
dependabot[bot]
13f8e57467
Bump eslint-plugin-import from 2.14.0 to 2.15.0 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.14.0 to 2.15.0.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.14.0...v2.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-23 12:46:30 +00:00
dependabot[bot]
58e9899509
Merge pull request #128 from Human-Connection/dependabot/npm_and_yarn/supertest-3.4.2 2019-01-23 12:43:20 +00:00
dependabot[bot]
3f0bdb792c
Bump supertest from 3.4.1 to 3.4.2 
Bumps [supertest](https://github.com/visionmedia/supertest) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/visionmedia/supertest/releases)
- [Changelog](https://github.com/visionmedia/supertest/blob/master/History.md)
- [Commits](https://github.com/visionmedia/supertest/compare/v3.4.1...v3.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-23 04:25:03 +00:00
Joseph Ngugi
1f19285af3
Merge branch 'master' into bg-fix-mobile-friendliness-122 2019-01-23 03:47:34 +03:00
Grzegorz Leoniec
fbc9b4777d
Fixed portal-vue 2019-01-22 15:54:14 +01:00
Grzegorz Leoniec
1718a161c8
Merged master in 2019-01-22 15:51:02 +01:00
Grzegorz Leoniec
3a174707c3
Added basic editor under /post/edit 2019-01-22 15:50:05 +01:00
dependabot[bot]
fba851bc52
Merge pull request #122 from Human-Connection/dependabot/npm_and_yarn/eslint-5.12.1 2019-01-22 14:42:36 +00:00
dependabot[bot]
73c8bb282b
Bump eslint from 5.12.0 to 5.12.1 
Bumps [eslint](https://github.com/eslint/eslint) from 5.12.0 to 5.12.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.12.0...v5.12.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-22 13:57:28 +00:00
Grzegorz Leoniec
e219cf886f
Merge pull request #107 from Human-Connection/report-content 
Report Content
 2019-01-22 14:52:56 +01:00
Grzegorz Leoniec
5ef3427374
Merge pull request #99 from Human-Connection/report-content 
Report content
 2019-01-22 14:52:31 +01:00
Matt Rider
1dc8e13dfa Add instructions to docs, fix kubectl commands 2019-01-22 10:43:26 -02:00
Robert Schäfer
f273240fd8
Merge branch 'master' into report-content 2019-01-22 13:33:57 +01:00
Robert Schäfer
494748c4c4 Import shouts 2019-01-22 12:48:06 +01:00
Robert Schäfer
932a593cfa Import follows 2019-01-22 12:48:06 +01:00
Robert Schäfer
ce7ce40272 Import badges 2019-01-22 12:48:06 +01:00
Robert Schäfer
f69a0daeef Import categories, manually assign correct icon 
Big fun 👍
 2019-01-22 12:48:06 +01:00
Robert Schäfer
2cab6fe9cf Replace scp with rsync 
`rsync` is faster on multiple runs. The `--update` flag will only
download newer images and does not overwrite existing files. Thus, it will
only download missing images.
 2019-01-22 12:48:06 +01:00
Robert Schäfer
c9b8b23915 Keep public folder empty 2019-01-22 12:48:06 +01:00
Robert Schäfer
509e4feeb9 Add workflow to download remote uploads 
* remote uploads directory
* download content of uploads directory with `scp`
* share uploads volume with backend container
 2019-01-22 12:48:06 +01:00
Robert Schäfer
e46c8d18e5 Implement public folder 2019-01-22 12:48:06 +01:00
Grzegorz Leoniec
c0dc7e3e5d
Merge pull request #115 from Human-Connection/100_import_mongodb_to_neo4j 
Import remote mongodb in neo4j
 2019-01-22 11:53:47 +01:00
dependabot[bot]
ba400adcca
Bump WebApp from fa26d7c to e153eb6 
Bumps [WebApp](https://github.com/Human-Connection/WebApp) from `fa26d7c` to `e153eb6`.
- [Release notes](https://github.com/Human-Connection/WebApp/releases)
- [Commits](fa26d7c654...e153eb6c07)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-22 04:15:18 +00:00
kachulio1
427edb2c38 add width in flex-item 2019-01-22 01:55:41 +03:00
Robert Schäfer
f5611a6316
Merge branch 'master' into 100_import_mongodb_to_neo4j 2019-01-21 22:17:32 +01:00
Robert Schäfer
fb18264387 Re-add step definition of unrelated cucumber 2019-01-21 15:46:38 +01:00
Robert Schäfer
55b1541829 Merge remote-tracking branch 'origin/master' into report-content 2019-01-21 15:18:40 +01:00
Robert Schäfer
6efa2b01c9 Fix eslint 2019-01-21 15:16:13 +01:00
Robert Schäfer
e63e346720 Refactor "Report content" cucumber feature 2019-01-21 15:12:13 +01:00
Grzegorz Leoniec
df1706a1ae
Merge pull request #109 from Human-Connection/106_authorization 
106 authorization
 2019-01-21 13:22:39 +01:00
Grzegorz Leoniec
4af7a6673c
Mobile friendly admin, settings and moderation 2019-01-21 12:06:38 +01:00
Grzegorz Leoniec
834973f3d3
Try to fix test 2019-01-21 11:49:37 +01:00
Grzegorz Leoniec
670292b3ec
Disabled report seeding to fix tests 2019-01-21 11:08:37 +01:00
Grzegorz Leoniec
6c74531608
Fixed logout link styling 2019-01-21 09:14:36 +01:00
Grzegorz Leoniec
04663aa94a
Improved modal 2019-01-21 08:53:17 +01:00