home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
1055 Commits
Author SHA1 Message Date
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öggerandDouwe 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
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' 
Move external issue tracker away from yml config

See merge request !1442
 2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets 0d86a1a3d4 Merge pull request #8638 from hiroponz/remember-project-default-tab-30days 
Remember the project default tab for 30 days
 2015-01-27 12:50:20 -08:00
Marin Jankovski 95db00c3e9 Still need the javascript on the project edit page. 2015-01-27 12:19:32 -08:00
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Marin Jankovski 4641514cbf Update rspec tests to the new external issue logic. 2015-01-26 15:59:40 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Hiroyuki Sato 22b7d2156c Remember the project default tab for 30days 2015-01-23 20:36:53 +09:00
Dmitriy Zaporozhets 7f1633e294 Merge pull request #7615 from yglukhov/new-branch-submit-button-validation 
Validation of 'Create branch' and 'Create tag' buttons
 2015-01-21 23:05:02 -08:00
Dmitriy Zaporozhets 892be53fa3 Merge pull request #8425 from rumpelsepp/rouge 
Replace highlight.js with rouge-fork rugments
 2015-01-15 14:28:24 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01:00