home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,624 Commits 48 Branches 340 Tags
0e896ffe4eebb8bcf04bc1327d498bb041faed56
Commit Graph
126 Commits
Author SHA1 Message Date
Jacob Schatz cea3cf177c Merge branch 'award-emoji-fixes' into 'master' 
Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550
 2016-06-09 23:21:50 +00:00
Jacob Schatz 87c77718a4 Merge branch 'remove-chart' into 'master' 
Only load Chart.js when necessary.

Only load Chart.js where it's used, namely the Graphs section. Follow up on !4394.

cc: @jschatz1 

See merge request !4516
 2016-06-09 20:51:10 +00:00
Fatih Acet c987837336 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes 2016-06-09 23:07:39 +03:00
Fatih Acet 091e030070 Instantiate awardsHandler in application main script. 2016-06-09 02:57:53 +03:00
Connor Shea d9422aef85 Only load Chart.js when necessary. 2016-06-07 15:27:30 -06:00
Fatih Acet 3f2db9d971 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-state 2016-06-06 18:58:24 +03:00
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 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 86df113907 Upgraded jQuery to version 2 
Closes #12440
 2016-06-05 16:15:51 -04:00
Connor Shea 0256e68399 Remove d3 except for on pages where it's necessary. 2016-06-01 19:42:49 -06:00
Fatih Acet 5b43eeee97 Blur button tags when clicked. Fixes #17748. 
http://stackoverflow.com/questions/23443579/how-to-stop-buttons-from-staying-depressed-with-bootstrap-3
 2016-06-01 21:13:29 +03: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
Phil Hughes 18b361cf80 Group the contributing calendar by day 
This aligns the boxes correctly with the day on the left side of the calendar
 2016-05-16 12:22:17 +01:00
Fatih Acet e2450ccfa4 Move sidebar related code from application.js to Sidebar class. 2016-05-12 00:37:40 +03:00
Annabel Dunstone 8eb31c40fc Hide navbar on mobile 2016-05-09 18:53:25 -05:00
Jacob Schatz b3f4e8b218 Revert "Merge branch 'sentry-js' into 'master' " 
This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.
 2016-04-21 07:27:27 -04:00
Robert Speicher 0f309794e7 Merge branch 'sentry-js' into 'master' 
Add Sentry logging for JavaScript errors

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675

See merge request !3795
 2016-04-20 19:52:27 +00:00
Arinde Eniola 3e7a8b0789 place the sentry config into a new file, and some changes 2016-04-19 22:04:52 +01:00
Arinde Eniola 5661f47d38 some changes and add item to changelog 2016-04-19 11:48:37 +01:00
Arinde Eniola 3e62dc3be5 add some configs 2016-04-18 18:56:38 +01:00
Jacob Schatz 001fe515cf Make unminified Raven available. 
Use the correct sentry dsn.
 2016-04-18 12:37:50 -04:00
Jacob Schatz 5f98fdcdc9 Add sentry logger to GitLab 2016-04-18 12:26:32 -04:00
Phil Hughes 01f70fc97b Fixed issue with commit time not using timeago 2016-04-14 15:07:38 +01:00
connorshea d8296f8738 Remove Bootstrap Carousel 
The Bootstrap carousel module is used for image carousels, and we don't
use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component.

Fixes #14670.
 2016-04-12 16:14:15 -06:00
Alfredo Sumaran 38a4f5cec6 Rename method and initialize .timeago inside 2016-04-11 16:45:03 -05:00
Alfredo Sumaran 3440c0e61f Update datetime in .timeago elements 
This should be done before .timeago() is called on the element
 2016-04-07 12:02:43 -05:00
Jacob Schatz 4798b927ab Merge branch 'issue_7959' into 'master' 
Crop avatars on the client before upload

<img src="/uploads/535d69956cc5904870ae5d95132a35af/Screen_Shot_2016-03-17_at_9.55.56_AM.png" width="700">

closes #7959
closes #600 

See merge request !3270
 2016-03-23 20:29:30 +00:00
Alfredo Sumaran 3bab5976c0 Move cropper.js to vendor folder 2016-03-23 11:54:04 -05:00
Phil Hughes 21f5524926 Auto collapses the navigation when resizing 
Closes #14475
 2016-03-22 14:08:27 +00:00
Jacob Schatz 0305dd98b3 Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' 
change the css class has_tooltip to has-tooltip universally

closes #14432 

See merge request !3321
 2016-03-21 20:40:14 +00:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Stan Hu ba92b7ca19 Fix diff image view modes (2-up, swipe, onion skin) not working 
Closes #13856
 2016-03-19 00:22:17 -07:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' " 
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
 2016-03-15 14:55:40 +01:00
Phil Hughes 1a5992b5eb Changed breakpoint size 
Changed breakpoint class into singleton
 2016-03-14 11:51:07 +00:00
Phil Hughes 23b0eeca28 removed un-used function call 2016-03-14 11:39:56 +00:00
Phil Hughes f0f6723fe0 Created bootstrap breakpoint class 
This class checks the current bootstrap breakpoint
 2016-03-14 11:39:56 +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 9cae8dbbfb Uses the correct variable names for this situation. 2016-03-04 14:40:52 -05:00
Jacob Schatz 9afab2963c Only save right sidebar position cookie if user did the collapsing. 2016-03-04 14:31:33 -05:00
Jacob Schatz cabd228f70 Fix bugs with open and close buttons 2016-03-04 09:06:57 -05:00
Jacob Schatz 61ce134fa9 Small outside aside shrink sidebar button for mobile only. 2016-03-04 09:06:57 -05:00
Jacob Schatz cabb61719d Open sidebar button on mobile. 2016-03-04 09:06:57 -05:00
Phil Hughes cb0e26d1f7 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
 2016-02-29 09:47:22 +00:00
Johann Pardanaud 6d5808801f Fix #7959: Fix avatar stretching by providing a cropping feature 2016-02-09 22:26:50 +01:00
Jacob Schatz 2e8fe0bdb2 Add JS style changes. 
Thanks @rspeicher
 2016-02-05 11:31:13 -05:00
Jacob Schatz 80812a5d46 Edited time ago location change. 
Change edited icon to word.
Change edited text color to gray
cc/ @creamzy
 2016-02-05 11:31:13 -05:00
Dmitriy Zaporozhets 34edb3abe7 Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' 
Implement new design for issue and merge request right sidebar

Fixes #3981 



See merge request !2645
 2016-02-04 18:01:29 +00:00
Jacob Schatz f25ba6e03c Resize sidebar on initial page refresh. 2016-02-04 08:50:25 -05:00
Jacob Schatz e0efdc4bf7 Make size changes based on screen resize. 2016-02-03 20:35:26 -05:00
Jacob Schatz 599e554ad4 Sidebar works after sidebar ajax calls. 2016-02-02 19:42:19 -05:00