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
Valery Sizov
004b85540f
Do not show frequently used emojis when empty
2015-12-28 10:11:05 +02:00
Valery Sizov and Valery Sizov
a1b63e1252
revert back vote buttons to issue and MR pages
2015-12-25 14:11:19 +02:00
Valery Sizov
355e62eb49
added default for frequently used emojis
2015-12-24 16:40:10 +02:00
Valery Sizov
a55b653d93
fix of frequently used emojis
2015-12-24 15:44:43 +02:00
Valery Sizov
999a374f77
Merge branch 'emoji-picker-search'into emoji_picker_frequently_used
2015-12-24 13:38:17 +02:00
Valery Sizov
5da8c1f77a
fixes after review
2015-12-24 11:57:46 +02:00
Valery Sizov
694579ce04
Merge branch 'emoji-picker-fix' into emoji-picker-search
2015-12-24 11:50:58 +02:00
Valery Sizov
b6de0d2830
Emoji picker: better alias handling
2015-12-24 11:28:55 +02:00
Valery Sizov
efe98067da
emoji picker search
2015-12-23 13:08:47 +02:00
Valery Sizov
a56d357be0
TYPO in the comment
2015-12-22 23:12:23 +02:00
Valery Sizov
a48dd40a92
base implementation of emoji picker [ci skip]
2015-12-22 23:12:23 +02:00
Valery Sizov
d794ae8e1f
add frequently used category to emoji picker
2015-12-22 23:04:19 +02:00
Valery Sizov
f049b93965
TYPO in the comment
2015-12-22 20:02:22 +02:00
Valery Sizov and Valery Sizov
2eed8007bf
base implementation of emoji picker [ci skip]
2015-12-22 16:48:55 +02:00
Valery Sizov
72b7d1f59d
emoji aliases problem
2015-12-11 13:17:12 +02:00
Grzegorz Bizon
c92b6e66dc
Scroll to awards after adding emoji-award comment
...
This makes it more intuitive, as user can see that something actually
happened after adding emoji-only comment in long discussions.
2015-12-03 13:38:59 +01:00
Valery Sizov
3fc10d46f1
Emoji bug: Invalid url to image
2015-11-22 01:51:00 +02:00
Valery Sizov
f31ee52507
Fix for Emoji
2015-11-20 11:13:43 +02:00
Valery Sizov
bdf4007cb7
adressing comments
2015-11-19 18:12:17 +02:00
Valery Sizov
23c5473cc0
added spinach tests
2015-11-19 13:20:09 +02:00
Valery Sizov
23df515fd0
Emoji: fix image of emoji when it is submitted via comment
2015-11-19 01:26:00 +02:00
Valery Sizov
Jacob Schatz
Phil Hughes
Arinde Eniola
Sandra Freihofer
Annabel Dunstone
Stan Hu
Jacob Schatz
Robert Speicher
Zeger-Jan van de Weg
Valery Sizov
Grzegorz Bizon