36bd6c8494
Show who last edited a comment if it wasn't the original author
2015-07-30 14:45:54 +02:00
bf3b318ec5
revert caching of note text
2015-07-21 13:59:14 +02:00
875d8e7f31
Fix bug where notes were being rendered with wrong color preferences due to caching
...
Closes #2008
2015-07-18 07:32:18 -07:00
4d80360bed
Cache markdown of comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:54:20 +02:00
74770137f6
Always show note action icons.
2015-05-14 12:18:19 +02:00
b0af379a22
Show user roles by comments.
2015-05-12 12:16:34 +02:00
725ff58bc8
Don't add js-task-list-container to things the user can't edit
2015-05-06 13:00:13 -04:00
5c7b91e29b
Single quotes/icon helper in views
2015-05-06 13:00:11 -04:00
922497560e
Update task list behavior for Notes
2015-05-06 12:58:27 -04:00
57c2a9f03d
Explicitly set image alt to prevent graphical glitches
...
Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded.
Fixes https://github.com/gitlabhq/gitlabhq/issues/6036 .
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-04-13 21:07:42 +02:00
1651c0bc44
Link note avatar to user.
2015-03-24 18:16:40 +01:00
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
4ef6ffaad3
Split up AttachmentUploader.
2015-02-20 15:19:50 +01:00
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
505a492cd8
Only count the user's last vote
2015-01-19 21:18:36 +00:00
4babc50eb7
Huge set of fixes for comments logic
2015-01-14 22:42:58 -08:00
8be0c60e40
Remove extra css class markdown-area which prevented attachments upload.
2014-12-22 16:44:14 +01:00
a9761ac1b8
Differentiate system notes
2014-12-20 16:20:29 -06:00
742e6eeed2
Merge branch 'upstream-master' into markdown-preview
...
Conflicts:
spec/routing/project_routing_spec.rb
2014-12-07 20:25:58 -07:00
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
6cac4e6271
Fix attachment misaligned in comment
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-07 12:51:18 +02:00
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
5d8be4438a
Upgrade to Font Awesome v4.2
2014-10-03 12:19:24 +02:00
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
04a87cb5c4
Round avatars for notes timeline
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:15 +03:00
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
15c682fcb0
Disable 'Save changes' button if input is empty, fixes #6351
2014-08-04 20:29:17 +02:00
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
5f595be4b8
Use new gems methods.
2014-03-20 13:33:16 +01:00
b61f80babb
Merge remote-tracking branch 'upstream/master' into fix-4305
2014-03-04 15:09:33 -03:00
61748c993d
Headers have ids and link to their own id.
2014-02-11 16:23:33 +01:00
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
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
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
d75eb24378
Fix more confirm deprecations
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:20:54 +02:00
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
65cad57a35
avatar upload on profile page
2013-10-09 09:05:09 +02:00
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
0675552463
It was hard to click on small edit icon for comment
2013-08-04 16:46:46 +03:00
e49ec46461
Open note image attachment in new tab
2013-07-11 09:19:19 +03:00
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
2ed7cbfba4
Move projects controllers/views in Projects module
2013-06-23 19:47:22 +03:00
Douwe Maan
Hannes Rosenögger
Stan Hu
Dmitriy Zaporozhets
Robert Speicher
Sven Strickroth
Vinnie Okada
Michael Clarke
Marin Jankovski
Drew Blessing
Sullivan SENECHAL
Robert Schilling
Marin Jankovski
Javier Castro
Ciro Santillli
Javier Castro
Steven Thonus