summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-311-1/+1
|\
| * Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-311-0/+1
| |\
| * \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3158-729/+1101
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-26125-991/+1074
| |\ \ \
| * | | | Fix JS dispatcher for job traceLin Jen-Shin2017-05-181-1/+1
* | | | | Merge branch 'task-list-2' into 'master'Filipa Lacerda2017-05-311-1/+1
|\ \ \ \ \
| * | | | | Include deckar01-task_list with import instead of requireJared Deckard2017-05-231-1/+1
| * | | | | Upgrade to task_list v2Jared Deckard2017-05-231-1/+1
* | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-3124-65/+1093
|\ \ \ \ \ \
| * | | | | | enable meta+enter shortcut to quick submitissue-edit-inlinePhil Hughes2017-05-304-6/+21
| * | | | | | fixed issuable shortcuts not workingPhil Hughes2017-05-306-7/+27
| * | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-3046-650/+949
| |\ \ \ \ \ \
| * | | | | | | fixed up weird karma specs with tooltipPhil Hughes2017-05-263-8/+4
| * | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-project-move-warningPhil Hughes2017-05-263-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | fixed GFM references not workingPhil Hughes2017-05-252-2/+3
| | * | | | | | | fixed move issue specsPhil Hughes2017-05-251-1/+1
| * | | | | | | | use formState to update loading of save buttonissue-edit-inline-project-move-warningPhil Hughes2017-05-263-15/+7
| * | | | | | | | Warn before moving issue in inline edit formPhil Hughes2017-05-252-2/+19
| |/ / / / / / /
| * | | | | | | renamed path to web_url in endpointPhil Hughes2017-05-251-2/+2
| * | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-25139-1581/+1947
| |\ \ \ \ \ \ \
| * | | | | | | | Changed all data to come through the JSON script elementPhil Hughes2017-05-243-35/+14
| * | | | | | | | Merge branch 'issue-edit-inline-getdata-after-update' into 'issue-edit-inline'Filipa Lacerda2017-05-241-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Get new data after inline edit saveissue-edit-inline-getdata-after-updatePhil Hughes2017-05-221-0/+5
| * | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-225-4/+42
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Added test to check if warning is not visiblePhil Hughes2017-05-221-1/+2
| | * | | | | | | | Removed role from linkissue-edit-inline-locked-warningPhil Hughes2017-05-221-2/+1
| | * | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-locked-warningPhil Hughes2017-05-226-7/+124
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Added specs for testing when warning is visiblePhil Hughes2017-05-182-17/+8
| | * | | | | | | | | Show warning if realtime data has changed since the form has openedPhil Hughes2017-05-184-3/+50
| * | | | | | | | | | added label to buttonPhil Hughes2017-05-221-4/+4
| * | | | | | | | | | Moved value into computed propertyissue-edit-inline-description-templatePhil Hughes2017-05-223-6/+9
| * | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-227-14/+140
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Removed un-used CSSissue-edit-inline-move-projectPhil Hughes2017-05-182-3/+3
| | * | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-move-projectPhil Hughes2017-05-187-9/+62
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'auto-focus-description-field' into 'issue-edit-inline'Filipa Lacerda2017-05-181-1/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Focus the description field in the inline form when mountedPhil Hughes2017-05-171-1/+4
| | | * | | | | | | | | Stops formState from updating if the form is already openissue-edit-inline-stop-edit-button-reseting-statePhil Hughes2017-05-171-6/+8
| | * | | | | | | | | | Added move to project in issue inline edit formPhil Hughes2017-05-176-3/+124
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-176-4/+55
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'issue-edit-inline-confidential' into 'issue-edit-inline' Filipa Lacerda2017-05-175-1/+43
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'issue-edit-inline' into issue-edit-inline-confidentialissue-edit-inline-confidentialPhil Hughes2017-05-1712-6/+396
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | * | | | | | | | | Use dash instead of underscorePhil Hughes2017-05-161-2/+2
| | | * | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-confidentialPhil Hughes2017-05-1613-86/+121
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Added inline confidential fieldPhil Hughes2017-05-154-1/+44
| | * | | | | | | | | | | Merge branch 'issue-edit-inline-title-validation' into 'issue-edit-inline' Filipa Lacerda2017-05-172-2/+12
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Disable inline submit button when title is blankissue-edit-inline-title-validationPhil Hughes2017-05-162-2/+12
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Fixed up the template dropdown to correctly workPhil Hughes2017-05-164-10/+57
| * | | | | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-1614-52/+431
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Use the tooltip mixinissue-edit-inline-description-fieldPhil Hughes2017-05-164-8/+30
| | * | | | | | | | | | Fixed else-if in descriptionPhil Hughes2017-05-161-1/+1
View Lorry Controller Status