Skip to content

Commit

Permalink
Merge pull request #327 from Alfresco/development
Browse files Browse the repository at this point in the history
1.2.0
  • Loading branch information
DenysVuika authored Apr 20, 2018
2 parents 2bd57f4 + 0584d08 commit c0fd938
Show file tree
Hide file tree
Showing 136 changed files with 5,104 additions and 12,861 deletions.
2 changes: 1 addition & 1 deletion .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"component": {},
"serve": {
"proxyConfig": "proxy.conf.js",
"port": 3000,
"port": 4200,
"host": "0.0.0.0"
}
}
Expand Down
16 changes: 16 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
jobs:
build:
working_directory: ~/alfresco-content-app
docker:
- image: circleci/node:8-browsers
steps:
- checkout
- restore_cache:
key: alfresco-content-app-{{ .Branch }}-{{ checksum "package.json" }}
- run: npm install
- save_cache:
key: alfresco-content-app-{{ .Branch }}-{{ checksum "package.json" }}
paths:
- "node_modules"
- run: xvfb-run -a npm run test:ci
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.circleci
.git
.github
.vscode
coverage
docs
e2e
e2e-output
node_modules
scripts
src
5 changes: 5 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ALFRESCO_TAG=6.0.4-ea
SHARE_TAG=6.0.a
SOLR6_TAG=1.1.0
POSTGRES_TAG=10.1
ACA_TAG=development
53 changes: 53 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<!--
PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.
ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
-->

## I'm submitting a...
<!-- Check one of the following options with "x" -->
<pre><code>
[ ] Regression (a behavior that used to work and stopped working in a new release)
[ ] Bug report <!-- Please search GitHub for a similar issue or PR before submitting -->
[ ] Feature request
[ ] Documentation issue or request
[ ] Support request => Please do not submit support request here, instead see https://github.com/Alfresco/alfresco-content-app/blob/master/CONTRIBUTING.md#question
</code></pre>

## Current behavior
<!-- Describe how the issue manifests. -->


## Expected behavior
<!-- Describe what the desired behavior would be. -->


## Minimal reproduction of the problem with instructions
<!--
For bug reports please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem.
-->

## What is the motivation / use case for changing the behavior?
<!-- Describe the motivation or the concrete use case. -->


## Environment

<pre><code>
ACA version: X.Y.Z
<!-- Check whether this is still an issue in the most recent ACA version -->

Browser:
- [ ] Chrome version XX
- [ ] Firefox version XX
- [ ] Safari version XX
- [ ] Edge version XX
- [ ] IE11

For Tooling issues:
- Node version: XX <!-- run `node --version` -->
- Platform: <!-- Mac, Linux, Windows -->

Others:
<!-- Anything else relevant? Operating system version, IDE, package manager, HTTP server, ... -->
</code></pre>
43 changes: 43 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
## PR Checklist
Please check if your PR fulfills the following requirements:

- [ ] The commit message follows our guidelines: https://github.com/Alfresco/alfresco-content-app/blob/master/CONTRIBUTING.md#commit
- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)


## PR Type
What kind of change does this PR introduce?

<!-- Please check the one that applies to this PR using "x". -->
```
[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Application / Infrastructure changes
[ ] Other... Please describe:
```

## What is the current behavior?
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->

Issue Number: N/A


## What is the new behavior?


## Does this PR introduce a breaking change?
```
[ ] Yes
[ ] No
```

<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->


## Other information
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history

# misc
/.sass-cache
Expand Down
26 changes: 3 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,9 @@ language: node_js
node_js:
- "8"

cache:
directories:
- ./node_modules

services:
- docker

install:
- npm install
- npm install -g npm@latest
- npm ci

script:
- npm run build
- npm run test -- --single-run --no-progress && cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage && rm -rf ./coverage

# Send coverage data to codecov
after_success:
- bash <(curl -s https://codecov.io/bash) -X gcov
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
- export TAG=`if [ "$BRANCH" == "master" ]; then echo "latest"; else echo $BRANCH ; fi`
- sed -i 's/{:port}/:8080/1' ./dist/app.config.json
- docker build -t $DOCKER_REPO:$TAG .
# Publish extra image based on Travis build number
- docker tag $DOCKER_REPO:$TAG $DOCKER_REPO:travis-$TRAVIS_BUILD_NUMBER
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
- docker push $DOCKER_REPO
- npm run test:ci
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"cSpell.words": [
"sidenav"
]
}
23 changes: 23 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Contributor Code of Conduct

We want to make everyone feel welcome to contribute to ACA.
We promise to respect everyone who posts issues, updates documentation,
submits pull requests, provides feedback in comments, or makes any other contribution to the project.

We expect all discussion about the project (on GitHub, social media and other channels) to be positive and constructive.
We do not accept personal attacks, trolling, public or private harassment, insults,
or other unprofessional conduct towards anyone.

We promise to show respect to all contributors regardless of their gender, gender identity,
sexual orientation, disability, age, race, ethnicity, religion, or level of experience.

We expect all contributors to understand and follow these standards
If any member of the community does not follow the code of conduct,
the maintainers will do whatever they consider appropriate to stop the unacceptable behavior.
This may include removing issues, comments, and PRs or blocking accounts.
Any bans may be temporary or permanent, at the maintainers’ discretion.

Contact us if you see any behavior that breaks the code of conduct, whether it is directed at you or at anyone else.
We take responsibility for making sure the code of conduct is clear and understandable,
so you should also contact us if you think there is anything that needs to be explained better.
Our contact email address is: [[email protected]](mailto:[email protected])
147 changes: 147 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
# Contributing to Alfresco Content Application (ACA)

Alfresco actively encourages external contributions to this Content Application so that the project can move develop in such a way that benefits the wider community.

As a contributor, here are the guidelines we would like you to follow:

* [Code of Conduct](#coc)
* [Question or Problem?](#question)
* [Issues and Bugs](#issue)
* [Feature Requests](#feature)
* [Submission Guidelines](#submit)
* [Coding Rules](#rules)
* [Signing the CLA](#cla)

## <a name="coc"></a> Code of Conduct

Help us keep Alfresco Content Application open and inclusive.
Please read and follow our [Code of Conduct][coc].

## <a name="question"></a> Got a Question or Problem?

Please do not open issues for general support questions as we want to keep GitHub issues for bug reports and feature requests.

The ADF [Gitter][gitter] channel is a much better place to ask questions:

* direct access to many experienced Angular and ADF developers
* questions and answers stay available for public viewing so your question / answer might help someone else
* all discussions are saved and indexed, you can search for previous answers

## <a name="issue"></a> Found a Bug?

If you find a bug in the source code, you can help us by:

* [submitting an issue](#submit-issue) to our [ACA JIRA project][jira]
* [submitting an issue](#submit-issue) to our [GitHub Repository][github].

Even better, [submit a Pull Request](#submit-pr) with a fix.

## <a name="feature"></a> Missing a Feature?

You can *request* a new feature by [submitting an issue](#submit-issue)
to our [JIRA project][jira] or GitHub Repository.
If you would like to *implement* a new feature, please submit an issue with a proposal for your work first,
to be sure that we can use it.

Please consider what kind of change it is:

* For a **Major Feature**, first open an issue and outline your proposal so that it can be
discussed. This will also allow us to better coordinate our efforts, prevent duplication of work,
and help you to craft the change so that it is successfully accepted into the project.
* **Small Features** can be crafted and directly [submitted as a Pull Request](#submit-pr).

## <a name="submit"></a> Submission Guidelines

Before you submit an issue, search the issue tracker, an issue for your problem may already exist
and the discussion might inform you of potential workarounds.

We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it.
In order to reproduce bugs, we require you to provide a description of the problem, steps to reproduce and other supporting information that will help us recreate the problem you experianced.

Having a reproducible scenario gives us a wealth of important information without going back & forth to you with additional questions like:

* version of node.js used
* version of NPM used
* version of Angular used
* versions of ADF libraries used
* 3rd-party libraries and their versions
* and most importantly - a use-case that fails

You can file new issues by filling out our [new issue form](https://github.com/Alfresco/alfresco-content-app/issues/new).

### <a name="submit-pr"></a> Submitting a Pull Request (PR)

Before you submit your Pull Request (PR) consider the following guidelines:

1. Search [GitHub](https://github.com/Alfresco/alfresco-content-app/pulls) for an open or closed PR
that relates to your submission. You don't want to duplicate effort.
1. Sign the [Contributor License Agreement (CLA)](#cla) before sending PRs.
We cannot accept code without this.
Make sure you sign with the primary email address of the Git identity that has been granted access to the Angular repository.
1. Fork the ACA repository.
1. Make your changes in a new git branch based on **development**:

```shell
git checkout -b my-fix-branch development
```

1. Create your patch, **including appropriate test cases**.
1. Follow our [Coding Rules](#rules).
1. Run the full ACA test suite and ensure that all tests pass.
1. Commit your changes using a descriptive commit message.
1. Push your branch to GitHub:

```shell
git push origin my-fix-branch
```

1. In GitHub, send a pull request to `alfresco-content-app:development`.
* If we suggest changes then:
* Make the required updates.
* Re-run the ACA test suites to ensure tests are still passing.
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request):

```shell
git rebase development -i
git push -f
```

That's it! Thank you for your contribution!
## <a name="rules"></a> Coding Rules
To ensure consistency throughout the source code, keep these rules in mind as you are working:
* All features or bug fixes **must be tested** by one or more specs (unit-tests).
* All public API methods **must be documented**.
## <a name="cla"></a> Signing the CLA
Sign the [Contributor License Agreement (CLA)][cla] before sending pull requests.
In addition, you will get the CLA link automatically generated for your first pull request.
For any code changes to be accepted, the CLA must be signed.
<hr>
If you have more than one Git identity, you must make sure that you sign the CLA using the primary
email address associated with the ID that has been granted access to the Angular repository.
Git identities can be associated with more than one email address, and only one is primary.
Here are some links to help you sort out multiple Git identities and email addresses:
* https://help.github.com/articles/setting-your-commit-email-address-in-git/
* https://stackoverflow.com/questions/37245303/what-does-usera-committed-with-userb-13-days-ago-on-github-mean
* https://help.github.com/articles/about-commit-email-addresses/
* https://help.github.com/articles/blocking-command-line-pushes-that-expose-your-personal-email-address/
Note that if you have more than one Git identity, it is important to verify that you are logged in
with the same ID with which you signed the CLA, before you commit changes. If not, your PR will fail the CLA check.
<hr>
[coc]: https://github.com/Alfresco/alfresco-content-app/blob/master/CODE_OF_CONDUCT.md
[github]: https://github.com/Alfresco/alfresco-content-app
[gitter]: https://gitter.im/Alfresco/alfresco-ng2-components
[jira]: https://issues.alfresco.com/jira/projects/ACA
[cla]: https://cla-assistant.io/Alfresco/alfresco-content-app
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM nginx:alpine
LABEL version="1.2"
LABEL maintainer="Denys Vuika <[email protected]>"

COPY nginx.conf /etc/nginx/nginx.conf

Expand Down
Loading

0 comments on commit c0fd938

Please sign in to comment.