home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,153 Commits 48 Branches 340 Tags
15108cbaac059b341eae9d733c5ff8cb1dfbdb28
Commit Graph
75 Commits
Author SHA1 Message Date
Fatih Acet 9777a3d39d Remove accidentally duplicated line. 
🤦
 2016-05-25 16:34:39 +03:00
Fatih Acet c2bd71fda6 " ➡️ '. 2016-05-25 16:05:56 +03:00
Fatih Acet 20e6e0dbe6 Handle posting emoji only vote +1 and -1 comments. 
And remove mutual votes.
 2016-05-24 20:47:10 +03:00
Fatih Acet b0082bec73 Get award menu url from gl object. 2016-05-24 19:34:08 +03:00
Fatih Acet c697c9601d Fix award tooltip after voting. 2016-05-24 03:44:19 +03:00
Fatih Acet 1d7c3c79b1 Handle thumbsup and thumbsdown mutuality. 2016-05-24 03:10:38 +03:00
Fatih Acet 85e9eece7e Fix displaying emoji only comments. 
To render emoji in the emoji bar of an issue or MR we actually need the emoji unicode and unicode info is stored in the emoji menu widget. That widget could only be visible if user clicks the "Add" button and there may not be a widget when posting emoji only comments. So this change will check existence of the widget and create it before posting the emoji if it's not exist to render it correctly.
 2016-05-23 21:33:58 +03:00
Fatih Acet e8c8c9d7b2 Fix emoji counter issue. 2016-05-23 21:25:45 +03:00
Phil HughesandFatih Acet 783a5ae98c Adds the emoji menu to the body and then re-positions it depending on which button clicked 
This spots bugs where the menu could be in a div that has overflow hidden on ie. diff comments
 2016-05-19 14:13:16 -05:00
Phil HughesandFatih Acet 797acde046 Tooltip placement on award buttons 2016-05-19 14:12:59 -05:00
Phil HughesandFatih Acet 7d4f41efde Removed console log 2016-05-19 14:11:27 -05:00
Phil HughesandFatih Acet 9e8449b1af Hides the row in notes body when empty of emojis 2016-05-19 14:11:20 -05:00
Phil HughesandFatih Acet 25a4893215 Removes buttons in notes body 2016-05-19 14:11:10 -05:00
Phil HughesandFatih Acet f2f2e07294 Shows the bar on notes if a new award is added 
Correctly adds/removes awards in notes

# Conflicts:
#	app/models/concerns/awardable.rb
#	app/views/projects/issues/show.html.haml
#	app/views/projects/merge_requests/_show.html.haml
 2016-05-19 14:10:59 -05:00
Phil HughesandFatih Acet 0b45cf55dd Uses the same emoji-menu and just moves it around depending where it should be viewed 
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/assets/stylesheets/pages/notes.scss
#	app/helpers/issues_helper.rb
#	app/views/projects/notes/_note.html.haml
 2016-05-19 14:07:27 -05:00
Phil HughesandFatih Acet 4caf38a1d5 Refactored JS slightly to make things easier 
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/views/emoji_awards/_awards_block.html.haml
 2016-05-19 14:04:48 -05:00
Zeger-Jan van de Weg 2bbe781d8b revert front end changes 2016-05-11 22:58:01 +02:00
Zeger-Jan van de Weg d8c27e4e2b merge awards-handler.coffee from another branch 2016-05-11 22:33:27 +02:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Zeger-Jan van de Weg dccf8a9fc8 Add tests on Awardables and Award Emoji 2016-05-10 12:03:13 +02:00
Arinde EniolaandZeger-Jan van de Weg 4eb16290e4 move frontend logic from previous MR to new MR 2016-05-06 10:47:12 +02:00
Valery Sizov 311c859d11 awards_handler: single quotes 2016-04-26 11:53:56 +03:00
Valery Sizov 180c45b37e AwardsHandler follows code style conventions 2016-04-26 11:25:58 +03:00
Jacob Schatz 8fc0eed357 Merge branch 'emoji-unicode-fix' into 'master' 
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
 2016-04-25 20:04:35 +00:00
Phil Hughes 13f7ba059e Removed usage of normilizeEmojiName method 
Fixed some Ruby based on feedback
 2016-04-22 21:53:26 +01:00
Phil Hughes 319c936055 Fixes issue with emoji comments not showing correct emoji image 
Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512
 2016-04-22 17:01:53 +01:00
Phil Hughes 593f001453 Triggers blur after clicking award button 
Fixes #15511
 2016-04-22 14:38:29 +01:00
Arinde Eniola b95c9217b7 prevent users from being able to both upvote and downvote 2016-04-09 23:31:45 +01:00
Sandra Freihofer bb2214bd64 Fix award emoji picker for relative_url 
MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.
 2016-04-01 16:20:29 +02:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Phil Hughes 25f392eab7 Added 'surprise' animation 2016-03-11 09:47:47 +00:00
Phil Hughes 57a9d07716 Fixed bug with emoji search styling 2016-03-11 09:11:36 +00:00
Phil Hughes cb72f9b30c CoffeeScript style improv. 2016-03-11 09:03:08 +00:00
Phil Hughes b5f3cf8218 Moved method calls to separate lines 2016-03-11 09:03:08 +00:00
Phil Hughes e3d844984b Moved SCSS values into variables 2016-03-11 09:03:08 +00:00
Phil Hughes a7e76a6119 Updated award emoji tests 2016-03-11 09:02:43 +00:00
Phil Hughes 5e145918b4 Updated UI of award emoji 
Closes #13878
 2016-03-11 09:02:43 +00:00
Annabel Dunstone 7bb378b33d Create EmojisController 2016-02-22 20:16:00 -06:00
Annabel Dunstone b80df08735 Add timeout for ajax call in award emoji steps; update focus in award picker 2016-02-19 07:32:20 -06:00
Annabel Dunstone 074fa8f2b9 Load award emoji picker with ajax request 2016-02-18 22:02:22 -06:00
Stan Hu 7ffcc5a17b Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji 
Steps to reproduce:

1. Go to a MR or issue
2. Click on "thumbsup" Emoji 3 times
3. Observe the tooltip becomes "me, me"

Closes #13374, #12788
 2016-02-13 02:02:05 -08:00
Phil Hughes 1b97872793 Auto-focus emoji award search field 
Closes #12621
 2016-01-29 12:15:58 +00:00
Jacob Schatz e5cbd5885a Fixes issue where other emoji (not thumbup/thumbdown) were not removed 2016-01-19 15:43:04 -05:00
Jacob Schatz c426a571db Fix the situation where the user has named themselves "me" 
Stopped looking for existing user since remove functionality is fixed.
 2016-01-18 19:27:59 -05:00
Jacob Schatz c298068c45 Fix underlying issue with emoji reactions 
Issue was: blank space was rendering
as a element in an array of authors.
Element was being used by `join`.
Original fix !2450 was trying to remove the space after it happened.
This checks properly for it and only moves forward if it does not exist.
Also removes "me" upon unchecking emoji.
 2016-01-18 15:40:48 -05:00
Jacob Schatz 419bff801b Removing initial ,. 2016-01-18 13:37:26 -05:00
Jacob Schatz 62571ae1f2 Fixes tooltip doesn't duplicate the "me" name. 
Checks that "me" is not in the array of names in tooltip
 2016-01-18 13:37:26 -05:00
Robert Speicher 21ac92b8ba Merge branch 'remove-leading-comma-award-emoji' into 'master' 
Remove leading comma when user is the only one to award that emoji

Fixes #9073

See merge request !2450
 2016-01-18 18:28:39 +00:00
Zeger-Jan van de Weg 182cc843b0 Remove leading comma when user is the only one to award that emoji 
Fixes #9073
 2016-01-17 19:10:03 +01:00
Jacob Schatz 604a811f80 Fixes issue where firefox does not delete message after comment submit 
Issue was **not** in the way comment was being submitted.
`app/assets/javascripts/awards_handler.coffee` was throwing an error.
This error was preventing any js from running after it.
Fixes #1473
 2016-01-15 14:06:31 -05:00