summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't use global variables.ace-venturaConnor Shea2016-08-183-7/+7
* Only load Ace on Snippets and file edit pages.Connor Shea2016-08-189-17/+40
* Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a...Jacob Schatz2016-08-184-4/+5
|\
| * Fix Ace syntax highlighting with compiled assets3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webuiSean McGivern2016-08-174-4/+5
* | Merge branch '13664-abuse-report-page-should-have-a-maximum-width' into 'mast...Jacob Schatz2016-08-188-24/+172
|\ \
| * | Moved truncation method chain to utility method13664-abuse-report-page-should-have-a-maximum-widthLuke Bennett2016-08-182-2/+5
| * | Review changesLuke Bennett2016-08-142-5/+8
| * | Some more styling tweaks and added jasmine testLuke Bennett2016-08-145-8/+74
| * | Reverted collapsible design for HazelsLuke Bennett2016-08-146-227/+95
| * | Added new but unaccepted design pattern, it is only pushed for future referen...Luke "Jared" Bennett2016-08-143-47/+25
| * | Updated collapsibleLuke "Jared" Bennett2016-08-143-53/+37
| * | Review changesLuke "Jared" Bennett2016-08-142-18/+25
| * | Final table styling changesLuke "Jared" Bennett2016-08-141-4/+7
| * | Started on abuse reports message truncationLuke "Jared" Bennett2016-08-144-1/+209
| * | Altered abuse report UILuke "Jared" Bennett2016-08-142-41/+69
* | | Merge branch '18334-truncate-award-emoji-users' into 'master' Jacob Schatz2016-08-186-28/+116
|\ \ \
| * | | Replace resetTooltip with bootstrap's fixTitleJack Davison2016-08-171-14/+6
| * | | Fix duplicate "me" in award emoji tooltipJack Davison2016-08-172-1/+7
| * | | Award tooltips refer to current user as "You"Jack Davison2016-08-175-25/+25
| * | | Switch to using to_sentence to construct tooltipsJack Davison2016-08-174-14/+44
| * | | Truncates 9-10 users with current user in frontJack Davison2016-08-172-5/+19
| * | | Truncated user list in award emoji tooltipsJack Davison2016-08-175-3/+49
| | |/ | |/|
* | | Merge branch 'zj-api-endpoints-ci' into 'master' Robert Speicher2016-08-1810-0/+424
|\ \ \
| * | | Do not expose projects on deploymentsZ.J. van de Weg2016-08-182-170/+3
| * | | Incorporate feedbackZ.J. van de Weg2016-08-183-10/+9
| * | | Docs for API endpointsZ.J. van de Weg2016-08-183-0/+431
| * | | Expose project for environmentsZ.J. van de Weg2016-08-182-0/+2
| * | | Add deployment endpointsZ.J. van de Weg2016-08-185-1/+114
| * | | Add Play endpoints on BuildsZ.J. van de Weg2016-08-183-0/+46
|/ / /
* | | Merge branch 'boards-spec-improvements' into 'master' Douwe Maan2016-08-182-4/+30
|\ \ \
| * | | Attempted improvement to stop boards spec failingboards-spec-improvementsPhil Hughes2016-08-182-4/+30
* | | | Merge branch '17334-u2f-device-identifiers' into 'master' Robert Speicher2016-08-1812-24/+128
|\ \ \ \
| * | | | Address review comments from @smcgivern.17334-u2f-device-identifiersTimothy Andrew2016-08-182-10/+10
| * | | | Update CHANGELOG.Timothy Andrew2016-08-181-0/+1
| * | | | Add feature specs to cover naming and deleting U2F devices.Timothy Andrew2016-08-182-9/+32
| * | | | Allow naming U2F devices.Timothy Andrew2016-08-189-13/+93
* | | | | Merge branch '20454-edit-button-mr' into 'master' Douwe Maan2016-08-184-12/+31
|\ \ \ \ \
| * | | | | edit_blob_link can receive the blob to avoid access to the repository20454-edit-button-mrPaco Guzman2016-08-184-12/+31
* | | | | | Merge branch 'zj-pipelines-api-endpoints' into 'master' Douwe Maan2016-08-188-18/+425
|\ \ \ \ \ \
| * | | | | | Add docs on API for pipelines, plus minor fixeszj-pipelines-api-endpointsZ.J. van de Weg2016-08-184-4/+221
| * | | | | | Add endpoints for pipelinesZ.J. van de Weg2016-08-186-18/+208
| |/ / / / /
* | | | | | Merge branch 'add-merge-conflict-changelog-item' into 'master' Douwe Maan2016-08-181-0/+1
|\ \ \ \ \ \
| * | | | | | Add merge conflict resolution to CHANGELOGadd-merge-conflict-changelog-itemSean McGivern2016-08-181-0/+1
* | | | | | | Merge branch 'outlook-email-spacing' into 'master' Douwe Maan2016-08-184-3/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix email line-height in Outlookoutlook-email-spacingSean McGivern2016-08-174-3/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix-issue-filter-spec' into 'master' Rubén Dávila Santos2016-08-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix broken feature spec.fix-issue-filter-specRuben Davila2016-08-171-1/+1
* | | | | | | | Merge branch 'evn-reword-cla' into 'master' Sid Sijbrandij2016-08-181-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | remove undefined word Corporation from CCLAevn-reword-claernstvn2016-08-161-2/+2
* | | | | | | | | Merge branch 'fix/simplify-todo-destroy-queries' into 'master' Yorick Peterse2016-08-184-16/+27
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status