summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-md-form-tabs-double-click-toggle' into 'master'Clement Ho2017-11-062-22/+37
|\
| * Fix karmaLuke "Jared" Bennett2017-11-021-2/+2
| * Separate preview and write tabs into seperate eventsLuke "Jared" Bennett2017-11-022-24/+26
| * Fix markdown-preview events for new isPreview varLuke "Jared" Bennett2017-11-011-5/+12
| * Let field.vue handle the changing of previewLuke "Jared" Bennett2017-11-012-11/+11
| * Dont emit toggle-markdown event if current target is already active and add s...Luke "Jared" Bennett2017-11-011-5/+11
* | Merge branch '39757-border-zero-of-scss-lint' into 'master'Annabel Dunstone Gray2017-11-0638-99/+99
|\ \
| * | Enable BorderZero rule in scss-lintTakuya Noguchi2017-11-0638-99/+99
* | | Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'Annabel Dunstone Gray2017-11-069-196/+101
|\ \ \
| * | | Revert unintentional changes in !12810Takuya Noguchi2017-11-069-196/+101
| |/ /
* | | Merge branch '39668-tooltip-safari' into 'master'Tim Zallmann2017-11-061-0/+5
|\ \ \
| * | | Remove native title tooltip in pipeline jobs dropdown in Safari39668-tooltip-safariFilipa Lacerda2017-11-061-0/+5
* | | | Resolve "Editor icons"Tim Zallmann2017-11-0612-27/+48
* | | | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-061-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | FE review changes - remove internal details assertion and look for closest fo...Luke "Jared" Bennett2017-10-271-1/+1
| * | | Fix karmaLuke "Jared" Bennett2017-10-231-1/+1
| * | | Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-211-1/+2
| | |/ | |/|
* | | 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
View Lorry Controller Status