summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-073-14/+11
|\
| * Updates from last code review.issue_13621_2Rubén Dávila2016-03-063-13/+10
| * Use the same partial when rendering Issues or Merge Requests.Rubén Dávila2016-03-041-3/+3
| * Make Merge Requests tab have the same look as Issues.Rubén Dávila2016-03-041-4/+4
* | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-057-23/+73
|\ \ | |/ |/|
| * Uses the correct variable names for this situation.issue-sidebar-mobileJacob Schatz2016-03-041-2/+2
| * Only save right sidebar position cookie if user did the collapsing.Jacob Schatz2016-03-042-6/+7
| * Fixes style consistencies.Jacob Schatz2016-03-041-3/+2
| * Fix remaining media queries using correct bs paradigms.Jacob Schatz2016-03-042-14/+13
| * Correct media queries for small devices and tablets.Jacob Schatz2016-03-042-7/+11
| * Sidebar overflow on xs side.Jacob Schatz2016-03-042-7/+7
| * Fix bugs with open and close buttonsJacob Schatz2016-03-042-21/+24
| * Small outside aside shrink sidebar button for mobile only.Jacob Schatz2016-03-041-0/+13
| * Open sidebar button on mobile.Jacob Schatz2016-03-042-5/+21
| * Move static icon and change appearance.Jacob Schatz2016-03-043-2/+18
| * Change icons for open close on issue/MRJacob Schatz2016-03-042-5/+4
* | Merge branch 'ctr-enter-textarea-mac' into 'master' Jacob Schatz2016-03-041-4/+1
|\ \
| * | ctrl+enter on mac correctly submits formsctr-enter-textarea-macPhil Hughes2016-03-041-4/+1
| |/
* | Dropdown caret color in variabledropdown-design-updatePhil Hughes2016-03-042-1/+2
* | Updated CSS so .open doesnt have to be on a dropdown elementPhil Hughes2016-03-042-8/+7
* | Updated dropdown CSSPhil Hughes2016-03-046-43/+112
|/
* Merge branch 'issue_13300' into 'master' Jacob Schatz2016-03-041-2/+25
|\
| * Use camelCase for variable namesissue_13300Alfredo Sumaran2016-03-031-9/+9
| * Set @max_polling_steps to 4 so the last interval will be 120 secondsAlfredo Sumaran2016-03-031-1/+1
| * Provide @max_polling_steps instead of @limit_polling_intervalAlfredo Sumaran2016-03-031-2/+3
| * Prevent multiple refreshes if a refresh is happeningAlfredo Sumaran2016-03-031-0/+4
| * Increase the notes polling timeout over timeRoberto Dip2016-03-031-2/+20
* | Move SSH key JS to Profile CS classRobert Speicher2016-03-031-0/+9
* | SSH key ellipsis on mobilePhil Hughes2016-03-031-0/+14
* | Changed link colourPhil Hughes2016-03-031-1/+1
* | Content link colour in profile settingsPhil Hughes2016-03-032-2/+11
* | Fixed heading boldPhil Hughes2016-03-032-0/+15
* | SSH keys settingsPhil Hughes2016-03-032-0/+11
|/
* Merge branch 'password-settings' into 'master' Jacob Schatz2016-03-031-6/+5
|\
| * Password settings pagePhil Hughes2016-03-021-6/+5
* | Merge branch 'comment-button-status-refresh' into 'master' Jacob Schatz2016-03-031-3/+3
|\ \
| * | Correcly updates the status of the comment buttons on reloadPhil Hughes2016-03-031-3/+3
* | | Merge branch 'email-settings' into 'master' Jacob Schatz2016-03-032-0/+15
|\ \ \ | |/ / |/| |
| * | Removed page specific variablesemail-settingsPhil Hughes2016-03-032-6/+5
| * | Moved colour values into scss variablesPhil Hughes2016-03-032-3/+7
| * | Emails settingsPhil Hughes2016-03-031-0/+12
* | | Improve UI for explore projects pageDmitriy Zaporozhets2016-03-031-0/+4
* | | Merge branch 'refactor-projects-list' into 'master' Dmitriy Zaporozhets2016-03-034-58/+27
|\ \ \
| * | | Refactor projects listDmitriy Zaporozhets2016-03-034-58/+27
| |/ /
* | | Use normal font weight for todos countertodos-counterDmitriy Zaporozhets2016-03-031-0/+1
|/ /
* | Merge branch 'improve-user-tabs' into 'master' Jacob Schatz2016-03-034-5/+157
|\ \
| * | Re-use previous lineimprove-user-tabsAlfredo Sumaran2016-03-021-5/+4
| * | Remove unnecesary assignmentAlfredo Sumaran2016-03-021-1/+0
| * | Set actions dinamically and offer defaultAction as a optional parameterAlfredo Sumaran2016-03-021-11/+11
| * | Provide defaults and make sure we everything is container into a parent elementAlfredo Sumaran2016-03-022-12/+21
View Lorry Controller Status