home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,922 Commits 48 Branches 340 Tags
f2faa0078fcd1788943ca80bd2a1dca95461a0db
Commit Graph
28 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandRobert Speicher 84316761a6 Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' 
Fixes tooltip doesn't duplicate the "me" name.

Checks that "me" is not in the array of names in tooltip

![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978


See merge request !2454
 2016-01-20 13:56:54 -05:00
Robert SpeicherandRobert Speicher 6d5581743a 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 13:29:26 -05:00
Dmitriy ZaporozhetsandRobert Speicher 72a8c2b336 Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into 'master' 
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

See merge request !2452
 2016-01-17 23:14:21 -05:00
Valery Sizov 004b85540f Do not show frequently used emojis when empty 2015-12-28 10:11:05 +02:00
Valery SizovandValery 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 SizovandValery 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 SizovandValery Sizov f021bc5c6a add stats on hover 2015-11-19 01:25:59 +02:00
Valery Sizov 36d0442e83 replace emoji references from class name to data [ci skip] 2015-11-19 01:25:59 +02:00
Valery Sizov 06a4fd1035 css improvements 2015-11-19 01:25:59 +02:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00