Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'improve-user-tabs' into 'master' | Jacob Schatz | 2016-03-03 | 4 | -5/+157 |
|\ | | | | | | | | | | | | | Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961 | ||||
| * | Re-use previous lineimprove-user-tabs | Alfredo Sumaran | 2016-03-02 | 1 | -5/+4 |
| | | |||||
| * | Remove unnecesary assignment | Alfredo Sumaran | 2016-03-02 | 1 | -1/+0 |
| | | |||||
| * | Set actions dinamically and offer defaultAction as a optional parameter | Alfredo Sumaran | 2016-03-02 | 1 | -11/+11 |
| | | |||||
| * | Provide defaults and make sure we everything is container into a parent element | Alfredo Sumaran | 2016-03-02 | 2 | -12/+21 |
| | | |||||
| * | Turn off existing event listeners | Alfredo Sumaran | 2016-03-02 | 1 | -0/+4 |
| | | |||||
| * | Remove trailing slashes | Alfredo Sumaran | 2016-03-02 | 1 | -1/+3 |
| | | |||||
| * | Group similar conditionals | Alfredo Sumaran | 2016-03-02 | 1 | -7/+1 |
| | | |||||
| * | Merge branch 'master' into improve-user-tabs | Alfredo Sumaran | 2016-03-01 | 3 | -3/+2 |
| |\ | |||||
| * | | Add inline documentation | Alfredo Sumaran | 2016-03-01 | 1 | -0/+51 |
| | | | |||||
| * | | Rename attribute from url to href for consistency | Alfredo Sumaran | 2016-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Remove unneded method call | Alfredo Sumaran | 2016-03-01 | 1 | -1/+0 |
| | | | | | | | | | | | | @activateTab will call @setTab via .tab('show') this will trigger the method binded to this event which is @tabShown | ||||
| * | | Make url and actions to be the same name | Alfredo Sumaran | 2016-03-01 | 1 | -2/+2 |
| | | | |||||
| * | | Activate tab according URL | Alfredo Sumaran | 2016-03-01 | 1 | -10/+16 |
| | | | |||||
| * | | Pass options to UserTabs | Alfredo Sumaran | 2016-03-01 | 1 | -2/+2 |
| | | | |||||
| * | | Initialize User class on the view | Alfredo Sumaran | 2016-03-01 | 1 | -2/+0 |
| | | | |||||
| * | | Handle default tab | Alfredo Sumaran | 2016-02-29 | 1 | -15/+43 |
| | | | |||||
| * | | Activities will load when the according tab is opened | Alfredo Sumaran | 2016-02-29 | 1 | -1/+0 |
| | | | |||||
| * | | Select just the first matched element | Alfredo Sumaran | 2016-02-29 | 1 | -1/+2 |
| | | | | | | | | | | | | This a generic selector. It was also affecting spinner icon of the tabs | ||||
| * | | Handle user tabs | Alfredo Sumaran | 2016-02-29 | 1 | -0/+5 |
| | | | |||||
| * | | Create user_tabs.js.coffee | Alfredo Sumaran | 2016-02-29 | 1 | -0/+58 |
| | | | |||||
| * | | Delete unnecesary script | Alfredo Sumaran | 2016-02-29 | 1 | -1/+0 |
| | | | |||||
| * | | Add routes and actions for dynamic tab loading | Josh Frye | 2016-02-29 | 1 | -0/+1 |
| | | | |||||
* | | | Contextually teach the user about the quick submit hotkey | Robert Speicher | 2016-03-02 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | When a user tabs to the submit button (i.e., the "wrong" way), we display a tooltip with the quick submit hotkey so they can learn the "right" way. | ||||
* | | | Change `js-quick-submit` behavior to expect the class on the form | Robert Speicher | 2016-03-02 | 1 | -9/+16 |
| | | | | | | | | | | | | | | | Now it will work on any field inside that form, and it's easier to scope new behavior, which is what we're adding next! | ||||
* | | | Profile settings | Phil Hughes | 2016-03-02 | 1 | -2/+1 |
| | | | | | | | | | | | | Closes #13853 | ||||
* | | | Fix help keyboard shortcut for relative URL setups | Artem Sidorenko | 2016-03-01 | 1 | -1/+3 |
| |/ |/| | |||||
* | | Merge branch 'master' into issue_13212issue_13212 | Alfredo Sumaran | 2016-02-29 | 2 | -3/+1 |
|\ \ | |||||
| * | | Removed NGProgressremoved-ngprogress | Phil Hughes | 2016-02-29 | 2 | -3/+1 |
| |/ | | | | | | | | | | | In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820 | ||||
* | | Apply nice date when diff page loads | Alfredo Sumaran | 2016-02-29 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'master' into avatar-croppingavatar-cropping | Alfredo Sumaran | 2016-02-26 | 3 | -3/+21 |
|\ | |||||
| * | Fix syntax error in autosave coffeescript.coffeescript_syntax_error | Marin Jankovski | 2016-02-26 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' | Jacob Schatz | 2016-02-24 | 1 | -0/+6 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar overlaps content when screen is below 1200px. When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717   Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620 | ||||
| | * | Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizing | Alfredo Sumaran | 2016-02-23 | 1 | -0/+1 |
| | | | |||||
| | * | Ability to toggle sidebar on smaller screens | Alfredo Sumaran | 2016-02-23 | 1 | -7/+3 |
| | | | |||||
| | * | Update scrollbars after toggle sidebar | Alfredo Sumaran | 2016-02-23 | 1 | -0/+6 |
| | | | |||||
| | * | Sidebar overlaps content when screen is below 1200px. | Jacob Schatz | 2016-02-16 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717 | ||||
| * | | Wait until listeners are set before triggering a 'click' eventbugfix/jschatz/sidebar-issues/minimize-on-diff | Alfredo Sumaran | 2016-02-24 | 1 | -3/+7 |
| | | | |||||
| * | | Move script inside of MergeRequestTabs class | Alfredo Sumaran | 2016-02-24 | 2 | -12/+10 |
| | | | |||||
| * | | Merge branch 'master' into minimize-on-diff | Alfredo Sumaran | 2016-02-24 | 8 | -18/+64 |
| |\ \ | |||||
| * | | | Shrink on diff view | Jacob Schatz | 2016-02-17 | 1 | -0/+10 |
| | |/ | |/| | | | | | | | | | | | | | Shrinks when navigating to diff view. Shrinks when refreshing on diff view. Expandable at anytime. | ||||
* | | | Merge branch 'master' into avatar-cropping | Alfredo Sumaran | 2016-02-24 | 3 | -16/+19 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'activity-tabs-single-select' into 'master' | Jacob Schatz | 2016-02-24 | 1 | -13/+5 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treats activity tabs as single select Fixes #8092  See merge request !2940 | ||||
| | * | | changed bind to on for activity link click eventactivity-tabs-single-select | Phil Hughes | 2016-02-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Treats activity tabs as single select | Phil Hughes | 2016-02-24 | 1 | -13/+5 |
| | | | | | | | | | | | | | | | | Fixes #8092 | ||||
| * | | | Merge branch 'bugfix/jschatz1/missing-project-button' into 'master' | Rémy Coutable | 2016-02-24 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group projects styles Makes new project button visible when no projects are available. Fixes #13193 # BEFORE  # AFTER (w/projects)  # AFTER (no projects)  cc @creamzy @skyruler See merge request !2714 | ||||
| | * | | Initialize navigation shortcuts on project's files pagebugfix/jschatz1/missing-project-button | Alfredo Sumaran | 2016-02-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'issue_13301_emoji-menu' into 'master' | Robert Speicher | 2016-02-24 | 1 | -3/+13 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888 | ||||
| | * | | Create EmojisController | Annabel Dunstone | 2016-02-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add timeout for ajax call in award emoji steps; update focus in award picker | Annabel Dunstone | 2016-02-19 | 1 | -1/+2 |
| | | | |