Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 11 | -43/+43 |
|\ | |||||
| * | Merge branch 'login-flash' into 'master' | Dmitriy Zaporozhets | 2016-03-01 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bottom margin for flash container on login page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler Fixes #13935 See merge request !3040 | ||||
| | * | Add bottom margin for flash container on login page | Dmitriy Zaporozhets | 2016-03-01 | 1 | -0/+4 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Fix issue with overlap of sidebar links. | Jacob Schatz | 2016-03-01 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'issue_13851' into 'master' | Rémy Coutable | 2016-03-01 | 1 | -1/+14 |
| |\ | | | | | | | | | | | | | | | | | | | Brings back missing "Gitlab" text on the logo Closes #13851 See merge request !2989 | ||||
| | * | Bring back Gitlab textissue_13851 | Alfredo Sumaran | 2016-02-29 | 1 | -1/+14 |
| | | | |||||
| * | | Merge branch 'master' into issue_13212issue_13212 | Alfredo Sumaran | 2016-02-29 | 8 | -42/+22 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'removed-ngprogress' into 'master' | Jacob Schatz | 2016-02-29 | 6 | -10/+8 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed NGProgress In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820  See merge request !3004 | ||||
| | | * | Removed NGProgressremoved-ngprogress | Phil Hughes | 2016-02-29 | 6 | -10/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820 | ||||
| | * | | Merge branch 'improve-todos-css' into 'master' | Dmitriy Zaporozhets | 2016-02-29 | 1 | -32/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small css cleanup for todos feature Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Cleanup for !2817 Fixes #13816 cc @jschatz1 @skyruler @dbalexandre See merge request !2996 | ||||
| | | * | | Small css cleanup for todos featureimprove-todos-css | Dmitriy Zaporozhets | 2016-02-27 | 1 | -32/+3 |
| | | |/ | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Comment icon vertically aligned | Alfredo Sumaran | 2016-02-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Wrap icon with edited time | Alfredo Sumaran | 2016-02-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Increase padding | Alfredo Sumaran | 2016-02-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Keep edited time on the same line as well | Alfredo Sumaran | 2016-02-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Apply nice date when diff page loads | Alfredo Sumaran | 2016-02-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Keep date in the same line | Alfredo Sumaran | 2016-02-29 | 1 | -0/+4 |
| | | | | |||||
| * | | | Prevent content misalignment | Alfredo Sumaran | 2016-02-29 | 1 | -0/+8 |
| | |/ | |/| | |||||
* | | | 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 |
| |/ |/| | |||||
* | | Merge branch '11489-branded-appearance-to-ce' into 'master' | Douwe Maan | 2016-02-29 | 1 | -0/+11 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Branded appearance to CE Closes #11489 The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too. TODO: - [x] Copy docs - [x] Make new screenshots - [ ] Remove Custom Welcome message feature? @rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink: /cc @DouweM See merge request !2927 | ||||
| * | Branded login page also in CE11489-branded-appearance-to-ce | Zeger-Jan van de Weg | 2016-02-26 | 1 | -0/+11 |
| | | | | | | | | | | The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it | ||||
* | | Merge branch 'avatar-cropping' into 'master' | Jacob Schatz | 2016-02-26 | 5 | -5/+88 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar stretching by providing a cropping feature Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773 Fixes #7959 See merge request !2951 | ||||
| * \ | Merge branch 'master' into avatar-croppingavatar-cropping | Alfredo Sumaran | 2016-02-26 | 5 | -69/+45 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into avatar-cropping | Alfredo Sumaran | 2016-02-24 | 12 | -32/+44 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into avatar-cropping | Alfredo Sumaran | 2016-02-23 | 27 | -1384/+2145 |
| |\ \ \ \ | |||||
| * | | | | | Improve avatar cropping internals, based on suggestions made by @rspeicher ↵ | Johann Pardanaud | 2016-02-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | on !2773 | ||||
| * | | | | | Merge branch 'master' into avatar-cropping | Johann Pardanaud | 2016-02-16 | 9 | -35/+86 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/user.rb | ||||
| * | | | | | | Improve user experience for avatar cropping | Johann Pardanaud | 2016-02-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid incomprehensible errors on non-integer cropping values - Set the default cropping area to 80% | ||||
| * | | | | | | Fix #7959: Fix avatar stretching by providing a cropping feature | Johann Pardanaud | 2016-02-09 | 5 | -7/+91 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'sidebar-hide-class' into 'master' | Rémy Coutable | 2016-02-26 | 1 | -8/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created helper class to hide content in issue sidebar when collapsed  Closes #13764 See merge request !2968 |