summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Re-use previous lineimprove-user-tabsAlfredo Sumaran2016-03-021-5/+4
|
* Remove unnecesary assignmentAlfredo Sumaran2016-03-021-1/+0
|
* Set actions dinamically and offer defaultAction as a optional parameterAlfredo Sumaran2016-03-021-11/+11
|
* Provide defaults and make sure we everything is container into a parent elementAlfredo Sumaran2016-03-022-12/+21
|
* Turn off existing event listenersAlfredo Sumaran2016-03-021-0/+4
|
* Remove trailing slashesAlfredo Sumaran2016-03-021-1/+3
|
* Group similar conditionalsAlfredo Sumaran2016-03-021-7/+1
|
* Merge branch 'master' into improve-user-tabsAlfredo Sumaran2016-03-0111-43/+43
|\
| * Merge branch 'login-flash' into 'master' Dmitriy Zaporozhets2016-03-011-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 pageDmitriy Zaporozhets2016-03-011-0/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix issue with overlap of sidebar links.Jacob Schatz2016-03-011-1/+1
| |/
| * Merge branch 'issue_13851' into 'master' Rémy Coutable2016-03-011-1/+14
| |\ | | | | | | | | | | | | | | | | | | Brings back missing "Gitlab" text on the logo Closes #13851 See merge request !2989
| | * Bring back Gitlab textissue_13851Alfredo Sumaran2016-02-291-1/+14
| | |
| * | Merge branch 'master' into issue_13212issue_13212Alfredo Sumaran2016-02-298-42/+22
| |\ \ | | |/
| | * Merge branch 'removed-ngprogress' into 'master' Jacob Schatz2016-02-296-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 ![loading](/uploads/8b6ed8982e86e4b94803b56b8cd97737/loading.gif) See merge request !3004
| | | * Removed NGProgressremoved-ngprogressPhil Hughes2016-02-296-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 Zaporozhets2016-02-291-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-cssDmitriy Zaporozhets2016-02-271-32/+3
| | | |/ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Comment icon vertically alignedAlfredo Sumaran2016-02-291-0/+1
| | | |
| * | | Wrap icon with edited timeAlfredo Sumaran2016-02-291-1/+1
| | | |
| * | | Increase paddingAlfredo Sumaran2016-02-291-1/+1
| | | |
| * | | Keep edited time on the same line as wellAlfredo Sumaran2016-02-291-1/+1
| | | |
| * | | Apply nice date when diff page loadsAlfredo Sumaran2016-02-291-0/+1
| | | |
| * | | Keep date in the same lineAlfredo Sumaran2016-02-291-0/+4
| | | |
| * | | Prevent content misalignmentAlfredo Sumaran2016-02-291-0/+8
| | |/ | |/|
* | | Add inline documentationAlfredo Sumaran2016-03-011-0/+51
| | |
* | | Rename attribute from url to href for consistencyAlfredo Sumaran2016-03-011-1/+1
| | |
* | | Remove unneded method callAlfredo Sumaran2016-03-011-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 nameAlfredo Sumaran2016-03-011-2/+2
| | |
* | | Activate tab according URLAlfredo Sumaran2016-03-011-10/+16
| | |
* | | Pass options to UserTabsAlfredo Sumaran2016-03-011-2/+2
| | |
* | | Initialize User class on the viewAlfredo Sumaran2016-03-011-2/+0
| | |
* | | Handle default tabAlfredo Sumaran2016-02-291-15/+43
| | |
* | | Activities will load when the according tab is openedAlfredo Sumaran2016-02-291-1/+0
| | |
* | | Select just the first matched elementAlfredo Sumaran2016-02-291-1/+2
| | | | | | | | | | | | This a generic selector. It was also affecting spinner icon of the tabs
* | | Handle user tabsAlfredo Sumaran2016-02-291-0/+5
| | |
* | | Create user_tabs.js.coffeeAlfredo Sumaran2016-02-291-0/+58
| | |
* | | Delete unnecesary scriptAlfredo Sumaran2016-02-291-1/+0
| | |
* | | Add routes and actions for dynamic tab loadingJosh Frye2016-02-291-0/+1
| |/ |/|
* | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-291-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-ceZeger-Jan van de Weg2016-02-261-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 Schatz2016-02-265-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-croppingAlfredo Sumaran2016-02-265-69/+45
| |\ \
| * \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2412-32/+44
| |\ \ \
| * \ \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2327-1384/+2145
| |\ \ \ \
| * | | | | Improve avatar cropping internals, based on suggestions made by @rspeicher ↵Johann Pardanaud2016-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | on !2773
| * | | | | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-169-35/+86
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/user.rb
| * | | | | | Improve user experience for avatar croppingJohann Pardanaud2016-02-161-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 featureJohann Pardanaud2016-02-095-7/+91
| | | | | | |
* | | | | | | Merge branch 'sidebar-hide-class' into 'master' Rémy Coutable2016-02-261-8/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created helper class to hide content in issue sidebar when collapsed ![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png) Closes #13764 See merge request !2968