summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1897-1058/+2686
|\
| * Merge branch 'refactor-ui-lists' into 'master' Dmitriy Zaporozhets2016-03-187-44/+26
| |\
| | * Refactor colors and listsDmitriy Zaporozhets2016-03-187-44/+26
| * | Merge branch 'refactor-variables' into 'master' Dmitriy Zaporozhets2016-03-184-33/+64
| |\ \ | | |/
| | * Cleanup somce css colorsDmitriy Zaporozhets2016-03-184-20/+25
| | * Re-group scss variablesDmitriy Zaporozhets2016-03-181-21/+47
| * | Fixes issue with filter label missing on labels & milestonesPhil Hughes2016-03-183-3/+3
| |/
| * Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-182-18/+0
| * Merge branch 'fix-mr-close-button' into 'master' Jacob Schatz2016-03-181-2/+2
| |\
| | * Fixes issue with close button not working on MRfix-mr-close-buttonPhil Hughes2016-03-181-2/+2
| * | Merge branch 'improved-issue-sidebar' into 'master' Jacob Schatz2016-03-182-57/+109
| |\ \
| | * | Removed global JS varimproved-issue-sidebarPhil Hughes2016-03-181-4/+5
| | * | Reused some variablesPhil Hughes2016-03-181-2/+2
| | * | Links to user on collapsed issue sidebarPhil Hughes2016-03-181-0/+4
| | * | Fixed issue when user doesnt existPhil Hughes2016-03-181-10/+1
| | * | Fixed tooltip issue for participantsPhil Hughes2016-03-181-1/+1
| | * | Improved issue sidebarPhil Hughes2016-03-182-57/+113
| | |/
| * | Another CS style fixissue-fade-loadPhil Hughes2016-03-181-1/+1
| * | Fixed some CS styling issuesPhil Hughes2016-03-184-74/+85
| * | Fixed issue with dashboard issues not reloadingPhil Hughes2016-03-183-4/+17
| * | Changing filter dropdowns shows loadingPhil Hughes2016-03-185-15/+42
| * | Merge branch 'improve-diff-ui' into 'master' Jacob Schatz2016-03-181-1/+9
| |\ \
| | * | Add space to separate different files in diffimprove-diff-uiDmitriy Zaporozhets2016-03-171-1/+9
| * | | Merge branch 'optimistic-todos' into 'master' Jacob Schatz2016-03-183-1/+68
| |\ \ \
| | * | | Mark all as done through AJAXPhil Hughes2016-03-171-5/+26
| | * | | Removed the flash success messagePhil Hughes2016-03-173-38/+30
| | * | | Remove `Flash` from todos when finishedJacob Schatz2016-03-171-1/+0
| | * | | Adds small AJAX optimistic functionality to todos.Jacob Schatz2016-03-173-1/+56
| * | | | Changed any variable name to save confusionPhil Hughes2016-03-181-2/+2
| * | | | Removed comparing against textPhil Hughes2016-03-181-1/+2
| * | | | Fixes issue with any milestone value in dropdown not being selectablePhil Hughes2016-03-181-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'fix-group-members-ui' into 'master' Dmitriy Zaporozhets2016-03-181-0/+4
| |\ \ \
| | * | | Add side padding to content-list if inside panelfix-group-members-uiDmitriy Zaporozhets2016-03-171-0/+4
| | | |/ | | |/|
| * | | Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master' Jacob Schatz2016-03-171-0/+7
| |\ \ \
| | * | | fix bug causing dropdown to get cut off in project pagefix_dropdown_getting_cut_off_in_pageArinde Eniola2016-03-161-0/+7
| * | | | Merge branch 'download-dropdown-alignment' into 'master' Jacob Schatz2016-03-171-0/+6
| |\ \ \ \
| | * | | | Fixed alignment of download dropdowndownload-dropdown-alignmentPhil Hughes2016-03-161-0/+6
| * | | | | Merge branch 'filter-spacing' into 'master' Jacob Schatz2016-03-171-14/+3
| |\ \ \ \ \
| | * | | | | Fixed filter spacingfilter-spacingPhil Hughes2016-03-171-14/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'edited-text' into 'master' Robert Speicher2016-03-172-0/+9
| |\ \ \ \ \
| | * | | | | Edited timeago text on commentsPhil Hughes2016-03-102-0/+9
| * | | | | | Merge branch 'blue-links-fix' into 'master' Jacob Schatz2016-03-171-4/+0
| |\ \ \ \ \ \
| | * | | | | | Revert link color from blueblue-links-fixAlfredo Sumaran2016-03-171-4/+0
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'hide-builds-feature' into 'master' Robert Speicher2016-03-171-0/+13
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Hide builds from Project's settings when the feature is disabledhide-builds-featureKamil Trzcinski2016-03-151-0/+13
| * | | | | | Merge branch 'new-branch-button-issue' into 'master' Douwe Maan2016-03-171-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into new-branch-button-issueZeger-Jan van de Weg2016-03-1753-384/+381
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Incorporate reviewZeger-Jan van de Weg2016-03-151-6/+1
| | * | | | | | new-branch-buttonZeger-Jan van de Weg2016-03-151-0/+5
| * | | | | | | Merge branch 'fix_horizontal_overflow_in_code_tag' into 'master' Jacob Schatz2016-03-171-0/+7
| |\ \ \ \ \ \ \