summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into issue_13212issue_13212Alfredo Sumaran2016-02-292-3/+1
|\
| * Removed NGProgressremoved-ngprogressPhil Hughes2016-02-292-3/+1
* | Apply nice date when diff page loadsAlfredo Sumaran2016-02-291-0/+1
|/
* Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-263-3/+21
|\
| * Fix syntax error in autosave coffeescript.coffeescript_syntax_errorMarin Jankovski2016-02-261-3/+3
| * Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz2016-02-241-0/+6
| |\
| | * Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizingAlfredo Sumaran2016-02-231-0/+1
| | * Ability to toggle sidebar on smaller screensAlfredo Sumaran2016-02-231-7/+3
| | * Update scrollbars after toggle sidebarAlfredo Sumaran2016-02-231-0/+6
| | * Sidebar overlaps content when screen is below 1200px.Jacob Schatz2016-02-161-1/+5
| * | Wait until listeners are set before triggering a 'click' eventbugfix/jschatz/sidebar-issues/minimize-on-diffAlfredo Sumaran2016-02-241-3/+7
| * | Move script inside of MergeRequestTabs classAlfredo Sumaran2016-02-242-12/+10
| * | Merge branch 'master' into minimize-on-diffAlfredo Sumaran2016-02-248-18/+64
| |\ \
| * | | Shrink on diff viewJacob Schatz2016-02-171-0/+10
| | |/ | |/|
* | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-243-16/+19
|\ \ \ | | |/ | |/|
| * | Merge branch 'activity-tabs-single-select' into 'master' Jacob Schatz2016-02-241-13/+5
| |\ \
| | * | changed bind to on for activity link click eventactivity-tabs-single-selectPhil Hughes2016-02-241-1/+1
| | * | Treats activity tabs as single selectPhil Hughes2016-02-241-13/+5
| * | | Merge branch 'bugfix/jschatz1/missing-project-button' into 'master' Rémy Coutable2016-02-241-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Initialize navigation shortcuts on project's files pagebugfix/jschatz1/missing-project-buttonAlfredo Sumaran2016-02-231-0/+1
| * | | Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-241-3/+13
| |\ \ \ | | |/ / | |/| |
| | * | Create EmojisControllerAnnabel Dunstone2016-02-221-1/+1
| | * | Add timeout for ajax call in award emoji steps; update focus in award pickerAnnabel Dunstone2016-02-191-1/+2
| | * | Load award emoji picker with ajax requestAnnabel Dunstone2016-02-181-2/+11
| | |/
* | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-236-2/+45
|\ \ \ | |/ /
| * | Add "e" shortcut to edit issuableissue_13510Alfredo Sumaran2016-02-231-0/+8
| * | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-02-231-1/+2
| |\ \
| | * | Set of small improvements to wiki frontendDmitriy Zaporozhets2016-02-071-1/+2
| * | | Merge branch 'files-view-row-click' into 'master' Jacob Schatz2016-02-231-0/+2
| |\ \ \
| | * | | Correctly checks if tree view is on screenPhil Hughes2016-02-231-1/+1
| | * | | Fixes issue with file view rows not clickable on project main viewfiles-view-row-clickPhil Hughes2016-02-231-0/+2
| * | | | Issues can be dragged & dropped into empty milestone listsPhil Hughes2016-02-231-9/+21
| |/ / /
| * | | Merge branch 'blame-line-link' into 'master' Jacob Schatz2016-02-221-1/+1
| |\ \ \
| | * | | Added line links to blame tableblame-line-linkPhil Hughes2016-02-221-1/+1
| * | | | Merge branch 'issue_13463' into 'master' Jacob Schatz2016-02-221-0/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update button selectorissue_13463Alfredo Sumaran2016-02-191-1/+1
| | * | | Change method name for consistencyAlfredo Sumaran2016-02-191-2/+2
| | * | | Make diff view name getter less error proneAlfredo Sumaran2016-02-191-4/+2
| | * | | Add commentAlfredo Sumaran2016-02-191-0/+2
| | * | | Expand view container if diff mode is set to paralellsAlfredo Sumaran2016-02-181-0/+8
| | | |/ | | |/|
| * | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-191-0/+10
| |\ \ \
| | * | | Show buttons based on current tab.Rubén Dávila2016-02-021-0/+10
| * | | | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-181-0/+2
| | |/ / | |/| |
* | | | Improve avatar cropping internals, based on suggestions made by @rspeicher on...Johann Pardanaud2016-02-171-1/+1
* | | | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-167-35/+51
|\ \ \ \ | |/ / /
| * | | Fix duplicate "me" in tooltip of the "thumbsup" awards EmojiStan Hu2016-02-131-1/+2
| * | | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-103-20/+25
| |\ \ \
| | * | | Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-091-4/+4
| | * | | More specific selectorsJosh Frye2016-02-091-4/+4
| | * | | MR feedbackJosh Frye2016-02-091-5/+2
View Lorry Controller Status