Commit Graph
1889 Commits
Author SHA1 Message Date
Jacob Schatz 316630ad2c Merge branch 'jquery2' into 'master'
Upgraded jQuery to version 2

## What does this MR do?

Upgrades jQuery to 2.2.1. 

Had to include the task_list JS file directly as it includes jQuery 1 directly https://github.com/github-archive/task_list/blob/master/app/assets/javascripts/task_list.coffee#L8 so when we change jQuery to `jquery2` it was including both jQuery 1 & 2.

## Are there points in the code the reviewer needs to double check?

For any JS errors

## What are the relevant issue numbers?

Closes #12440

See merge request !4384
2016-06-06 14:25:23 +00:00
Timothy Andrew 86b07caa59 Implement authentication (login) using a U2F device.
- Move the `authenticate_with_two_factor` method from
  `ApplicationController` to the `AuthenticatesWithTwoFactor` module,
  where it should be.
2016-06-06 12:50:31 +05:30
Timothy Andrew 128549f10b Implement U2F registration.
- Move the `TwoFactorAuthsController`'s `new` action to `show`, since
  the page is not used to create a single "two factor auth" anymore. We
  can have a single 2FA authenticator app, along with any number of U2F
  devices, in any combination, so the page will be accessed after the
  first "two factor auth" is created.
- Add the `u2f` javascript library, which provides an API to the
  browser's U2F implementation.
- Add tests for the JS components
2016-06-06 12:50:31 +05:30
Phil HughesandJacob Schatz 515a5aeb33 Fixed JS errors
CHANGELOG item
2016-06-05 16:15:51 -04:00
Phil HughesandJacob Schatz 86df113907 Upgraded jQuery to version 2
Closes #12440
2016-06-05 16:15:51 -04:00
Alfredo Sumaran 22b8b9a7f3 Address feedback 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 5ea0165175 Enhancements 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 73b528f9a3 Fix spec 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 90bf5aa8f8 Add mising params 2016-06-03 17:14:23 -05:00
Alfredo Sumaran dbf9df1dd2 Remove console.log 2016-06-03 17:14:23 -05:00
Alfredo Sumaran f1291b1b9f Bulk assignment implementation 2016-06-03 17:14:23 -05:00
Alfredo Sumaran f02ee98697 Tweaks for bulk assignment 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 0be26a47f2 Do not trigger keyup event if we are persisting state
Triggering keyup will re-render the dropdown which is not needed when option persistWhenHide is true
2016-06-03 17:14:23 -05:00
Alfredo Sumaran 9df4da4bc0 Remove unneeded call to keyup event
This was re-rendering the dropdown unnecessarily
2016-06-03 17:14:23 -05:00
Alfredo Sumaran 5d7445198f Only filter asynchronously if option remote is true.
We need to update the results right away when we do bulk assignment.
2016-06-03 17:14:23 -05:00
Alfredo Sumaran e42f88ca37 Restore dropdown state when unchecking all issues 2016-06-03 17:11:41 -05:00
Alfredo Sumaran 558ef36f6c Do not remove inputs when dropdown menu hides 2016-06-03 17:11:41 -05:00
Alfredo Sumaran 02fc7adf11 Remove console.log 2016-06-03 17:11:41 -05:00
Alfredo Sumaran d8aaf018ac Handle unchecking of indeterminate items 2016-06-03 17:11:41 -05:00
Alfredo Sumaran eccc1f5911 Update classname for indeterminate state 2016-06-03 17:10:20 -05:00
Alfredo Sumaran 6974d970b4 typo 2016-06-03 17:10:20 -05:00
Alfredo Sumaran 4ab6bfcef5 Set indeterminated items 2016-06-03 17:10:20 -05:00
Alfredo Sumaran af30c87cf2 Remove unnecesary assignment 2016-06-03 17:10:20 -05:00
Alfredo Sumaran dbccacdb82 Ability to assign a label to multiple issues 2016-06-03 17:10:20 -05:00
Phil HughesandJacob Schatz 317cfcbd4d Fixed issue with search autocomplete not allow arrow key navigation
Closes #15649
2016-06-03 12:48:49 -04:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Jacob Schatz 879a2f8148 Merge branch 'search-box-blur' into 'master'
Clicking search pill focuses field

When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field.

Fixed an issue where clicking out of the field wouldn't remove the focus
outline

Also reduced some of the HTML to remove what isn't needed

See merge request !4279
2016-06-02 14:57:50 +00:00
Connor Shea 026b7abc5a Attempt to fix the user page. 2016-06-01 19:42:49 -06:00
Connor Shea 0256e68399 Remove d3 except for on pages where it's necessary. 2016-06-01 19:42:49 -06:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Jacob Schatz 051b2bfa4b Merge branch 'bendyorke-comment-fix' into 'master'
Update notes immediately after closing/reopening

## What does this MR do?
Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke!
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
Constant conflicts in that MR
## What are the relevant issue numbers?

## Screenshots (if relevant)

Fixes #15091 

See merge request !4323
2016-05-27 17:11:41 +00:00
Ben YorkeandJacob Schatz 31e5f081e4 Update notes immediately after closing/reopening 2016-05-27 12:10:28 -04:00
Phil Hughes a9785a4adb Fixed issue with calendar activity button not sending request correctly 2016-05-27 16:35:20 +01:00
Jacob Schatz 952db59f07 Merge branch 'fix-multiple-ci-status-poll' into 'master'
Fixed potential issue with 2 ci status polling events happening

Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue.

Also passed in the CI status as an option value rather than waiting for the first ajax request to finish

See merge request !3869
2016-05-27 11:36:01 +00:00
Jacob Schatz 29db3f2c52 Merge branch 'filter-by-any-user' into 'master'
Filter issuables by any user

![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif)

Closes #2836

See merge request !3820
2016-05-26 22:00:22 +00:00
Jacob Schatz 1a848d8354 Merge branch 'move-project-dropdown-async' into 'master'
Loads move issue dropdown async

To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns.

![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif)

Closes #16563

See merge request !4160
2016-05-26 18:28:01 +00:00
Jacob Schatz 24b24aff75 Merge branch 'discussion-outdated-form' into 'master'
Fixed JS error when trying to remove discussion form

## What does this MR do?

Fixes a JS error which was caused by an ID of the form not matching what was returned by the JSON. Instead of checking that, it gets the current form from the ajax success event.

This would only happen on outdated discussions because the ID of the discussion form ends with `-false` because it isn't active. However, the note is added to an active discussion so the ID returned actually ends in `-true` & therefore the JS couldn't find the correct form.

## What are the relevant issue numbers?

Closes #17778

See merge request !4303
2016-05-26 14:46:54 +00:00
Phil Hughes 9a7951f7dd Fixed potential issue with 2 ci status polling events happening 2016-05-26 15:24:35 +01:00
Phil Hughes d7bd7a3e7e Fixed JS error when trying to remove discussion form
Closes #17778
2016-05-26 14:57:35 +01:00
Phil Hughes dddcab7e3f Fixed user select failing tests on merge request 2016-05-26 10:38:53 +01:00
Phil Hughes bc0666b3c9 Filter issuables by any user
Closes #2836
2016-05-26 10:04:17 +01:00
Fatih Acet 272d482f17 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into sidebar-expand-collapse 2016-05-26 11:45:23 +03:00
Jacob Schatz 3d009f7785 Merge branch 'updated-contrib-calendar' into 'master'
POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944
2016-05-25 23:29:41 +00:00
Annabel Dunstone ec6d456b50 Change to xs breakpoint, layout_nav updates 2016-05-25 17:14:28 -05:00
Annabel Dunstone 79f890ca85 Add fade out to sub nav 2016-05-25 17:14:28 -05:00
Annabel Dunstone 3c3402b0ae Add fade out to left side of layout nav; remove dropdown nav helper; remove controls button from mobile 2016-05-25 17:14:28 -05:00
Annabel Dunstone 77c7fb1469 Fix coffeescript; remove fade out div so area is clickable; remove scrollbar on chrome 2016-05-25 17:14:28 -05:00
Annabel Dunstone e8fcd4641a Check screen width before increasing max position 2016-05-25 17:14:28 -05:00
Annabel Dunstone 65a175bbd9 Remove arrows from mobile scroll fade out 2016-05-25 17:14:28 -05:00
Annabel Dunstone 84fee47a76 Start scrolling tabs design 2016-05-25 17:14:28 -05:00