Commit Graph
27 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Marin Jankovski 8be0c60e40 Remove extra css class markdown-area which prevented attachments upload. 2014-12-22 16:44:14 +01:00
Drew Blessing a9761ac1b8 Differentiate system notes 2014-12-20 16:20:29 -06:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview
Conflicts:
	spec/routing/project_routing_spec.rb
2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets f53e0fff47 Show username in comment header for easier mention
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-01 17:40:45 +02:00
Dmitriy Zaporozhets 6cac4e6271 Fix attachment misaligned in comment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-07 12:51:18 +02:00
Vinnie Okada 5700842ba8 Add Markdown preview to more forms
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
2014-10-15 23:52:33 -05:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets 04a87cb5c4 Round avatars for notes timeline
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:15 +03:00
Dmitriy Zaporozhets 207d798dc4 Basic UI implememntation of comments in timeline style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:14 +03:00
Robert Schilling 15c682fcb0 Disable 'Save changes' button if input is empty, fixes #6351 2014-08-04 20:29:17 +02:00
Dmitriy Zaporozhets 3ea4bf4891 Merge pull request #6045 from jacargentina/fix-4305
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
2014-05-13 12:29:54 +03:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Javier Castro b61f80babb Merge remote-tracking branch 'upstream/master' into fix-4305 2014-03-04 15:09:33 -03:00
Ciro Santillli 61748c993d Headers have ids and link to their own id. 2014-02-11 16:23:33 +01:00
Javier Castro 556ae5ae81 Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible 2014-01-14 12:06:53 -03:00
Dmitriy Zaporozhets 8c1d414674 Include tw bootstrap manually. Fix hide class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 21:42:42 +02:00
Dmitriy Zaporozhets 5f7db3e94b Fix file upload for edit note. Better style for discussion form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-26 09:44:18 +02:00
Dmitriy Zaporozhets d75eb24378 Fix more confirm deprecations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:20:54 +02:00
Dmitriy Zaporozhets ed82ab4117 Remove some deprecations and fir project helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 0675552463 It was hard to click on small edit icon for comment 2013-08-04 16:46:46 +03:00
Dmitriy Zaporozhets e49ec46461 Open note image attachment in new tab 2013-07-11 09:19:19 +03:00
Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
2013-07-02 11:47:09 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00