summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* 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
* [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-3015-82/+174
* Merge branch 'es-module-autosave' into 'master'Filipa Lacerda2017-10-306-27/+17
|\
| * Merge branch 'master' into 'es-module-autosave'es-module-autosaveMike Greiling2017-10-24109-2081/+2906
| |\
| * | remove import from main.jsMike Greiling2017-10-121-1/+0
| * | remove global exportMike Greiling2017-10-121-2/+0
| * | convert Autosave into pure es module and remove global exportMike Greiling2017-10-125-25/+18
* | | Merge branch 'add-user-avatar-username-link' into 'master'Fatih Acet2017-10-271-3/+26
|\ \ \
| * | | Rename to shouldShowUsernameClement Ho2017-10-271-3/+3
| * | | Add configurable option to display username in user avatar link componentClement Ho2017-10-181-3/+26
* | | | Merge branch '39188-change-default-disabled-merge-message' into 'master'Filipa Lacerda2017-10-271-2/+3
|\ \ \ \
| * | | | Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-2/+3
* | | | | Remove groups_select from global namespace & simplifies the codeFilipa Lacerda2017-10-273-113/+77
|/ / / /
* | | | Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-255-12/+56
|\ \ \ \
| * | | | Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-195-12/+56
* | | | | Remove filter icon from search bar32318-filter-iconAnnabel Dunstone Gray2017-10-241-12/+1
* | | | | Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'Filipa Lacerda2017-10-2414-29/+339
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-236-6/+182
| |\ \ \ \ \
| * | | | | | spec fixesPhil Hughes2017-10-231-1/+1
| * | | | | | moved to eventHub to manage creating new filesPhil Hughes2017-10-237-50/+71
| * | | | | | fixed eslint :see_no_evil:Phil Hughes2017-10-231-3/+1
| * | | | | | added feature specPhil Hughes2017-10-231-3/+8
| * | | | | | fixed failing title testPhil Hughes2017-10-231-0/+1
| * | | | | | fixed bug with tabs not switching correctlyPhil Hughes2017-10-235-12/+52
| * | | | | | failing spec fixesPhil Hughes2017-10-235-30/+31
| * | | | | | correctly creates file in currently viewed directoryPhil Hughes2017-10-233-0/+3
| * | | | | | changed adding temp files/directories code to match new structurePhil Hughes2017-10-232-20/+37
| * | | | | | fixed new file/directory modal using methods that no longer existPhil Hughes2017-10-233-46/+47
| * | | | | | Add new files & directories in the multi-file editorPhil Hughes2017-10-2311-31/+254
* | | | | | | Merge branch 'remove-new-sidebar-stuff' into 'master'Phil Hughes2017-10-246-42/+36
|\ \ \ \ \ \ \
| * | | | | | | Rename new_sidebar in JSremove-new-sidebar-stuffAnnabel Dunstone Gray2017-10-202-5/+5
| * | | | | | | Remove variables from sidebar CSSAnnabel Dunstone Gray2017-10-202-22/+20
| * | | | | | | Replace all instances of new-sidebar with contextual-sidebarAnnabel Dunstone Gray2017-10-203-17/+13
* | | | | | | | Merge branch 'fix-unresolve-btn-jump-color' into 'master'Phil Hughes2017-10-242-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix icon color and btn-group alignment of discussion buttonsfix-unresolve-btn-jump-colorAnnabel Dunstone Gray2017-10-232-2/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sticky-perf' into 'master'Filipa Lacerda2017-10-244-10/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | fixed karma testssticky-perfPhil Hughes2017-10-231-1/+2
| * | | | | | | calculate the stickyTop instead of hard coding a variablePhil Hughes2017-10-233-4/+13
| * | | | | | | Fix performance of sticky.jsPhil Hughes2017-10-232-7/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '37860-pipelines-page' into 'master'Phil Hughes2017-10-236-74/+120
|\ \ \ \ \ \ \
| * | | | | | | Changes after review37860-pipelines-pageFilipa Lacerda2017-10-233-3/+3
| * | | | | | | Merge branch 'master' into 37860-pipelines-pageFilipa Lacerda2017-10-2321-346/+338
| |\ \ \ \ \ \ \
| * | | | | | | | Make pipelines table in MR view usableFilipa Lacerda2017-10-186-74/+120
View Lorry Controller Status