summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0337-635/+741
|\
| * Merge branch '39776-remove-responsive-table-bottom-border' into 'master'Annabel Dunstone Gray2017-11-031-1/+4
| |\
| | * Remove bottom-border from last responsive table rowEric Eastwood2017-11-031-1/+4
| * | Merge branch 'enable-scss-lint-mergeable-selector' into 'master'Annabel Dunstone Gray2017-11-0333-631/+722
| |\ \ | | |/ | |/|
| | * Enable MergeableSelector in scss-lint (for !14567)Takuya Noguchi2017-11-031-28/+31
| | * Enable MergeableSelector in scss-lint (for !14055)Takuya Noguchi2017-11-031-26/+26
| | * Enable MergeableSelector in scss-lint (for !14062)Takuya Noguchi2017-11-031-8/+2
| | * Enable MergeableSelector in scss-lint (for !14398)Takuya Noguchi2017-11-031-11/+11
| | * Enable MergeableSelector in scss-lint (for !13480)Takuya Noguchi2017-11-031-21/+17
| | * Enable MergeableSelector in scss-lint (for !13473)Takuya Noguchi2017-11-031-7/+0
| | * Enable MergeableSelector in scss-lint (for !13600)Takuya Noguchi2017-11-031-4/+2
| | * Enable MergeableSelector in scss-lintTakuya Noguchi2017-11-0332-554/+661
| * | Merge branch '39684-issue-boards-space' into 'master'Phil Hughes2017-11-031-3/+7
| |\ \
| | * | Remove white space at bottom of issue boards39684-issue-boards-spaceAnnabel Dunstone Gray2017-11-021-3/+7
| | |/
| * | Merge branch '39726-add-crsf-token-axios' into 'master'Phil Hughes2017-11-032-0/+8
| |\ \ | | |/ | |/|
| | * Add crsf token in axios calls39726-add-crsf-token-axiosFilipa Lacerda2017-11-022-0/+8
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0241-730/+777
|\ \ \ | |/ /
| * | Merge branch 'refactor-responsive-tables-for-nested-error' into 'master'Annabel Dunstone Gray2017-11-027-77/+103
| |\ \
| | * | Refactor responsive table styles to support nested error blockrefactor-responsive-tables-for-nested-errorEric Eastwood2017-11-027-77/+103
| * | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-0215-123/+152
| |\ \ \
| | * | | Fix for Dropdown Icon Positionicons-ci-iconsTim Zallmann2017-11-011-3/+3
| | * | | Needed to change 0px to 0Tim Zallmann2017-10-301-1/+1
| | * | | Missing Comma addedTim Zallmann2017-10-301-1/+1
| | * | | Fixed different sizesTim Zallmann2017-10-302-6/+33
| | * | | Added Missing SemicolonTim Zallmann2017-10-301-1/+1
| | * | | Improved Var Caching, Line Setup, SpecsTim Zallmann2017-10-302-5/+4
| | * | | Updated icon.vue to be more inline with other components + added spec for itTim Zallmann2017-10-302-8/+4
| | * | | Fixes another problem that happens during knapsack testingTim Zallmann2017-10-301-1/+1
| | * | | Fixing Tests and CSS displayTim Zallmann2017-10-301-2/+10
| | * | | Fixes for TestsTim Zallmann2017-10-304-27/+6
| | * | | Update Action IconsTim Zallmann2017-10-304-19/+14
| | * | | Fixing IconsTim Zallmann2017-10-3011-78/+101
| | * | | Comma to muchTim Zallmann2017-10-301-1/+1
| | * | | Updated Static Icons from CI AreaTim Zallmann2017-10-302-8/+10
| * | | | Merge branch 'winh-admin-projects-namespace-filter' into 'master'Tim Zallmann2017-11-022-83/+56
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Make NamespaceSelect change URL when filteringwinh-admin-projects-namespace-filterWinnie Hellmann2017-11-021-11/+12
| | * | | Reduce eslint-disable from NamespaceSelectWinnie Hellmann2017-10-261-1/+1
| | * | | Replace showAny for NamespaceSelect by isFilterWinnie Hellmann2017-10-261-6/+3
| | * | | Inline onSelectItem of NamespaceSelectWinnie Hellmann2017-10-261-7/+4
| | * | | Make NamespaceSelect a moduleWinnie Hellmann2017-10-262-81/+59
| * | | | Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda2017-11-021-3/+1
| |\ \ \ \
| | * | | | Fix cancel button not working when uploading a file on the new issue pagejivl-fix-cancel-button-file-upload-new-issueJose Ivan Vargas2017-11-011-3/+1
| * | | | | Merge branch 'multi-file-editor-binary-editor' into 'master'Filipa Lacerda2017-11-021-1/+7
| |\ \ \ \ \
| | * | | | | Fix binary files not showing anything in edit modemulti-file-editor-binary-editorPhil Hughes2017-11-011-1/+7
| * | | | | | Merge branch '35955-searchable-settings-puts-expand-collapse-toggle-in-an-inv...Tim Zallmann2017-11-022-27/+31
| |\ \ \ \ \ \
| | * | | | | | Stop sections from expanding when scrolling over the 1px section35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-stateEric Eastwood2017-10-311-0/+4
| | * | | | | | remove needlessly complicated, duplicate css class for expanded settings panelsMike Greiling2017-10-312-27/+27
| * | | | | | | Merge branch 'vue-update' into 'master'Tim Zallmann2017-11-022-2/+4
| |\ \ \ \ \ \ \
| | * | | | | | | karma spec updatesvue-updatePhil Hughes2017-11-012-2/+4
| * | | | | | | | Make contributors page translatableWinnie Hellmann2017-11-021-1/+2