summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'notification-dropdown-active-fix' into 'master' Jacob Schatz2016-06-212-4/+4
|\
| * Fixed issue with notification dropdownn not updating activePhil Hughes2016-06-212-4/+4
* | Merge branch '18743-sidebar-pin-tooltip' into 'master' Jacob Schatz2016-06-211-11/+27
|\ \
| * | Fix tooltip title and persist state18743-sidebar-pin-tooltipAlfredo Sumaran2016-06-211-13/+27
| * | Add tooltip on pin/unpin navAnnabel Dunstone2016-06-211-0/+2
| |/
* | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-213-0/+31
|\ \ | |/ |/|
| * Incorporate reviewZ.J. van de Weg2016-06-202-4/+4
| * Add GitLab CI Yml dropdown selectorAlfredo Sumaran2016-06-203-0/+31
* | Merge branch 'lbennett/gitlab-ce-18113-edit-note-shortcut-conflicting' into '...Jacob Schatz2016-06-201-1/+4
|\ \ | |/ |/|
| * restricted note edit shortcut to only up keylbennett/gitlab-ce-18113-edit-note-shortcut-conflictingLuke "Jared" Bennett2016-06-171-1/+4
* | Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz2016-06-202-5/+44
|\ \
| * | Fixed issue with returning ref in commits JSONasync-refs-dropdownPhil Hughes2016-06-201-1/+1
| * | Correctly adds commit ID into dropdownPhil Hughes2016-06-181-0/+2
| * | Escapes branch names before appending to domPhil Hughes2016-06-181-1/+1
| * | Refs dropdown is now loaded asyncPhil Hughes2016-06-182-5/+42
* | | Merge branch 'markdowner' into 'master' Jacob Schatz2016-06-202-0/+82
|\ \ \
| * | | Made markdown buttons work on all markdown textareasPhil Hughes2016-06-172-12/+27
| * | | Improved designPhil Hughes2016-06-171-105/+43
| * | | Move buttons to upper right.Jacob Schatz2016-06-171-1/+1
| * | | Proper class jquery selector for `off`.Jacob Schatz2016-06-171-1/+1
| * | | No need to add bold for the class selector for removing eventsJacob Schatz2016-06-171-1/+1
| * | | Remove console.logJacob Schatz2016-06-171-4/+5
| * | | Add undo history once they click the enter or backspace keyJacob Schatz2016-06-171-1/+12
| * | | Add redo stateJacob Schatz2016-06-171-0/+3
| * | | Overwrite undo historyJacob Schatz2016-06-171-4/+44
| * | | Initial markdown ez buttonsJacob Schatz2016-06-171-0/+74
| | |/ | |/|
* | | Set path for pinned nav cookiepinned-nav-cookie-pathPhil Hughes2016-06-201-3/+3
| |/ |/|
* | Merge branch '18714_bulk_assign_labels_icon' into 'master' Jacob Schatz2016-06-182-0/+28
|\ \
| * | Fixes icon state when selecting issues that have the same labels assignedAlfredo Sumaran2016-06-162-0/+28
* | | Merge branch '18707-label-tooltips-dont-dissapear-firefox' into 'master' Jacob Schatz2016-06-181-0/+5
|\ \ \
| * | | Hide tooltip manually18707-label-tooltips-dont-dissapear-firefoxAlfredo Sumaran2016-06-161-0/+5
* | | | Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-175-17/+85
|\ \ \ \
| * \ \ \ Merge master into issue_12758issue_12758Felipe Artur2016-06-1727-128/+382
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Allow users to set custom notifications in projects they don't own and severa...Felipe Artur2016-06-171-4/+4
| * | | | Fixed bug with clicking custom again not opening modalPhil Hughes2016-06-171-0/+3
| * | | | Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-175-27/+34
| |\ \ \ \
| | * | | | Re-use notifications dropdown on user profileFelipe Artur2016-06-165-27/+35
| | * | | | Remove schema from branch historyFelipe Artur2016-06-133-15/+70
| * | | | | Implement custom notification level optionsFelipe Artur2016-06-153-15/+70
* | | | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-181-7/+11
|\ \ \ \ \ \
| * | | | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-1/+1
| * | | | | | Improved manual todosPhil Hughes2016-06-171-6/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'contrib-calendar-colors' into 'master' Jacob Schatz2016-06-171-11/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed issue with user calendar colorscontrib-calendar-colorsPhil Hughes2016-06-131-11/+6
* | | | | | Merge branch 'add_autocomplete_for_labels' into 'master' Robert Speicher2016-06-171-0/+24
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Updated CHANGELOG and template.add_autocomplete_for_labelsFatih Acet2016-06-141-2/+1
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplet...Fatih Acet2016-06-1452-506/+1672
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | add gfm autocomplete for labelsArinde Eniola2016-05-031-0/+25
* | | | | | Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' int...Jacob Schatz2016-06-161-1/+1
|\ \ \ \ \ \
| * | | | | | Avoid a TypeError when initializing MergeRequest JS class with no arg13525-sane-defaults-for-merge-request-js-class-constructorRémy Coutable2016-06-151-1/+1