home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
77 Commits
Author SHA1 Message Date
Jeroen van Baarsen 39bfe0aa1d Also show colors in the sidebar of comment 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-03 18:45:39 +01:00
Michael Clarke 505a492cd8 Only count the user's last vote 2015-01-19 21:18:36 +00:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
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 4cbe72d767 UI improvements mostly for mobile screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 11:31:57 +02: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
Evgeniy Sokovikov 732e6c3dbb same rendering for note diff as for usual diff 2014-10-15 13:03:27 +04:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Robert Schilling dae670bd69 Search for 'div-dropzone' correctly 2014-10-01 17:30:40 +02:00
Ciro Santilli adaec60a50 Factor zen mode. 2014-09-20 15:32:46 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Robert Schilling 58c0a4f5cf Implement zen mode for issues/MRs/notes 
Close Zen mode by ESC, foward/backward
 2014-09-11 19:24:51 +02:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03: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 a7dcf690fb Fix discussion style for timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +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 674cbe1534 Fix diff comments toggle button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 11:40:33 +03:00
Dmitriy Zaporozhets 9a3cab6bf6 Cleanup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:23:32 +03:00
Dmitriy Zaporozhets e93f6b030a Improve discussions 
* check for outdated discussions by comparing diff
* improve discussion UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:19:35 +03:00
Dmitriy Zaporozhets a49d45db41 Move reply button to helper from view 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 13:34:46 +03:00
Marin Jankovski 8301557966 Add tabindex -1 to skip on tabbing. 2014-06-18 14:21:24 +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
Dmitriy Zaporozhets 5cfaf945cd Improve notes form UI/UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 13:06:44 +03:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08: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
Dmitriy Zaporozhets aa5f306d11 Merge pull request #6860 from hszcg/dev 
Add support for side-by-side inline comments
 2014-05-08 21:23:44 +03:00
Jacob Vosmaer 285926918b Serialize last_fetched_at as a string with seconds 2014-04-28 12:42:01 +02:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Chenguang Zhang 84870438f9 Add support for side-by-side inline comments 2014-04-24 21:18:10 +08:00
Dmitriy Zaporozhets 3befe6ec33 Fix show/hide discussion link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:57:57 +03:00
Marin Jankovski 17bb700712 Only show diff it exists. 2014-04-04 19:12:23 +02:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
 2014-03-13 23:11:16 +02:00
Javier Castro b61f80babb Merge remote-tracking branch 'upstream/master' into fix-4305 2014-03-04 15:09:33 -03:00
Dmitriy Zaporozhets 8290c9a67f Use proper classes for sdiff content 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:51:50 +02:00
Jacob CarlborgandJacob Carlborg 2d554f42f0 Add button for toggling inline comments in diff view. 
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
 2014-02-22 21:21:12 +01:00
Dmitriy Zaporozhets f92b1f3d01 Use more specific class names: grouped -> btn-grouped 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 13:05:33 +02: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