summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1812-432/+720
|\
| * Provide better error message to the usermerge-conflicts-editor-2Alfredo Sumaran2016-10-171-1/+1
| * Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-173-108/+162
| |\
| * \ Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1715-84/+563
| |\ \
| * | | Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
| * | | Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
| * | | Remove unused filesAlfredo Sumaran2016-10-132-550/+0
| * | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-132-2/+4
| * | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-10/+93
| * | | Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
| * | | Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-132-1/+14
| * | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-132-133/+150
| * | | Refactor JS codeAlfredo Sumaran2016-10-135-4/+537
| * | | check if files is set before countingAlfredo Sumaran2016-10-131-0/+4
| * | | Replace textarea with Ace editorAlfredo Sumaran2016-10-131-7/+20
| * | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-133-54/+234
* | | | Update endpoint to username validatorAlfredo Sumaran2016-10-171-1/+1
* | | | Merge branch '23358-expand-hide-pipeline-btn-text-doesn-t-match' into 'master' Fatih Acet2016-10-171-1/+1
|\ \ \ \
| * | | | Swapped button text manipulation outcomes for the toggle queryLuke Bennett2016-10-171-1/+1
| | |_|/ | |/| |
* | | | Fixed find file keyboard navigationfind-file-enter-fixPhil Hughes2016-10-171-0/+9
|/ / /
* | | Convert due_date_select.js filetype to es6.safari-is-baNaNasBryce Johnson2016-10-173-108/+162
* | | Stop directly parsing due_date with Date.parse, prefer parsing implicitly.Bryce Johnson2016-10-171-2/+2
| |/ |/|
* | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-161-1/+12
* | Back off the array spreading, bc poltergeist freaks out.Bryce Johnson2016-10-151-4/+3
* | Convert dispatcher to es6.Bryce Johnson2016-10-151-0/+0
* | Fixup invalid refs.Bryce Johnson2016-10-152-2/+2
* | Convert field error NodeList to an Array.Bryce Johnson2016-10-151-2/+2
* | Use native dom in dispatcher field error init.Bryce Johnson2016-10-151-3/+4
* | Improve method naming in gl_field_errors.Bryce Johnson2016-10-151-21/+22
* | Add accessor for current val for convenience.Bryce Johnson2016-10-151-5/+9
* | Safely scope siblings of validated input.Bryce Johnson2016-10-151-2/+15
* | Remove superfluous comment.Bryce Johnson2016-10-151-1/+0
* | Prevent unneccessary loading of UsernameValidator.Bryce Johnson2016-10-151-1/+0
* | Properly implement focus on first invalid.Bryce Johnson2016-10-151-11/+6
* | Fix errors, get validation running for signup box and sign in.Bryce Johnson2016-10-152-27/+37
* | Refactor gl field errors for simpler state management.Bryce Johnson2016-10-151-45/+89
* | Clean up username_validator private vars and members.Bryce Johnson2016-10-151-44/+47
* | Make UX upgrades to SignIn/Register views.Bryce Johnson2016-10-153-0/+242
* | Merge branch '18844-missing-subnavs-on-some-pages' into 'master' Fatih Acet2016-10-141-7/+29
|\ \
| * | Added subnav to labels edit+new and milestones edit+new+show18844-missing-subnavs-on-some-pagesLuke Bennett2016-10-071-7/+29
* | | Merge branch 'mr-tabs-affix' into 'master' Fatih Acet2016-10-141-0/+41
|\ \ \
| * | | Fixed testsPhil Hughes2016-10-061-6/+9
| * | | Merge request tabs stick when scrolling pagePhil Hughes2016-10-061-0/+38
* | | | Rename pipeline.js.es6 to pipelines.js.es6rename-pipeline-to-pipelinesLuke "Jared" Bennett2016-10-141-0/+0
* | | | Merge branch 'gl-dropdown-render-perf' into 'master' Jacob Schatz2016-10-141-44/+44
|\ \ \ \
| * | | | Fixed undefined keycode build errorgl-dropdown-render-perfPhil Hughes2016-10-141-3/+0
| * | | | Fixed keycode undefinedPhil Hughes2016-10-131-5/+1
| * | | | Changed trigger keyup to inputPhil Hughes2016-10-131-5/+3
| * | | | Fixed appending jQuery elementsPhil Hughes2016-10-131-0/+4
| * | | | Fixed rendering of HTML stringsPhil Hughes2016-10-131-1/+7
View Lorry Controller Status