summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
|\
| * Fix user autocomplete uriIgor Matsko2015-12-261-1/+1
* | Merge branch 'rs-fix-shortcut-help' into 'master' Dmitriy Zaporozhets2015-12-282-4/+8
|\ \
| * | Fix the "Show all" link for the keyboard shortcut modalrs-fix-shortcut-helpRobert Speicher2015-12-272-4/+8
| |/
* | Do not show frequently used emojis when emptyValery Sizov2015-12-281-6/+7
|/
* Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-251-1/+33
|\
| * removes unused `alert` from issue spec. Requires flash in the *implementation...close-open-ajax-issueJacob Schatz2015-12-231-0/+1
| * adds test for issue close/reopen failureJacob Schatz2015-12-231-2/+3
| * resolves conflicts with new buttonsJacob Schatz2015-12-233-17/+26
| |\
| * | changes `issue-box` to `status-box` since html was changed as wellJacob Schatz2015-12-211-9/+9
| * | adds alerts for when http request errors out in some way.Jacob Schatz2015-12-211-0/+2
| * | removes console logsJacob Schatz2015-12-211-1/+0
| * | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-211-1/+2
| * | removes `console.log`sJacob Schatz2015-12-211-2/+0
| * | open and close issue via ajax request. With testsJacob Schatz2015-12-211-0/+30
* | | revert back vote buttons to issue and MR pagesValery Sizov2015-12-251-7/+8
* | | Merge branch 'emoji_picker_frequently_used' into 'master' Valery Sizov2015-12-241-1/+27
|\ \ \
| * | | added default for frequently used emojisValery Sizov2015-12-241-7/+9
| * | | fix of frequently used emojisValery Sizov2015-12-241-3/+3
| * | | Merge branch 'emoji-picker-search' into emoji_picker_frequently_usedValery Sizov2015-12-245-8/+86
| |\ \ \
| * \ \ \ Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_usedValery Sizov2015-12-245-15/+41
| |\ \ \ \
| * | | | | add frequently used category to emoji pickerValery Sizov2015-12-221-0/+26
| * | | | | TYPO in the commentValery Sizov2015-12-221-1/+1
| * | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-222-16/+25
* | | | | | Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-242-2/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Moves star code to a classJacob Schatz2015-12-231-0/+22
| * | | | | fixes failing test by updating project clone instructionsJacob Schatz2015-12-231-2/+3
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-searchValery Sizov2015-12-245-8/+86
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-242-2/+2
| |\ \ \ \
| | * | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-182-2/+2
| | | |_|/ | | |/| |
| * | | | Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-241-0/+78
| |\ \ \ \
| | * | | | Fix minor stylistic complaintsDouglas Barbosa Alexandre2015-12-211-4/+3
| | * | | | Merge branch 'master' into branch-invalid-nameDouglas Barbosa Alexandre2015-12-181-1/+1
| | |\ \ \ \ | | | |/ / /
| | * | | | Add restriction for single characters in branch nameDouglas Barbosa Alexandre2015-12-171-2/+8
| | * | | | Remove extra spaces in the error messagesDouglas Barbosa Alexandre2015-12-171-3/+3
| | * | | | Add JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-171-0/+73
| * | | | | Merge branch 'issue_4189' into 'master' Douwe Maan2015-12-241-1/+1
| |\ \ \ \ \
| | * | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189Rubén Dávila2015-12-211-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'emoji-picker-fix' into 'master' Valery Sizov2015-12-241-5/+11
| |\ \ \ \ \
| * | | | | | fixes the search for projectsfilter-project-list-fixJacob Schatz2015-12-231-5/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchValery Sizov2015-12-241-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets2015-12-231-1/+1
| |\ \ \ \ \
| | * | | | | Fix paths for jquery-ui assetsrs-update-jqueryRobert Speicher2015-12-221-1/+1
| | | |/ / / | | |/| | |
* | | | | | fixes after reviewValery Sizov2015-12-241-2/+2
* | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-searchValery Sizov2015-12-241-5/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Emoji picker: better alias handlingValery Sizov2015-12-241-5/+11
| |/ / / /
* | | | | emoji picker searchValery Sizov2015-12-231-0/+22
|/ / / /
* | | | TYPO in the commentValery Sizov2015-12-221-1/+1
* | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-222-16/+25
|/ / /
* | | Revert sidebar position for issue and merge requestDmitriy Zaporozhets2015-12-171-1/+1
|/ /