summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_24020' into 'master' Alfredo Sumaran2016-12-091-1/+1
|\
| * fix display hook error messagebasyura2016-12-051-1/+1
* | Merge branch 'update-button-font-weight' into 'master' Fatih Acet2016-12-091-1/+1
|\ \
| * | Updates the font weight of button styles because of the change to system fontsupdate-button-font-weightDimitrie Hoekstra2016-12-091-1/+1
* | | Merge branch 'members-dropdowns' into 'master' Fatih Acet2016-12-094-11/+68
|\ \ \
| * | | Updated JS based on reviewPhil Hughes2016-12-091-14/+8
| * | | Updated members dropdownsPhil Hughes2016-12-074-11/+74
| |/ /
* | | Merge branch '25374-svg-as-prop' into 'master' Fatih Acet2016-12-097-74/+62
|\ \ \
| * | | Changes after review25374-svg-as-propFilipa Lacerda2016-12-092-4/+4
| * | | Adds testsFilipa Lacerda2016-12-092-4/+6
| * | | Uniformize props name formatFilipa Lacerda2016-12-095-25/+26
| * | | Replace commit icon svg logicFilipa Lacerda2016-12-092-20/+8
| * | | Replace play icon svg logicFilipa Lacerda2016-12-093-28/+25
* | | | Merge branch 'fix-active-nav-badges' into 'master' Fatih Acet2016-12-091-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix active nav badges not inheriting the link color.fix-active-nav-badgesPedro Moreira da Silva2016-12-061-0/+4
* | | | Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' Fatih Acet2016-12-092-0/+50
|\ \ \ \
| * | | | Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs ExistsJacopo2016-12-022-0/+50
* | | | | Merge branch 'fix-reset-template' into 'master' Fatih Acet2016-12-081-0/+2
|\ \ \ \ \
| * | | | | Do nothing if file is undefinedfix-reset-templateAlfredo Sumaran2016-12-071-0/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'system-notes-fade' into 'master' Fatih Acet2016-12-081-1/+1
|\ \ \ \ \
| * | | | | Fade out should be white instead of graysystem-notes-fadeAnnabel Dunstone Gray2016-12-071-1/+1
| |/ / / /
* | | | | Merge branch 'small-emoji-adjustments' into 'master' Fatih Acet2016-12-083-3/+4
|\ \ \ \ \
| * | | | | Various small emoji positioning adjustmentssmall-emoji-adjustmentsDimitrie Hoekstra2016-12-083-3/+4
| |/ / / /
* | | | | Merge branch 'timeago-perf-fix' into 'master' Fatih Acet2016-12-081-1/+3
|\ \ \ \ \
| * | | | | Fixed timeago re-rendering every elementtimeago-perf-fixPhil Hughes2016-12-071-1/+3
| |/ / / /
* | | | | Enable display of admonition icons in Asciidoc.Horacio Sanson2016-12-082-0/+28
|/ / / /
* | | | Merge branch 'remove-pages-css' into 'master' Jacob Schatz2016-12-064-32/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'remove-pages-css'remove-pages-cssAnnabel Dunstone Gray2016-12-0611-183/+122
| |\ \ \ \
| * | | | | Remove confirmation.scssAnnabel Dunstone Gray2016-12-061-32/+0
| * | | | | Move award emojis to framworkAnnabel Dunstone Gray2016-12-062-0/+2
| * | | | | Move image styles to frameworkAnnabel Dunstone Gray2016-12-061-0/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'remove-dashboard-css' into 'master' Jacob Schatz2016-12-062-49/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove dashboard.scssAnnabel Dunstone Gray2016-12-062-49/+0
| |/ / /
* | | | Merge branch 'remove-tags-scss' into 'master' Jacob Schatz2016-12-062-7/+10
|\ \ \ \
| * | | | Remove tags.scssremove-tags-scssAnnabel Dunstone Gray2016-12-062-7/+10
| |/ / /
* | | | Merge branch 'admin-scss' into 'master' Jacob Schatz2016-12-069-176/+112
|\ \ \ \ | |/ / / |/| | |
| * | | Remove admin.scssadmin-scssAnnabel Dunstone Gray2016-12-058-128/+90
| * | | Truncate fix, remove unneeded admin-specific cssAnnabel Dunstone Gray2016-12-054-48/+22
* | | | Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' Jacob Schatz2016-12-061-0/+5
|\ \ \ \
| * | | | Fixed MR widget content wrapping for XS viewportsRyan Harris2016-12-051-0/+5
* | | | | Merge branch 'remove-errors-scss' into 'master' Jacob Schatz2016-12-051-16/+0
|\ \ \ \ \
| * | | | | Remove unused errors cssremove-errors-scssAnnabel Dunstone Gray2016-12-051-16/+0
* | | | | | Remove unused votes.scssremove-votes-scssAnnabel Dunstone Gray2016-12-051-4/+0
|/ / / / /
* | | | | Merge branch '25221-fix-build-status-overflow-mobile' into 'master' Alfredo Sumaran2016-12-051-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed top margin for Builds page status header informationRyan Harris2016-12-031-0/+1
* | | | | Merge branch 'reduce-font-size' into 'master' Jacob Schatz2016-12-0513-19/+19
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Reduce base font sizes across appreduce-font-sizeAnnabel Dunstone Gray2016-12-0213-19/+19
* | | | | Satisfied eslintSteffen Rauh2016-12-031-1/+1
* | | | | Fix compatibility with Internet Explorer 11 for merge requestsSteffen Rauh2016-12-032-3/+15
| |/ / / |/| | |
* | | | satisfy eslint no-param-reassign rule23696-fix-diff-view-highlightingMike Greiling2016-12-022-8/+10