Skip to content

Commit 44da700

Browse files
committed
Merge branch 'master' into issue/1715
2 parents 3909baa + 4707be7 commit 44da700

820 files changed

Lines changed: 35606 additions & 17620 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CONTRIBUTING.md

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,38 @@
11
# How to contribute
22

3-
We heartily welcome contributions to the source code for the Adapt Authoring
4-
project. This document outlines some contributor guidlines to help you get
5-
started.
6-
7-
## Getting Started
8-
9-
* Make sure you have a [GitHub account](https://github.com/signup/free)
10-
* Pick an open issue from the list [here](https://github.com/adaptlearning/adapt_authoring/issues) OR
11-
* Submit a ticket for an issue you have noticed
12-
* If submitting a bug, clearly describe the issue including steps to
13-
reproduce and add the "bug" label
14-
* If submitting a request for a new feature, add the "enhancement"
15-
label
16-
* Fork the repository on [GitHub](https://github.com/adaptlearning/adapt_authoring)
17-
* Follow the developer set-up guide [here](https://github.com/adaptlearning/adapt_authoring/wiki/Developer's-Install)
18-
19-
We try to add one of the following labels to all our issues to indicate difficulty:
20-
21-
* Easy
22-
* Medium
23-
* Hard
24-
* Insane
25-
26-
Picking up an "Easy" issue is a good way to start contributing if you have
27-
not worked on a nodejs or backbone project before. Otherwise, you should have
28-
no problems working on a "Medium" issue. "Hard" and "Insane" issues are
29-
targeted at contributors that have had extensive experience of developing
30-
for this project.
3+
We heartily welcome contributions to the source code for the Adapt authoring project. This document outlines some contributor guidelines to help you get started.
4+
5+
## Before you begin
6+
7+
* Make sure you have a [GitHub account](https://github.com/signup/free), as all contributions are made through GitHub.
8+
* Fork the [`adapt_authoring`](https://github.com/adaptlearning/adapt_authoring) repository to your GitHub account.
9+
* Follow the [developer set-up guide](https://github.com/adaptlearning/adapt_authoring/wiki/Developer's-Install) to get a developer instance of the authoring tool installed.
10+
11+
## Finding work
12+
13+
* Pick an open issue from the list [here.](https://github.com/adaptlearning/adapt_authoring/issues)
14+
* Create a new ticket for the issue you have noticed, following our guidelines on [submitting new bugs and features.](https://github.com/adaptlearning/adapt_framework/wiki/Bugs-and-features)
15+
* If submitting a new ticket, we recommend getting the go-ahead for the change from the core team before you start work.
16+
17+
### Use the labels
18+
19+
We add difficulty rating labels to issues to give developers an idea of the work involved (always prefixed with `D:`). Picking up a `D: beginner` or `D: easy` issue is a good place to start if you're new to the project, and have limited Node.js and Backbone.js experience. For more confident developers, `D: medium` issues should be no problem. Any `D: hard` and `D: insane` issues are likely to involve very complex solutions, and potentially collaboration, to solve. Due to the work involved, these should only be attempted by developers with an extensive knowledge of the codebase, and a good working relationship with the core team.
3120

3221
## Making Changes
3322

34-
* Create a new branch named for the issue that you are fixing, and base it on
35-
the target branch (e.g. `git checkout -b issues/123 origin/develop`)
36-
* Make your changes
37-
* Add some tests if your changes warrant it
38-
* Run all tests using `npm test`
39-
* Commit your changes using [best practice](http://www.git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines) in your commit message and take
40-
advantage of GitHub's built in features to [close issues via commits](https://help.github.com/articles/closing-issues-via-commit-messages/)
23+
* Create a new branch for the issue that you are fixing:
24+
* Make sure to base it on the correct parent branch; in most cases this will be develop. Getting this step wrong may cause you a lot of heartbreak when it comes to merging later on, so it's worth checking before starting work.
25+
* Name your branch according to the issue it addresses (i.e. `issue/1234`).
26+
* Create your branch (e.g. `git checkout -b issue/123 origin/develop`).
27+
* Make your changes (please make sure that your commit messages stick to the [guidelines](http://www.git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines), and take advantage of GitHub's built in features to [close issues via commits.](https://help.github.com/articles/closing-issues-via-commit-messages/)
28+
* Add unit tests to cover your new functionality, if appropriate.
29+
* Run the existing unit tests using `npm test` (and ensure they pass!)
4130

4231
## Submitting Changes
4332

44-
* Push your changes to your fork of the adapt_authoring repository
45-
* Submit a pull request using the GitHub interface, and reference the issue
46-
number
47-
* The core team will be automatically notified of your changes, but you can
48-
also bring it to our attention via the [gitter.im channel](https://gitter.im/adaptlearning/adapt_authoring)
33+
* Push your changes to your personal fork of the `adapt_authoring` repository.
34+
* Submit a pull request using the GitHub interface, and make sure to link to the issue you're addressing.
35+
* The core team will be automatically notified of your changes, but you can also bring it to our attention via the [gitter.im channel](https://gitter.im/adaptlearning/adapt_authoring).
4936

5037
# Additional Resources
5138

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# BUG Template
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
26

37
## Expected Behaviour
48

@@ -12,18 +16,7 @@
1216
## Versions
1317
- Authoring Tool Version:
1418
- Framework Version:
19+
- Node.js Version:
20+
- MongoDB Version:
1521
- Operating System:
1622
- Browser:
17-
18-
19-
# Feature Request Template
20-
21-
## Affected Area
22-
23-
## Requested Feature
24-
25-
## Use Case
26-
27-
## Current Workaround
28-
29-
## Additional Information
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea
4+
5+
---
6+
7+
## Affected Area
8+
9+
## Requested Feature
10+
11+
## Use Case
12+
13+
## Current Workaround
14+
15+
## Additional Information

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
## Proposed changes
2+
3+
Please describe your changes in full here, including steps needed to build/test it. The more useful detail you give, the easier it is for the core team to review and approve :smile:
4+
5+
If this is a particularly large change, give as much detail as you can about the reasoning behind your solution, and any alternatives you considered.
6+
7+
**Please also include a link to the issue that this addresses (we usually won't accept pull requests without an associated issue).**
8+
9+
## Checklist
10+
11+
Below is a checklist of the key things that the core team will be looking for when reviewing your PR. Please check off as many of these as you can prior to submitting the PR, but don't worry if you can't do all of them, the core team are here to help!
12+
13+
- [ ] I have read the [CONTRIBUTING](https://github.com/adaptlearning/adapt_authoring/blob/master/.github/CONTRIBUTING.md) doc
14+
- [ ] I have checked that the code compiles correctly
15+
- [ ] I have checked that unit test suite passes locally with my changes
16+
- [ ] I have added new tests that cover my changes (where appropriate)
17+
- [ ] I have added documentation (where appropriate)
18+
- [ ] Any dependent changes have already been merged
19+
20+
## Next steps
21+
22+
The core team will be automatically notified of your changes, but also feel free to bring it to our attention via the [gitter.im channel](https://gitter.im/adaptlearning/adapt_authoring).

.gitignore

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
/adapt_framework
2-
31
/conf/config.json
4-
2+
/conf/migrate.json
53
/data
64

75
/frontend/build
@@ -14,6 +12,8 @@
1412
/nbproject/
1513
/master/
1614

15+
package-lock.json
16+
1717
/plugins/content/component/versions/
1818
/plugins/content/component/componentcache/
1919
/plugins/content/extension/versions/
@@ -24,14 +24,11 @@
2424
/plugins/content/bower/bowercache/
2525

2626
/temp
27-
/test_frontend/img
27+
/test/.testcache
2828
/tmp
2929

3030
/.settings
3131

32-
version.json
33-
3432
.idea
35-
.vagrant
36-
.env
3733
.project
34+
.vscode

.jscsrc

Lines changed: 0 additions & 29 deletions
This file was deleted.

.travis.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
5-
- "5"
6-
- "6"
4+
- "lts/*"
75

86
sudo: required
97

@@ -16,12 +14,7 @@ addons:
1614
- ubuntu-toolchain-r-test
1715
packages:
1816
- g++-4.8
19-
20-
branches:
21-
only:
22-
- master
23-
- develop
24-
17+
2518
git:
2619
depth: 10
2720

@@ -31,13 +24,12 @@ services:
3124
before_install:
3225
- git --version
3326
- mongod --version
34-
- npm install -g adapt-cli
35-
- adapt --version
3627
- npm install -g grunt-cli
3728

3829
install:
3930
- npm config set spin false
4031
- npm install
32+
- grunt build:prod
4133

4234
matrix:
4335
fast_finish: true

0 commit comments

Comments
 (0)