summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ide-workbench-barPhil Hughes2018-04-2023-151/+395
|\
| * Merge branch '42803-show-new-branch-mr-button' into 'master'Sean McGivern2018-04-201-12/+21
| |\
| | * Shows new branch/mr button even when branch existsJacopo2018-04-191-12/+21
| * | Resolve "Text from the diff is showing within a table header inside the discu...Simon Knox2018-04-201-1/+1
| * | Merge branch 'issue_45435' into 'master'Phil Hughes2018-04-201-0/+2
| |\ \
| | * | Fix issues without links when added from boards new issue modalFelipe Artur2018-04-191-0/+2
| * | | Refactored activity calendarJose2018-04-191-75/+130
| * | | Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-1916-50/+204
| | |/ | |/|
| * | Merge branch 'ide-diff-marker-cache-fix' into 'master'Tim Zallmann2018-04-193-13/+37
| |\ \
| | * | Fixed IDE diff markers being cached too longPhil Hughes2018-04-113-13/+37
* | | | spacing & color updatesPhil Hughes2018-04-203-41/+37
* | | | moved activity bar view constant into constants filePhil Hughes2018-04-203-5/+7
* | | | fixed eslintPhil Hughes2018-04-201-2/+0
* | | | remove need for getter, allow state to set componentPhil Hughes2018-04-203-16/+5
* | | | added spec to ide_side_barPhil Hughes2018-04-192-13/+10
* | | | removed collapsed & toggle collapsed specsPhil Hughes2018-04-191-42/+0
* | | | added keep-alive to improve performance when switching between tabsPhil Hughes2018-04-191-3/+5
* | | | spec updatesPhil Hughes2018-04-192-14/+2
* | | | cleaned up after merging masterPhil Hughes2018-04-195-125/+27
* | | | Merge branch 'master' into ide-workbench-barPhil Hughes2018-04-1934-441/+1103
|\ \ \ \ | |/ / /
| * | | Merge branch 'ide-staged-changes' into 'master'Tim Zallmann2018-04-1926-271/+837
| |\ \ \
| | * \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-197-159/+262
| | |\ \ \
| | * | | | updates to variable names to make more sensePhil Hughes2018-04-186-36/+35
| | * | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-1823-300/+543
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-1766-1036/+1193
| | |\ \ \ \
| | * | | | | correctly dispose cached modelsPhil Hughes2018-04-111-1/+10
| | * | | | | updated iconsPhil Hughes2018-04-0910-15/+54
| | * | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0938-83/+1107
| | |\ \ \ \ \
| | * | | | | | fixed failing tests because of passed `null`Phil Hughes2018-04-071-1/+1
| | * | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0765-815/+1626
| | |\ \ \ \ \ \
| | * | | | | | | added ability to have `head` file to compare againstPhil Hughes2018-04-066-11/+19
| | * | | | | | | fixed eslintPhil Hughes2018-04-061-1/+1
| | * | | | | | | updates to template text to be i18n readyPhil Hughes2018-04-065-27/+35
| | * | | | | | | fixed delayed update viewerPhil Hughes2018-04-054-6/+6
| | * | | | | | | fixed staged/unstaged files not opening when another 1 is openPhil Hughes2018-04-053-9/+12
| | * | | | | | | fixed tab being clicked throwing an errorPhil Hughes2018-04-051-1/+1
| | * | | | | | | fixed changed icon showing after committingPhil Hughes2018-04-051-0/+1
| | * | | | | | | fixed staged content not updatingPhil Hughes2018-04-055-8/+25
| | * | | | | | | fixed typo in selectorPhil Hughes2018-04-052-5/+3
| | * | | | | | | fixed karma & eslintPhil Hughes2018-04-051-3/+1
| | * | | | | | | update staged files to correctly use pending tabPhil Hughes2018-04-055-42/+33
| | * | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0528-76/+205
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0335-545/+1744
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | fixed alignment with iconsPhil Hughes2018-03-293-51/+54
| | * | | | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-2942-857/+983
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-2730-181/+316
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | double click to stage & unstage fileside-staged-changesPhil Hughes2018-03-221-7/+11
| | * | | | | | | | | | | hide tooltip on collapse button when clickedPhil Hughes2018-03-223-2/+14
| | * | | | | | | | | | | added tooltips to various icons in the sidebarsPhil Hughes2018-03-2212-102/+246
| | * | | | | | | | | | | spec fixesPhil Hughes2018-03-221-1/+4