Alfredo Sumaran
eed8b179b6
Handle default tab
2016-02-29 19:12:06 -05:00
Alfredo Sumaran
4c4d742431
Activities will load when the according tab is opened
2016-02-29 19:09:16 -05:00
Alfredo Sumaran
2888cc93bd
Select just the first matched element
...
This a generic selector. It was also affecting spinner icon of the tabs
2016-02-29 19:08:11 -05:00
Alfredo Sumaran
97400ef852
Handle user tabs
2016-02-29 16:39:20 -05:00
Alfredo Sumaran
d941aee400
Create user_tabs.js.coffee
2016-02-29 16:39:09 -05:00
Alfredo Sumaran
99d75a2770
Delete unnecesary script
2016-02-29 16:36:05 -05:00
Josh Frye
cc9f93f9d2
Add routes and actions for dynamic tab loading
2016-02-29 08:24:07 -05:00
Alfredo Sumaran
08ec838ed5
Merge branch 'master' into avatar-cropping
2016-02-26 09:32:07 -05:00
Marin Jankovski
b2c641de21
Fix syntax error in autosave coffeescript.
2016-02-26 13:22:35 +01:00
Jacob Schatz
856153d712
Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'
...
Sidebar overlaps content when screen is below 1200px.
When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717
Also sorry I couldn't get the collapse button in the screen cap. It's there.
See merge request !2620
2016-02-24 23:09:29 +00:00
Alfredo Sumaran
ccabbaa9b3
Wait until listeners are set before triggering a 'click' event
2016-02-24 15:53:39 -05:00
Alfredo Sumaran
4d23af7507
Move script inside of MergeRequestTabs class
2016-02-24 15:39:56 -05:00
Alfredo Sumaran
a4e522a889
Merge branch 'master' into minimize-on-diff
2016-02-24 14:06:55 -05:00
Alfredo Sumaran
0104ab79b3
Merge branch 'master' into avatar-cropping
2016-02-24 10:42:51 -05:00
Jacob Schatz
89fc80beb5
Merge branch 'activity-tabs-single-select' into 'master'
...
Treats activity tabs as single select
Fixes #8092
See merge request !2940
2016-02-24 11:49:47 +00:00
Rémy Coutable
d74cfe7db3
Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'
...
Fix group projects styles
Makes new project button visible when no projects are available.
Fixes #13193
# BEFORE
# AFTER (w/projects)
# AFTER (no projects)
cc @creamzy @skyruler
See merge request !2714
2016-02-24 10:58:05 +00:00
Phil Hughes
74d87db977
changed bind to on for activity link click event
2016-02-24 08:28:33 +00:00
Phil Hughes
30b56fb017
Treats activity tabs as single select
...
Fixes #8092
2016-02-24 08:28:33 +00:00
Robert Speicher
dba47f680d
Merge branch 'issue_13301_emoji-menu' into 'master'
...
Load award emoji picker with ajax request
Fixes #13301 .
See merge request !2888
2016-02-24 02:50:45 +00:00
Alfredo Sumaran
798c220037
Initialize navigation shortcuts on project's files page
2016-02-23 20:17:16 -05:00
Alfredo Sumaran
be0f97a6d4
Initialize navigation shortcuts on project's files page
2016-02-23 20:04:20 -05:00
Alfredo Sumaran
af978cd5bc
Merge branch 'master' into avatar-cropping
2016-02-23 16:52:43 -05:00
Alfredo Sumaran
a3713050f7
Ability to toggle sidebar on smaller screens
2016-02-23 15:28:21 -05:00
Alfredo Sumaran
13047483b3
Update scrollbars after toggle sidebar
2016-02-23 15:12:59 -05:00
Alfredo Sumaran
8129d1675f
Add "e" shortcut to edit issuable
2016-02-23 11:28:23 -05:00
Jacob Schatz
1142b327e8
Merge branch 'dz-small-ui-fixes' into 'master'
...
Set of UI fixes
* Improve wiki pages
* Improve profile pages
cc @skyruler
See merge request !2758
2016-02-23 15:38:20 +00:00
Jacob Schatz
6263a3ca3c
Merge branch 'files-view-row-click' into 'master'
...
Fixes issue with file view rows not clickable on project main view
Fixed an issue where it would only load the first 25 commit data on project main view.
Stopped the file view sending 1 too many requests.
Fixes #3916
See merge request !2933
2016-02-23 14:52:21 +00:00
Phil Hughes
01b965f6da
Correctly checks if tree view is on screen
2016-02-23 13:41:03 +00:00
Phil Hughes
4eb67cdf42
Issues can be dragged & dropped into empty milestone lists
...
This is also possible with MRs. Also fixed an issue where MRs weren't sortable
Fixes #13668
2016-02-23 10:44:27 +00:00
Phil Hughes
d80205b755
Fixes issue with file view rows not clickable on project main view
...
Fixed an issue where it would only load the first 25 commit data on project main view
Stopped the file view sending 1 too many requests
Fixes #3916
2016-02-23 09:06:26 +00:00
Annabel Dunstone
7bb378b33d
Create EmojisController
2016-02-22 20:16:00 -06:00
Jacob Schatz
54a5b8831a
Merge branch 'blame-line-link' into 'master'
...
Added line links to blame table
Closes #4119
See merge request !2915
2016-02-22 20:29:38 +00:00
Jacob Schatz
5803a5308f
Merge branch 'issue_13463' into 'master'
...
Fix Side-by-side view after loading diff results
Fixes #13463
See merge request !2880
2016-02-22 14:35:06 +00:00
Phil Hughes
fbc578a7ec
Added line links to blame table
...
Closes #4119
2016-02-22 14:09:13 +00:00
Alfredo Sumaran
cd569a66ef
Update button selector
2016-02-19 20:01:30 -05:00
Alfredo Sumaran
9a60bd54a5
Change method name for consistency
2016-02-19 16:34:20 -05:00
Alfredo Sumaran
27a0310f23
Make diff view name getter less error prone
2016-02-19 16:32:29 -05:00
Jacob Schatz
de84fa365e
Merge branch 'issue_3276' into 'master'
...
Labels should be visible in milestone view
Closes #3276
See merge request !2599
2016-02-19 19:44:13 +00:00
Alfredo Sumaran
ebceae3ead
Add comment
2016-02-19 12:55:13 -05:00
Annabel Dunstone
b80df08735
Add timeout for ajax call in award emoji steps; update focus in award picker
2016-02-19 07:32:20 -06:00
Annabel Dunstone
074fa8f2b9
Load award emoji picker with ajax request
2016-02-18 22:02:22 -06:00
Alfredo Sumaran
8dc78c6685
Expand view container if diff mode is set to paralells
2016-02-18 16:15:50 -05:00
Jacob Schatz
71795b9ae8
Uses cross browser niceScroll to do scrolling on sidebar.
2016-02-18 10:55:30 -05:00
Johann Pardanaud
bf6aa15512
Improve avatar cropping internals, based on suggestions made by @rspeicher on !2773
2016-02-17 18:35:16 +01:00
Jacob Schatz
9f0a71f4fe
Shrink on diff view
...
Shrinks when navigating to diff view.
Shrinks when refreshing on diff view.
Expandable at anytime.
2016-02-17 10:44:43 -05:00
Johann Pardanaud
fb6d7df347
Merge branch 'master' into avatar-cropping
...
Conflicts:
app/models/user.rb
2016-02-16 19:53:51 +01:00
Johann Pardanaud
78588cfca1
Improve user experience for avatar cropping
...
- Avoid incomprehensible errors on non-integer cropping values
- Set the default cropping area to 80%
2016-02-16 19:50:23 +01:00
Jacob Schatz and Alfredo Sumaran
c37e5bc69d
Sidebar overlaps content when screen is below 1200px.
...
When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717
2016-02-16 12:27:45 -05:00
Stan Hu
7ffcc5a17b
Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji
...
Steps to reproduce:
1. Go to a MR or issue
2. Click on "thumbsup" Emoji 3 times
3. Observe the tooltip becomes "me, me"
Closes #13374 , #12788
2016-02-13 02:02:05 -08:00
Dmitriy Zaporozhets
22808a2221
Merge branch 'fix-explore-filter' into 'master'
...
Add ajax filtering to all paged project lists. Fixes #13182
See merge request !2728
2016-02-10 08:31:36 +00:00
Alfredo Sumaran
Josh Frye
Marin Jankovski
Jacob Schatz
Rémy Coutable
Phil Hughes
Robert Speicher
Annabel Dunstone
Jacob Schatz
Johann Pardanaud
Stan Hu
Dmitriy Zaporozhets