Commit Graph
27 Commits
Author SHA1 Message Date
Robert Speicher 7400cfc114 Bootlint: Use offset grid classes instead of empty divs 2015-06-16 13:32:32 -04:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02: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
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07: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
Douwe Maan 080449f8af Make sure Markdown previews always use the same styling as the eventual destination. 2015-02-17 17:58:08 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
yglukhov 91a3a7a6a0 Markdown preview in wiki 2014-12-29 17:07:00 +02:00
Robert Schilling 093c2c6a01 Apply ZEN mode to all GFM forms 2014-10-02 09:59:01 +02:00
Robert Schilling dae670bd69 Search for 'div-dropzone' correctly 2014-10-01 17:30:40 +02:00
Dmitriy Zaporozhets 3398e0a3d7 Revert "Implements and refactors clipboard feature for markdown."
This reverts commit 2273234653.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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
2014-06-03 10:56:40 +03:00
Marin Jankovski f79a300417 Replace existing links to help pages with the new ones. 2014-05-29 08:58:15 +02:00
erbunao 2273234653 Implements and refactors clipboard feature for markdown. 2014-05-28 22:51:47 +08:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitriy Zaporozhets 1a4c9118ae Fix UI for wiki error message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 16:22:47 +03:00
Dmitriy Zaporozhets b27c42be87 Rename wiki variables
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 14:35:01 +03:00
Dmitriy Zaporozhets 8e90011369 Restyle wiki for for twbs3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 22:44:30 +02:00
Dmitriy Zaporozhets 16eb3ac360 Update form classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 01:27:02 +02:00
Dmitriy Zaporozhets dac67ed65f Use new ui-box classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 11:45:42 +02:00
Dmitriy Zaporozhets 7c91055e4a Fix wiki editing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets acc21d30fb Increase input padding. Minor ui fixes 2013-08-08 11:57:34 +03:00
Dmitriy Zaporozhets 846e59505e Replace .actions with .form-actions 2013-08-07 23:35:24 +03:00
Dmitriy Zaporozhets df437f419b use control-group classes for inline forms in project area pages 2013-08-07 23:30:40 +03:00
Dmitriy Zaporozhets e834742407 Dont load bootstrap buttons. Modified css with new buttons 2013-08-01 22:35:40 +03:00
Dmitriy Zaporozhets 36fd4de825 Replace page_title with page-title. Correct margin for some blocks/layouts 2013-07-13 08:45:48 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00