Robert Schilling
0f66b32965
Merge branch 'master' into 'master'
...
Fix editor in IE producing errors #1096
IE seems to handle form submission oddly. It gets fired twice - once from javascript and once from the form click, producing 2 identical requests and causing #1096 .
Similar issues: http://stackoverflow.com/questions/14373800
Returning false from the click event seems to fix it and shouldn't cause any side-effects.
See merge request !366
2015-03-07 08:00:57 +00:00
Dmitriy Zaporozhets
8b53d9efe6
Fix bug with active tab remembering (saving cookie with different path)
2015-03-06 01:41:47 -08:00
Dmitriy Zaporozhets
65105ff3bb
Improve projects list
...
* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button
2015-03-04 17:22:55 -08:00
unknown
6fd0600685
Bugfix #1096
2015-03-04 22:05:15 +02:00
Marin Jankovski
8be36a2c0f
Merge branch 'autosave-new-issuables' into 'master'
...
Autosave title and description of new issues/MRs.
Closes #2048 .
See merge request !1595
2015-03-04 06:38:55 +00:00
Douwe Maan
3102454a56
Don't show Unassigned in user select when searching.
2015-03-03 13:52:13 +01:00
Dmitriy Zaporozhets
27e7534470
Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix
...
[bugfix] Merge request diff view behaviour fix
2015-03-02 14:28:21 -08:00
Dmitriy Zaporozhets
faae454424
Merge pull request #8869 from tsigo/rs-issue-867
...
Allow mass-unassigning of issues
2015-02-26 09:04:23 -08:00
Dmitriy Zaporozhets
7fef8456e8
Merge branch 'small-fixes' into 'master'
...
Small fixes
Fixes #2062 and #2061
See merge request !1601
2015-02-26 06:31:50 +00:00
Dmitriy Zaporozhets
e27f5aef46
Fix sticky diff header
2015-02-25 22:17:46 -08:00
Robert Speicher
e53dd7526f
Allow mass-unassigning of issues
...
Fixes #867
[ci skip]
2015-02-25 23:57:23 -05:00
Dmitriy Zaporozhets
c254cb03d8
Fix affix for issue and merge request with image in description
2015-02-25 20:00:28 -08:00
Douwe Maan
87da9185ff
Autosave title and description of new issues/MRs.
2015-02-25 12:52:37 +01:00
Douwe Maan
0283fff591
Merge branch 'master' into extend_markdown_upload
...
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
Dmitriy Zaporozhets
93447c4b14
Merge pull request #8760 from yglukhov/diff-sticky-headers
...
Diff headers made sticky
2015-02-23 23:50:07 -08:00
Dmitriy Zaporozhets
8601c502e8
Merge branch 'fix-commit-zen-mode' into 'master'
...
Fix ZenMode on commit show and milestone edit pages.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110
See merge request !1557
2015-02-24 02:02:44 +00:00
Dmitriy Zaporozhets
87b04868a1
Create Aside js class for handling all sidebars in UI for mobile devices
2015-02-21 22:01:27 -08:00
Douwe Maan
aba1251594
Merge branch 'master' into extend_markdown_upload
2015-02-21 13:46:58 +01:00
Douwe Maan
198d75b3a8
Initialize ZenMode on commit show and milestone edit pages.
2015-02-21 11:13:31 +01:00
Douwe Maan
218283b368
Merge branch 'extend_markdown_upload' into generic-uploads
...
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
2015-02-20 15:37:37 +01:00
Douwe Maan
e0edea4ae9
Fix commits calendar vertical days.
2015-02-20 14:35:29 +01:00
krolik
51b234cfb6
Removed exceeding semicolon
2015-02-20 13:03:28 +02:00
krolik
5493e27d53
Fixed merge request diff page after back browser button is pressed.
2015-02-20 13:00:42 +02:00
Dmitriy Zaporozhets
b876793d03
Restlye issueable filters to be more compact
2015-02-19 15:47:10 -08:00
Dmitriy Zaporozhets
896c046217
Affix assignee/milestone block
2015-02-17 16:14:49 -08:00
Douwe Maan
4036fb167d
Change textarea upload hover icon from picture to paperclip.
2015-02-17 22:23:31 +01:00
Douwe Maan
ab401a6132
Remove note attachment file selector.
2015-02-17 22:23:31 +01:00
Douwe Maan
d2ebdf664b
Refactor.
2015-02-17 22:23:31 +01:00
Hannes Rosenögger and Douwe Maan
9bf8480b4a
Generalize the image upload in markdown
...
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
2015-02-17 22:20:44 +01:00
Dmitriy Zaporozhets
0da0d800f2
Merge branch 'md-preview-class' into 'master'
...
Make sure Markdown previews always use the same styling as the eventual destination.
Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body.
See merge request !1514
2015-02-17 20:38:53 +00:00
Douwe Maan
080449f8af
Make sure Markdown previews always use the same styling as the eventual destination.
2015-02-17 17:58:08 +01:00
Douwe Maan
29a997cde9
Properly clear notes bindings to prevent double comments on Ctrl-Enter.
2015-02-16 18:25:57 +01:00
Douwe Maan
25e44d0530
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).
2015-02-13 14:44:42 +01:00
Douwe Maan
d909ae73dc
Actually submit comment on command-enter.
...
Resolves #1869 .
2015-02-11 12:21:11 +01:00
yglukhov
af44c65030
Diff headers made sticky
2015-02-09 15:34:06 +02:00
Dmitriy Zaporozhets
c5a16b8c60
Merge branch 'autosave' into 'master'
...
Autosave and autorestore unsaved comments.
Closes #1738 .
See merge request !1480
2015-02-08 02:45:20 +00:00
Dmitriy Zaporozhets
377d461f26
Merge branch 'import-all-projects' into 'master'
...
Add "Import all projects" button to GitHub and GitLab import pages.
Closes #1963 .
See merge request !1482
2015-02-08 02:39:29 +00:00
Douwe Maan
db7921f2d8
Add "Import all projects" button to GitHub and GitLab import pages.
...
Closes #1963 .
2015-02-07 23:15:04 +01:00
Douwe Maan
463d9f76e4
Autosave and autorestore unsaved comments.
...
Closes #1738 .
2015-02-07 20:55:17 +01:00
Dmitriy Zaporozhets
6b61c90498
Merge branch 'markdown-preview-via-post' into 'master'
...
Don't have Markdown preview fail for long comments/wiki pages.
See https://github.com/gitlabhq/gitlabhq/issues/8611 .
See merge request !1479
2015-02-06 17:55:30 +00:00
Douwe Maan
639c93b4f2
Don't have Markdown preview fail for long content by using POST rather than GET.
...
See https://github.com/gitlabhq/gitlabhq/issues/8611 .
2015-02-06 11:23:12 +01:00
Dmitriy Zaporozhets
85c2cb2a19
Merge branch 'submit-comment-on-command-enter' into 'master'
...
Submit comment on command enter
Fixes #1869 .
See merge request !1474
2015-02-06 03:46:25 +00:00
Valery Sizov
1ac20698a5
gitlab.com importer: refactorig
2015-02-05 17:03:43 -08:00
Douwe Maan
71668312c4
Submit comment on command-enter.
...
Fixes #1869 .
2015-02-05 21:56:25 +01:00
Dmitriy Zaporozhets
cb2093fb61
Merge pull request #8702 from m-a-r-c-o/raw-image-paste-fix
...
Fix raw image paste from clipboard
2015-02-03 17:49:15 -08:00
Dmitriy Zaporozhets
254a63dcf7
Improve collapsing sidebar
2015-02-03 13:11:33 -08:00
Jason Blanchard
ee955d7a12
Adds persistent collapse button for left side bar
2015-02-03 11:45:33 -05:00
Marco Cyriacks
a54e9e5459
Fix raw image paste from clipboard
...
This patch binds the textarea (markdown area) paste event to the
handlePaste() function (that was already present).
Furthermore the event processing is improved in the following way:
- The default paste event handler of the browser is only disabled if the
browser fully supports clipboardData AND there realy is image data in
the event object. In all other cases (no support or no image) the
default handler processes the text paste.
- Some obsolete code was removed.
- The pasteText() function (which is somehow buggy because it places the
cursor at the end of the text independantly from its position before the
paste) is only used to place the image link after image data was pasted.
2015-02-01 22:26:34 +01:00
Dmitriy Zaporozhets
5ec36902dd
Fix calendar js
2015-01-29 16:00:46 -08:00
Dmitriy Zaporozhets
a9288e554e
Cleanup and make contribution calendar faster
2015-01-29 00:53:43 -08:00