home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,223 Commits 48 Branches 340 Tags
ac7cea308467709413f7a67b9e95fd0a0e2dcafe
Commit Graph
207 Commits
Author SHA1 Message Date
Yorick PeterseandRobert Speicher 7919366944 Merge branch 'refactor-rendering-redacting' into 'master' 
Support for rendering/redacting multiple documents

See merge request !4828
 2016-06-24 11:28:39 -04:00
Jacob SchatzandRobert Speicher 762c8a986b Merge branch 'note-emoji-system-note' into 'master' 
Hides award emoji & access level on system notes

## What does this MR do?

Hides award emoji & access level on system notes as they aren't applicable to them notes.

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png)

See merge request !4629
 2016-06-21 11:52:25 -04:00
Jacob SchatzandRobert Speicher 4e3dedaa0d Merge branch 'comment-form-button-spacing' into 'master' 
Fixed alignment of buttons in note forms

## What does this MR do?

Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group.

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png)

![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png)


See merge request !4740
 2016-06-18 12:42:40 -04:00
Connor Shea bdc995bf00 Shows award emoji for comments to all users who are logged in. 2016-06-08 17:09:48 -06:00
Jacob Schatz 37afdb076f Merge branch 'edit-mobile' into 'master' 
Shows the edit comment button on mobile

## What does this MR do?

Shows the edit comment button on mobile.

## What are the relevant issue numbers?

Closes #17214 

## Screenshots (if relevant)

![Screen_Shot_2016-06-01_at_12.33.13](/uploads/d46b800c175a53821ea8e8af49c07641/Screen_Shot_2016-06-01_at_12.33.13.png)

See merge request !4402
 2016-06-06 19:05:51 +00:00
Fatih AcetandZ.J. van de Weg f1d74ccc8c Some design related tweaks. 2016-06-06 11:10:10 +02:00
Fatih AcetandZ.J. van de Weg f261be0949 Award emoji implementation for notes. 2016-06-06 11:07:22 +02:00
Fatih AcetandZ.J. van de Weg eaff5afc9b Show emoji menu in notes. 2016-06-06 11:03:39 +02:00
Phil Hughes 855ff6423b Shows the edit comment button on mobile 
Closes #17214
 2016-06-02 09:10:29 +01:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views 
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
 2016-05-26 17:14:06 +02:00
Douwe Maan 876dc7bacb Rename diff_with_notes partial. 2016-05-13 17:31:59 -05:00
Douwe Maan e0bb169ae3 "the outdated diff" -> "an outdated diff" 2016-05-13 17:31:58 -05:00
Douwe Maan 7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Phil Hughes 04c992f3cf Removed commented text from system notes 2016-04-20 14:48:53 +01:00
Jacob Schatz d337d27e1c Merge branch 'print-style' into 'master' 
Print style

[test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf)

Closes #14201

See merge request !3784
 2016-04-18 13:29:13 +00:00
Jacob Schatz 4d5d619457 Merge branch 'discussion-notes' into 'master' 
Discussion notes update

- At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
- Moved the dates to be in the header like other notes
- Fixed overlapping issue on mobile

See merge request !3720
 2016-04-18 13:03:24 +00:00
Phil Hughes 1a57601d8c Updated print style 
Closes #14201
 2016-04-18 12:00:20 +01:00
Jacob Schatz f2d94c5d86 Scroll to the last comment I made and edit it. 2016-04-15 16:05:37 -04:00
Annabel Dunstone 80d8f8b876 Syntax & style updates 2016-04-14 12:33:29 -05:00
Phil Hughes 038e623042 Fixed tests 2016-04-14 17:26:32 +01:00
Annabel Dunstone 82d0221b63 Add line type conditional to diff line helper 2016-04-14 09:10:40 -05:00
Annabel Dunstone d176f873e1 Add content attributes to discussion diffs; change styling of add-note icon to prevent white spaces in paste 2016-04-14 09:10:40 -05:00
Phil Hughes e490a54105 Discussion notes update 
At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
Moved the dates to be in the header like other notes
Fixed overlapping issue on mobile
 2016-04-14 14:50:48 +01:00
Phil Hughes 094cafcaa7 Removed GL Actions class 2016-04-14 10:28:05 +01:00
Phil Hughes 3de09d1475 Updated all GFM forms to use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes 82164a9f77 Notes form JS update 
Updated the JS to have a standard class with standard actions for each form
Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
 2016-04-14 10:28:05 +01:00
Jacob Schatz c52c192249 Merge branch 'member-access-note-row' into 'master' 
Fixed issue with member access not being visible on notes

This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement

![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png)

Fixes #15049

See merge request !3618
 2016-04-12 17:21:12 +00:00
Phil Hughes 6dacf0fd6d Fixed issue with member access not being visible on notes 
Fixes #15049
 2016-04-08 16:02:13 +01:00
Annabel Dunstone e65bccfcc3 Remove comment count & icon from side by side view 2016-04-07 15:33:18 -07:00
Annabel Dunstone 04e798a515 Remove comment count & icon 2016-04-07 15:33:18 -07:00
Annabel Dunstone de63de18d7 Update diff colors and icons 2016-04-07 15:33:18 -07:00
Phil Hughes 4d463c3b0f Fixed delete comment button color 2016-04-06 09:54:49 +01:00
Phil Hughes 4d9d06ec50 Removed emoji button from notes form 2016-04-05 09:12:26 +01:00
Phil Hughes 3b4c4dd7b3 Logged out box 2016-04-04 10:48:49 +01:00
Phil Hughes 0581df2971 Discussion form 2016-04-04 10:48:49 +01:00
Phil Hughes f0d2f370cc Removed css code that isnt used 2016-04-04 10:48:49 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 38e32780a8 Hides current user icon on mobile 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 0331fa3f3d Restyling on elements in comment form 2016-04-04 10:48:49 +01:00
Phil Hughes b7f0b22b9f Started refactoring of note form 2016-04-04 10:48:49 +01:00
Phil Hughes 0c3cef02b3 Standardised the discussion headers 2016-03-31 12:58:20 +01:00
Phil Hughes e0960e2877 Changed some CSS to make it more concise & less overriding 2016-03-31 12:57:32 +01:00
Phil Hughes 9c1ce00ade Moved project access into note actions 
Created a class for note action buttons
 2016-03-31 12:57:32 +01:00
Stan Hu cc56d97d21 Fix commit comment alignment 
Closes #14780
 2016-03-30 20:13:31 -07:00
Stan Hu 191b9e3f05 Gracefully handle notes on deleted commits in merge requests 
Closes #3250
 2016-03-28 07:43:42 -07:00
Phil Hughes 7dde8b2cf0 Fix spacing below edit note form 
Also changed to allow the CSS to decide what should be hidden when editting
 2016-03-18 17:23:54 +00:00
Robert Speicher dc396d0fa4 Merge branch 'edited-text' into 'master' 
Edited timeago text on comments

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538 

See merge request !3063
 2016-03-17 20:35:06 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master' 
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
 2016-03-11 13:07:43 +00:00