Commit Graph
1317 Commits
Author SHA1 Message Date
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master'
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
2016-03-11 19:58:10 +00:00
Jacob Schatz 6968ea32e2 Merge branch 'award-emoji-design-update' into 'master'
Updated UI of award emoji

Closes #13878 

See merge request !3028
2016-03-11 16:06:18 +00:00
Jacob Schatz 29ac9f64ea Merge branch 'fix-issue-toggle-button-mobile' into 'master'
Fixes issue with issue sidebar toggle button not working

Closes #14195

See merge request !3165
2016-03-11 13:09:54 +00:00
Jacob Schatz cec88d81bb Merge branch 'account-settings' into 'master'
Account settings

Closes #13854

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4802a7b4f74f17d25a611ed1a2200445/account-settings.png)

See merge request !3039
2016-03-11 13:08:40 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master'
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
2016-03-11 13:07:43 +00:00
Dmitriy Zaporozhets 1f08363650 Merge branch 'comment-error' into 'master'
Add error for ajax:error when submitting comments

Fixes #13814
![Screen_Shot_2016-02-25_at_1.54.56_PM](/uploads/d70d706d306079df1b00d70f09affb63/Screen_Shot_2016-02-25_at_1.54.56_PM.png)
cc @dblessing 

See merge request !2976
2016-03-11 13:00:59 +00:00
Jacob Schatz 0c5b92cbd7 Merge branch 'build-scroll-controls-position' into 'master'
Affix the build scroll controls

Closes #4709

See merge request !3109
2016-03-11 11:19:27 +00:00
Phil Hughes 6690d8e25b Correctly uses a variable with the text 2016-03-11 10:03:35 +00:00
Phil Hughes f48f51ac7e Account settings
Closes #13854
2016-03-11 09:51:07 +00:00
Phil Hughes 25f392eab7 Added 'surprise' animation 2016-03-11 09:47:47 +00:00
Phil Hughes 57a9d07716 Fixed bug with emoji search styling 2016-03-11 09:11:36 +00:00
Phil Hughes cb72f9b30c CoffeeScript style improv. 2016-03-11 09:03:08 +00:00
Phil Hughes b5f3cf8218 Moved method calls to separate lines 2016-03-11 09:03:08 +00:00
Phil Hughes e3d844984b Moved SCSS values into variables 2016-03-11 09:03:08 +00:00
Phil Hughes a7e76a6119 Updated award emoji tests 2016-03-11 09:02:43 +00:00
Phil Hughes 5e145918b4 Updated UI of award emoji
Closes #13878
2016-03-11 09:02:43 +00:00
Phil Hughes 732b6b5547 Fixed missing variables 2016-03-11 09:00:19 +00:00
Phil Hughes bd411675d2 Fixes issue with issue sidebar toggle button not working
Closes #14195
2016-03-10 17:34:06 +00:00
Jacob Schatz 4f954d6adc Add error for ajax:error when submitting comments
Fixes #13814
2016-03-10 12:20:00 -05:00
Phil Hughes d6f97daa19 Changed variable names 2016-03-10 17:17:41 +00:00
Jacob Schatz e080028570 Merge branch 'dropdown-js' into 'master'
Dropdown JS



See merge request !3112
2016-03-10 16:24:32 +00:00
Phil Hughes 2d446267d6 Removed CiBuild in favour of already available CiBuild class 2016-03-10 15:48:53 +00:00
Jacob Schatz a1f4531069 Merge branch 'quick-submit-note-edit' into 'master'
Fixed quick submit on note edit

Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094

See merge request !3151
2016-03-10 14:34:03 +00:00
Phil Hughes 8d7e0f0ba9 Fixed failing tests 2016-03-10 13:54:54 +00:00
Phil Hughes f3afcb87b7 Correctly handles multi-selected values
Fixes an issue where values couldnlt be unselected
2016-03-10 13:54:54 +00:00
Phil Hughes 6c89196278 Enter button trigger first row click when searching 2016-03-10 13:54:54 +00:00
Phil Hughes 57294f3043 Removed fuse for fuzzaldrin 2016-03-10 13:54:54 +00:00
Phil Hughes 0e82bcad8a Fixed issue with user list not fetching current project users 2016-03-10 13:54:54 +00:00
Phil Hughes 7744b67f75 Stops excute remote data fetcher when already recieved data 2016-03-10 13:54:54 +00:00
Phil Hughes dd35de1ad8 Uses a publicly facing URL so that it allows labels & milestones to be visible when not logged in 2016-03-10 13:54:54 +00:00
Phil Hughes 2e3c082f2a Status dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 75b21ebd75 Can create new label from dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 5cdac7614d Started page two for labels dropdown to allow creating new labels 2016-03-10 13:54:54 +00:00
Phil Hughes 8ca880c3b8 Correctly fitlers remotely 2016-03-10 13:54:54 +00:00
Phil Hughes 562a09c127 milestone dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 04fc44841d Removed label colour from dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 11b52e287b Applied new dropdowns to issue filters 2016-03-10 13:54:54 +00:00
Phil Hughes 4407532911 GitLab dropdown JS 2016-03-10 13:54:54 +00:00
Dmitriy Zaporozhets e3efce9237 Move group activity feed to separate page for consistency with dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 14:29:38 +01:00
Dmitriy Zaporozhets 83593e461a Use modern syntax
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 13:55:01 +01:00
Dmitriy Zaporozhets ec52d5b14f Fix projects pagination via ajax
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 13:41:23 +01:00
Phil Hughes 3c6fdc7a0a Fixed quick submit on note edit
Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094
2016-03-10 11:02:22 +00:00
Baldinof a5079d2195 Merge branch 'master' into markdown_preview_shortcut 2016-03-09 22:54:53 +01:00
Florent Baldino d0c5ac4ae3 Cache only last response in markdown preview 2016-03-09 09:30:50 +01:00
Douwe Maan 903aa7c95e Merge branch 'issue_13621_2' into 'master'
Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931
2016-03-07 17:18:25 +00:00
Florent Baldino af24645d5d Add shortcut to toggle markdown preview 2016-03-07 15:35:26 +01:00
Phil Hughes b9168b0759 Affix the build scroll controls
Closes #4709
2016-03-07 09:44:55 +00:00
Rubén Dávila 95b06a62c0 Updates from last code review. 2016-03-06 23:07:19 -05:00
Dmitriy Zaporozhets 14df110b78 Merge branch 'issue-sidebar-mobile' into 'master'
Issue sidebar mobile

Fixes #13592 
Fixes #14037 

See merge request !3050
2016-03-05 11:48:21 +00:00
Jacob Schatz 9cae8dbbfb Uses the correct variable names for this situation. 2016-03-04 14:40:52 -05:00