IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-02-06 09:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,302 Commits 5 Branches 6 Tags
Commit Graph

2302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
3e570a90dd
Merge pull request #138 from Human-Connection/remove_private_ssh_key_from_docker_image 
Don't copy private SSH key into docker image
 2019-01-28 17:52:54 +01:00
Robert Schäfer
5bdc728028 Don't copy private SSH key into docker image 
We can mount the .ssh at runtime. This will allow us to push the docker
image to dockerhub without exposing any secrects.
 2019-01-28 17:28:52 +01:00
Robert Schäfer
e70d9c959d
Merge pull request #127 from Human-Connection/100_2_download_uploads_and_more 
Follow up on data import
 2019-01-28 16:58:29 +01:00
Robert Schäfer
f05ad951f8
Merge pull request #149 from Human-Connection/tansaku-patch-2 
Create CODE_OF_CONDUCT.md
 2019-01-28 16:57:53 +01:00
Robert Schäfer
bf5bd60b3e
Merge branch 'master' into tansaku-patch-2 2019-01-28 15:12:33 +01:00
Robert Schäfer
65d1443a51
Merge branch 'master' into 100_2_download_uploads_and_more 2019-01-28 15:12:11 +01:00
Grzegorz Leoniec
b7c54aa326
Merge branch 'master' into editor 2019-01-28 12:25:36 +01:00
Grzegorz Leoniec
ea6d05c1ee
Improved editor formatting and added saving 2019-01-28 12:23:16 +01:00
Grzegorz Leoniec
aba356395b
allow h3, h4 nad hr tags 2019-01-28 12:19:48 +01:00
Grzegorz Leoniec
827687b3bc
Add content excerpt also on update 2019-01-28 12:19:35 +01:00
Grzegorz Leoniec
a134d33b28
Improved content menu 2019-01-28 12:18:06 +01:00
Grzegorz Leoniec
35d609a50f
Updated conten formatting. 2019-01-28 11:07:13 +01:00
Grzegorz Leoniec
8c36d9a740
Updated XSS 2019-01-28 11:06:54 +01:00
Grzegorz Leoniec
31d44fe395
Improved xss cleaning 2019-01-28 10:06:30 +01:00
Grzegorz Leoniec
35ce1fda07
Added links 2019-01-28 09:57:12 +01:00
Grzegorz Leoniec
3ce814a96f
Merge pull request #131 from Mastercuber/master 
Move troubleshoots to end; add install links for docker and minikube
 2019-01-27 23:16:01 +01:00
Armin
de6e2feea1 Move troubleshoots to end; add install links for docker and minikube 2019-01-27 22:27:14 +01:00
Grzegorz Leoniec
4745577290
Added basic editor under /post/edit/p1 2019-01-27 14:13:27 +01:00
Grzegorz Leoniec
fa6e5b69ed
Merge branch 'master' into 100_2_download_uploads_and_more 2019-01-26 09:39:31 +01:00
Joseph Ngugi
1a56206c6c
Merge branch 'master' into bg-fix-mobile-friendliness-122 2019-01-26 06:42:50 +03:00
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