diff --git a/.all-contributorsrc b/.all-contributorsrc index e507c2429a..3e014f5f7b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -687,8 +687,8 @@ "contributions": [ "a11y" ] - }, - { + }, + { "login": "niksseif", "name": "NikSeif", "avatar_url": "https://avatars0.githubusercontent.com/u/24830759?v=4", @@ -696,6 +696,42 @@ "contributions": [ "a11y" ] + }, + { + "login": "dariatsvetkova", + "name": "dariatsvetkova", + "avatar_url": "https://avatars2.githubusercontent.com/u/68360696?v=4", + "profile": "https://github.com/dariatsvetkova", + "contributions": [ + "doc" + ] + }, + { + "login": "UdokaVrede", + "name": "Udokaku Ugochukwu", + "avatar_url": "https://avatars3.githubusercontent.com/u/63649352?v=4", + "profile": "https://udoka.hashnode.dev/", + "contributions": [ + "doc" + ] + }, + { + "login": "muchirijane", + "name": "Jane Tracy Muthoni", + "avatar_url": "https://avatars3.githubusercontent.com/u/54930887?v=4", + "profile": "https://muchirijane.github.io/100-days-website/", + "contributions": [ + "doc" + ] + }, + { + "login": "renujain31", + "name": "Renu Jain", + "avatar_url": "https://avatars1.githubusercontent.com/u/70752431?v=4", + "profile": "https://github.com/renujain31", + "contributions": [ + "doc" + ] } ], "projectName": "platform", diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aab237e67f..e88b89225a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,12 @@ ## Getting Involved -There are many ways to get involved with Ushahidi, and some of them are great even for first time contributors. If you never contributed to Open Source Software before, or need more guidance doing it, please jump in our [gitter](https://gitter.im/ushahidi/Community) channel with a clear description of what you are trying to do, and someone in there will try to help you. -These are some ways to get involved: +There are many ways to get involved with Ushahidi projects, and some of them are great even for first time contributors. If you never contributed to Open Source Software before, or need more guidance doing it, please jump in our [gitter](https://gitter.im/ushahidi/Community) channel with a clear description of what you are trying to do, and someone in there will try to help you. -- **Documentation**: if you find an area of the Ushahidi platform that could use better docs, we would love to hear from you in an issue, and would be seriously excited if you send a [Pull Request](https://github.com/ushahidi/platform/compare). This is a great way to get involved even if you are not technical or just have a passion to make information more available and clear to everyone. +### You can contribute to Ushahidi projects in these areas: + +- **Documentation**: if you find an area of the Ushahidi platform that could use better docs, we would love to hear from you in an issue, and would be seriously excited if you send a [Pull Request](https://github.com/ushahidi/platform/compare). This is a great way to get involved if you are passionate about making information more available and clear to everyone. - **Report a bug**: If you found an issue/bug, please report it [here](https://github.com/ushahidi/platform/issues). Someone on the team will jump in to check it, try to help, and prioritize it for future development depending on the issue type. Please follow the bug report template to allow others to reproduce it easily. - **Fix a bug**: If you want to contribute a fix for a bug you or someone else found, we will be happy to review your PR and provide support. Tasks that are suggested for the community can be found by searching for the https://github.com/ushahidi/platform/labels/Community%20Task tag. Please add a comment notifying others that you will be working on a task before you start. - **Helping other users in the community**: you are welcome and encouraged to jump in and help other members of the community, either by responding to issues in github or jumping into our community channels to answer questions. -- **New features**: our features are generally driven by our product and engineering team members, but if you have a great idea, or found a user need that we haven't covered, you are more than welcome to make a suggestion in the form of a github issue [here](https://github.com/ushahidi/platform/issues), or reach out to Ushahidi staff in [gitter](https://gitter.im/ushahidi/Community) +- **New features**: our features are generally driven by our product and engineering team members, but if you have a great idea, or found a user need that we have not covered, you are more than welcome to make a suggestion in the form of a github issue [here](https://github.com/ushahidi/platform/issues), or reach out to Ushahidi staff in [gitter](https://gitter.im/ushahidi/Community) - **Security issues**: if you think you have found a security issue, please follow [this link where we explain our disclosure and reporting policies](https://www.ushahidi.com/security) diff --git a/codeship-services.yml b/codeship-services.yml index 04c72e7b67..09599d5fb3 100644 --- a/codeship-services.yml +++ b/codeship-services.yml @@ -28,12 +28,9 @@ release: deploy: image: ushahidi/engineering-deployer:latest encrypted_env_file: deployment.env.encrypted - depends_on: - - dockerimg add_docker: true environment: AWS_REGION: us-east-1 - DOCKER_PUSH_IMAGE_SRC: ushahidi-platform/dockerimg DEPLOYMENT_RULES_REPO: deployment-rules DEPLOYMENT_RULES_VERSION: master DEPLOYMENT_RULES_FILE: platform.yml diff --git a/codeship-steps.yml b/codeship-steps.yml index 9711fe80e6..982dc1846d 100644 --- a/codeship-steps.yml +++ b/codeship-steps.yml @@ -1,13 +1,5 @@ -- name: "Test" - type: parallel - steps: - - name: "Test PHP 7.2" - service: test/php-7.2 - command: test_reporter composer run test --timeout 0 - - name: "Test PHP 7.3" - service: test/php-7.3 - command: test_reporter composer run test --timeout 0 - +# run 'jet test/php-7.2 test_reporter composer run test --timeout 0' to run tests on php 7.2 +# run 'jet test/php-7.3 test_reporter composer run test --timeout 0' to run tests on php 7.2 - type: parallel steps: @@ -32,26 +24,5 @@ - name: "Deployment director" service: deploy - command: ush-deployment-director.sh + command: CI_NAME=codeship ush-deployment-director.sh - -# Publish images to docker hub -- name: "Docker Hub upload" - type: parallel - steps: - - tag: master - name: "Upload latest tag" - service: dockerimg - type: push - image_name: ushahidi/platform - image_tag: latest - registry: https://index.docker.io/v1/ - dockercfg_service: dockercfggen - - tag: '^v(\d+\.)+\d+' - name: "Upload release tag" - service: dockerimg - type: push - image_name: ushahidi/platform - image_tag: "{{.Branch}}" - registry: https://index.docker.io/v1/ - dockercfg_service: dockercfggen \ No newline at end of file diff --git a/deployment.env.encrypted b/deployment.env.encrypted index 604353a957..623d873f1f 100644 --- a/deployment.env.encrypted +++ b/deployment.env.encrypted @@ -1 +1,2 @@ -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 \ No newline at end of file +codeship:v2 +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 \ No newline at end of file diff --git a/docker.env.encrypted b/docker.env.encrypted deleted file mode 100644 index 2aa36a0f01..0000000000 --- a/docker.env.encrypted +++ /dev/null @@ -1,2 +0,0 @@ -codeship:v2 -isdejOJdkjObFQnA5/INMN/So76xiguxRAOAyXo3hHXFCBzHOyq6pDNV7yFPLmmiIrDk3ZMajuNU72baxbQOGCEX2XELnmvzKT/NeX4Ssgi5wiy/hJdxLbN0wOAE8lfm4KIIphdu6IYP0Nzad2J1QhGRt8T49HWrATeXvrJawAXg1835EM8xjwxZ/2oD42G6dnHXGwHrra/0hvCCRwkN1fyrfNTUpg== \ No newline at end of file diff --git a/docs/.gitbook/assets/63230917-e5879a00-c1c8-11e9-8f6e-e62c83dd1d85 (1) (1).png b/docs/.gitbook/assets/63230917-e5879a00-c1c8-11e9-8f6e-e62c83dd1d85 (1) (1).png new file mode 100644 index 0000000000..fb4d093cef Binary files /dev/null and b/docs/.gitbook/assets/63230917-e5879a00-c1c8-11e9-8f6e-e62c83dd1d85 (1) (1).png differ diff --git a/docs/.gitbook/assets/api-request-flow-1 (1) (1).png b/docs/.gitbook/assets/api-request-flow-1 (1) (1).png new file mode 100644 index 0000000000..f270621f4d Binary files /dev/null and b/docs/.gitbook/assets/api-request-flow-1 (1) (1).png differ diff --git a/docs/.gitbook/assets/app-tiers-1 (2) (1).png b/docs/.gitbook/assets/app-tiers-1 (2) (1).png new file mode 100644 index 0000000000..db13484b87 Binary files /dev/null and b/docs/.gitbook/assets/app-tiers-1 (2) (1).png differ diff --git a/docs/.gitbook/assets/arch-layers-1 (2) (1).png b/docs/.gitbook/assets/arch-layers-1 (2) (1).png new file mode 100644 index 0000000000..c058326c4f Binary files /dev/null and b/docs/.gitbook/assets/arch-layers-1 (2) (1).png differ diff --git a/docs/.gitbook/assets/create-usecase-1 (1) (1).png b/docs/.gitbook/assets/create-usecase-1 (1) (1).png new file mode 100644 index 0000000000..aaef8ad044 Binary files /dev/null and b/docs/.gitbook/assets/create-usecase-1 (1) (1).png differ diff --git a/docs/.gitbook/assets/create-usecase-collab (4) (1).png b/docs/.gitbook/assets/create-usecase-collab (4) (1).png new file mode 100644 index 0000000000..8de17327e4 Binary files /dev/null and b/docs/.gitbook/assets/create-usecase-collab (4) (1).png differ diff --git a/docs/.gitbook/assets/data-flow-1 (2) (1).png b/docs/.gitbook/assets/data-flow-1 (2) (1).png new file mode 100644 index 0000000000..8980320dd4 Binary files /dev/null and b/docs/.gitbook/assets/data-flow-1 (2) (1).png differ diff --git a/docs/.gitbook/assets/delete-usecase-1 (1) (1).png b/docs/.gitbook/assets/delete-usecase-1 (1) (1).png new file mode 100644 index 0000000000..d5d7e57a64 Binary files /dev/null and b/docs/.gitbook/assets/delete-usecase-1 (1) (1).png differ diff --git a/docs/.gitbook/assets/gitbook-graphic (1) (1).png b/docs/.gitbook/assets/gitbook-graphic (1) (1).png new file mode 100644 index 0000000000..f35c203d66 Binary files /dev/null and b/docs/.gitbook/assets/gitbook-graphic (1) (1).png differ diff --git a/docs/.gitbook/assets/github-1 (1) (1).png b/docs/.gitbook/assets/github-1 (1) (1).png new file mode 100644 index 0000000000..a9d0e1ff60 Binary files /dev/null and b/docs/.gitbook/assets/github-1 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-10 (1) (1).png b/docs/.gitbook/assets/github-10 (1) (1).png new file mode 100644 index 0000000000..ffdd7f396e Binary files /dev/null and b/docs/.gitbook/assets/github-10 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-2 (2) (1).png b/docs/.gitbook/assets/github-2 (2) (1).png new file mode 100644 index 0000000000..54c9f3a285 Binary files /dev/null and b/docs/.gitbook/assets/github-2 (2) (1).png differ diff --git a/docs/.gitbook/assets/github-3 (1) (1).png b/docs/.gitbook/assets/github-3 (1) (1).png new file mode 100644 index 0000000000..394e582b73 Binary files /dev/null and b/docs/.gitbook/assets/github-3 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-4 (1) (1).png b/docs/.gitbook/assets/github-4 (1) (1).png new file mode 100644 index 0000000000..b0def5ed81 Binary files /dev/null and b/docs/.gitbook/assets/github-4 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-5 (1) (1).png b/docs/.gitbook/assets/github-5 (1) (1).png new file mode 100644 index 0000000000..d056370bc3 Binary files /dev/null and b/docs/.gitbook/assets/github-5 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-6 (1) (1).png b/docs/.gitbook/assets/github-6 (1) (1).png new file mode 100644 index 0000000000..9f6d17744a Binary files /dev/null and b/docs/.gitbook/assets/github-6 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-7 (1) (1).png b/docs/.gitbook/assets/github-7 (1) (1).png new file mode 100644 index 0000000000..c36a3b54dd Binary files /dev/null and b/docs/.gitbook/assets/github-7 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-8 (1) (1).png b/docs/.gitbook/assets/github-8 (1) (1).png new file mode 100644 index 0000000000..c76849dce0 Binary files /dev/null and b/docs/.gitbook/assets/github-8 (1) (1).png differ diff --git a/docs/.gitbook/assets/github-9 (1) (1).png b/docs/.gitbook/assets/github-9 (1) (1).png new file mode 100644 index 0000000000..03c2e28dd8 Binary files /dev/null and b/docs/.gitbook/assets/github-9 (1) (1).png differ diff --git a/docs/.gitbook/assets/notebook (1) (1).png b/docs/.gitbook/assets/notebook (1) (1).png new file mode 100644 index 0000000000..b92870e9cc Binary files /dev/null and b/docs/.gitbook/assets/notebook (1) (1).png differ diff --git a/docs/.gitbook/assets/oss-ushahidi-project (1) (1).png b/docs/.gitbook/assets/oss-ushahidi-project (1) (1).png new file mode 100644 index 0000000000..b1361822a3 Binary files /dev/null and b/docs/.gitbook/assets/oss-ushahidi-project (1) (1).png differ diff --git a/docs/.gitbook/assets/oss-welcome-banner (1) (1).png b/docs/.gitbook/assets/oss-welcome-banner (1) (1).png new file mode 100644 index 0000000000..e6aef538ac Binary files /dev/null and b/docs/.gitbook/assets/oss-welcome-banner (1) (1).png differ diff --git a/docs/.gitbook/assets/platform-database-schema (1) (1).pdf b/docs/.gitbook/assets/platform-database-schema (1) (1).pdf new file mode 100644 index 0000000000..94eda829dd Binary files /dev/null and b/docs/.gitbook/assets/platform-database-schema (1) (1).pdf differ diff --git a/docs/.gitbook/assets/read-usecase-2 (1) (1).png b/docs/.gitbook/assets/read-usecase-2 (1) (1).png new file mode 100644 index 0000000000..6c17a7d63c Binary files /dev/null and b/docs/.gitbook/assets/read-usecase-2 (1) (1).png differ diff --git a/docs/.gitbook/assets/screen-shot-2019-08-03-at-11.08.49 (1) (1).png b/docs/.gitbook/assets/screen-shot-2019-08-03-at-11.08.49 (1) (1).png new file mode 100644 index 0000000000..8f4bc6973a Binary files /dev/null and b/docs/.gitbook/assets/screen-shot-2019-08-03-at-11.08.49 (1) (1).png differ diff --git a/docs/.gitbook/assets/screen-shot-2019-08-03-at-11.08.49 (1) (2).png b/docs/.gitbook/assets/screen-shot-2019-08-03-at-11.08.49 (1) (2).png new file mode 100644 index 0000000000..8f4bc6973a Binary files /dev/null and b/docs/.gitbook/assets/screen-shot-2019-08-03-at-11.08.49 (1) (2).png differ diff --git a/docs/.gitbook/assets/screenshot-2019-09-13-at-14.16.23 (1) (1) (1).png b/docs/.gitbook/assets/screenshot-2019-09-13-at-14.16.23 (1) (1) (1).png new file mode 100644 index 0000000000..720b495a87 Binary files /dev/null and b/docs/.gitbook/assets/screenshot-2019-09-13-at-14.16.23 (1) (1) (1).png differ diff --git a/docs/.gitbook/assets/screenshot-2019-09-17-at-08.05.51 (1) (1) (1).png b/docs/.gitbook/assets/screenshot-2019-09-17-at-08.05.51 (1) (1) (1).png new file mode 100644 index 0000000000..92c716b57c Binary files /dev/null and b/docs/.gitbook/assets/screenshot-2019-09-17-at-08.05.51 (1) (1) (1).png differ diff --git a/docs/.gitbook/assets/search-usecase (3) (1) (1).png b/docs/.gitbook/assets/search-usecase (3) (1) (1).png new file mode 100644 index 0000000000..f10dbdf7b8 Binary files /dev/null and b/docs/.gitbook/assets/search-usecase (3) (1) (1).png differ diff --git a/docs/.gitbook/assets/update-usecase-2 (1) (1).png b/docs/.gitbook/assets/update-usecase-2 (1) (1).png new file mode 100644 index 0000000000..e56bbd5340 Binary files /dev/null and b/docs/.gitbook/assets/update-usecase-2 (1) (1).png differ diff --git a/docs/contributing-or-getting-involved/workflow-for-adding-code.md b/docs/contributing-or-getting-involved/workflow-for-adding-code.md index f619d98e05..e619f0b5a8 100644 --- a/docs/contributing-or-getting-involved/workflow-for-adding-code.md +++ b/docs/contributing-or-getting-involved/workflow-for-adding-code.md @@ -67,7 +67,7 @@ Where “some-task” is a short description _without spaces_ of what this task ### 7. Write Code -Now write your code. Make sure you meet the [Ushahidi coding standards](https://ushahidi.gitbook.io/platform-developer-documentation/development-process/coding-standards) and use the [Ushahidi pattern library](https://ushahidi.gitbook.io/platform-developer-documentation/changing-ui-styles-introduction-to-the-pattern-library) if you need to change the css. +Now write your code. Make sure you meet the [Ushahidi coding standards](https://docs.ushahidi.com/platform-developer-documentation/development-and-code/coding-standards) and use the [Ushahidi pattern library](https://docs.ushahidi.com/platform-developer-documentation/front-end-development/changing-ui-styles-introduction-to-the-pattern-library) if you need to change the css. If you get stuck, or want to talk through ideas, you can contact [other Ushahidi developers](../get-in-touch.md). diff --git a/docs/contributors-to-ushahidi.md b/docs/contributors-to-ushahidi.md index 999869cdb6..31bb7dd124 100644 --- a/docs/contributors-to-ushahidi.md +++ b/docs/contributors-to-ushahidi.md @@ -2,9 +2,9 @@ There are many ways to get involved with Ushahidi. You can read about how to contribute in [our docs](https://docs.ushahidi.com/platform-developer-documentation/contributing-or-getting-involved). -This is a list of people who have contributed to Ushahidi. Not everyone in this list contributed code. Some folks here are designers, and they designed different components of the Ushahidi platform to make it better. Some did things that improved the organization and enabled others to thrive, like writing docs, blog posts, or perform business functions for our non profit. Many developed code and reviewed other people's code. A lot of people opened new bug tickets or provided ideas. +This is a list of people who have contributed to Ushahidi. Not everyone in this list contributed in code. Some folks here are designers, and they designed different components of the Ushahidi platform to make it better. Some did things that improved the organization and enabled others to thrive, like writing docs, blog posts, or perform business functions for our non profit. Many developed code and reviewed other people's code. A lot of people opened new bug tickets or provided ideas. -Notice: when looking at the "code" contribution links that some folks have, be aware that not all the code lives in this repository and may not appear to have committed here, but they may have commited in the platform-client repository. +Notice: when looking at the "code" contribution links of some contributors, be aware that not all the code lives in this repository and may not appear to have been committed here, but they may have been committed in the platform-client repository. _**All contributors to the Ushahidi Platform are valued by Ushahidi. Thank you to everyone who contributed and continues to contribute over the years.**_ diff --git a/docs/development-and-code/setup_alternatives/setting-up-the-pattern-library-for-development.md b/docs/development-and-code/setup_alternatives/setting-up-the-pattern-library-for-development.md index f50b7aff25..a9fe8c3aa8 100644 --- a/docs/development-and-code/setup_alternatives/setting-up-the-pattern-library-for-development.md +++ b/docs/development-and-code/setup_alternatives/setting-up-the-pattern-library-for-development.md @@ -33,6 +33,18 @@ gulp Once the pattern-library is running, the front-end guidelines and a guide on how to work with the pattern-library and its structure can be found on [http://localhost:8000/assets/html/front-end-guidelines/introduction.html](http://localhost:8000/assets/html/front-end-guidelines/introduction.html) +### But how do I test my new styles in the Platform? + +The pattern-library is installed as a npm-package in the Platform Client. For development, it is not suitable to publish a package for each change, and luckily, there is hack you can do to test the styles locally instead. + +1. Make sure the Pattern-library is built through running `gulp build` in the terminal +2. Copy all contents in the "assets" folder +3. Go to your Platform-client folder +4. Navigate to node\_modules/ushahidi-platform-pattern-library folder +5. Remove the contents in the "assets" folder +6. Paste the contents you copied from the assets-folder in the pattern-library +7. Done! Now you should be able to see the changes in the Platform Client + ## Further reading After setup, please read the [Platform Pattern Library](../../front-end-development/changing-ui-styles-introduction-to-the-pattern-library/) guidelines when working with the Platform Pattern Library. diff --git a/docs/development-and-code/setup_alternatives/vagrant-setup.md b/docs/development-and-code/setup_alternatives/vagrant-setup.md index 07b9072fe7..d6635ec253 100644 --- a/docs/development-and-code/setup_alternatives/vagrant-setup.md +++ b/docs/development-and-code/setup_alternatives/vagrant-setup.md @@ -119,7 +119,7 @@ cd ~/Code/platform-api ``` ```bash -sudo update-alternatives --set php /usr/bin/php7.1 +sudo update-alternatives --set php /usr/bin/php7.3 ``` ```bash diff --git a/docs/development-and-code/setup_alternatives/xampp.md b/docs/development-and-code/setup_alternatives/xampp.md index e02a889b6f..51eb9ca4c2 100644 --- a/docs/development-and-code/setup_alternatives/xampp.md +++ b/docs/development-and-code/setup_alternatives/xampp.md @@ -145,7 +145,7 @@ On Windows File Explorer, the default is to hide the extension of the files \(th * Modify the file in the following way: * Change the `CACHE_DRIVER` to be `array` instead of `memcache` \(it's feasible set it up with memcache at some point, but for simplicity we use `array`\) * Change the `DB_HOST` to `127.0.0.1` - * Change the `DB_USER` to `root` + * Change the `DB_USERNAME` to `root` * Change the `DB_PASSWORD` to be empty, so literally: `DB_PASSWORD=` * Change the `DB_DATABASE` to `platform`