Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,331 Commits 215 Branches 500 Tags 859 MiB
Commit Graph

23331 Commits

Author SHA1 Message Date
Régis Hanol 31b8477d8b use obj.prop syntax rather than obj[prop] syntax 2017-06-14 17:08:42 +02:00
Régis Hanol f77e6c8fc6 Merge pull request #4928 from jjaffeux/transform-native-emojis-to-names 
Transforms native emojis to valid names
 2017-06-14 15:43:09 +02:00
Joffrey JAFFEUX ab6086bce9 Transforms native skin toned emojis to valid names 2017-06-14 15:35:37 +02:00
Régis Hanol 04e175bc06 Merge pull request #4925 from jjaffeux/adds-tones-to-clear-cache 
Makes sure we clear tonable_emojis cache
 2017-06-14 14:56:41 +02:00
Régis Hanol 1ceb64500f Merge pull request #4926 from jjaffeux/fixes-mouse-three 
Uses computer_mouse as base name
 2017-06-14 14:55:48 +02:00
Régis Hanol bc52c7c9ae Merge pull request #4927 from jjaffeux/patch-1 
missing semicolon
 2017-06-14 14:55:04 +02:00
Joffrey JAFFEUX df75df7169 missing semicolon 2017-06-14 14:47:53 +02:00
Joffrey JAFFEUX baa332a83e Merge remote-tracking branch 'discourse/master' into transform-native-emojis-to-names 2017-06-14 14:39:30 +02:00
Joffrey JAFFEUX fa508042ff Makes sure we clear tonable_emojis cache 2017-06-14 11:11:02 +02:00
Joffrey JAFFEUX 252c811dae Uses computer_mouse as base name 2017-06-14 11:10:09 +02:00
Régis Hanol f943efe1a9 remove use of soon-to-be-deprecated 'Discourse.SiteSettings' (cc @eviltrout) 2017-06-14 10:02:13 +02:00
Régis Hanol 485de2fcc3 Merge pull request #4924 from jjaffeux/cook-toned 
adds tones to woman_cook and man_cook
 2017-06-14 09:25:48 +02:00
Régis Hanol 493ab9d10e Merge pull request #4923 from jjaffeux/fixes-automobile-emoji-not-displayed 
Fixes automobile being an alias now
 2017-06-14 09:25:10 +02:00
Joffrey JAFFEUX 44e152d750 adds tones to woman_cook and man_cook 2017-06-14 08:35:11 +02:00
Guo Xiang Tan f6060bfbf6 Invite admins to automatic backups failure topic. 
https://meta.discourse.org/t/if-automatic-backup-fails-there-should-be-a-warning/64461
 2017-06-14 15:01:11 +09:00
Guo Xiang Tan 2fdf9068eb FIX: Create notification for group users when group has been invited. 
https://meta.discourse.org/t/inviting-a-group-to-a-message-does-not-trigger-a-notification-mail/50509
 2017-06-14 14:53:49 +09:00
Joffrey JAFFEUX 03f3612884 Fixes automobile being an alias now 2017-06-14 07:50:36 +02:00
Guo Xiang Tan 5ce8d7a8c5 Log all errors during clean up as well. 2017-06-14 11:03:50 +09:00
Robin Ward 867cefc492 Ember.K was deprecated, so let's remove it. 2017-06-13 15:59:48 -04:00
Robin Ward 74858fd450 FIX: Don't show emoji selector when ending a line with a colon 2017-06-13 14:25:31 -04:00
Joffrey JAFFEUX 299339a373 Fixes emoji name to code missing tones 2017-06-13 14:10:26 -04:00
Robin Ward 13f89a53a3 FIX: Autocomplete wasn't showing up for PM user selection 2017-06-13 13:23:27 -04:00
Arpit Jalan 34996b4eff FIX: show invite validation error message in response 2017-06-13 22:41:53 +05:30
Robin Ward 009f0921dc FEATURE: Whitelist hosts for internal crawling 2017-06-13 12:59:54 -04:00
Sam 826f332766 Merge pull request #4901 from jjaffeux/emoji-5.0 
Emoji next
 2017-06-13 11:12:41 -04:00
Régis Hanol 5d63a7f4a6 FIX: pull hotlinked images even when they have no extension 2017-06-13 13:27:05 +02:00
Guo Xiang Tan a5d3abc9b6 FIX: Create group membership request on behalf of user. 2017-06-13 17:49:21 +09:00
Guo Xiang Tan c5caa9cf71 Revert "FIX: Disable request membership button if user does not have sufficient trust level." 
This reverts commit 5f441a2614.
 2017-06-13 17:49:21 +09:00
Arpit Jalan baf635c06e UX: better accept invite page on mobile 2017-06-13 07:27:22 +05:30
Régis Hanol 5f6c859744 missing semicolon 2017-06-12 23:01:38 +02:00
Régis Hanol 54e8fb0d89 FEATURE: new 'allow_staff_to_upload_any_file_in_pm' site setting 2017-06-12 22:41:29 +02:00
Neil Lalonde 16475bae89 padding below suggested topics on mobile 2017-06-12 15:46:10 -04:00
Robin Ward 2ff850d446 FIX: If forcing a refresh, don't return a onebox preview 2017-06-12 14:05:59 -04:00
Neil Lalonde 0b41046238 don't force SiteSetting.title into meta title tag 2017-06-12 13:50:50 -04:00
Robin Ward a3729b51eb FIX: Always allow the host the forum is hosted on 2017-06-12 13:22:51 -04:00
Neil Lalonde eaeae0ac31 Version bump to v1.9.0.beta2 2017-06-12 12:48:24 -04:00
Robin Ward bd70656b90 FIX: Oneboxing root domains could stop previewing 2017-06-12 12:13:29 -04:00
Arpit Jalan 4112c2b883 Update translations 2017-06-12 21:24:40 +05:30
Arpit Jalan 545c0ab056 Merge pull request #4918 from techAPJ/user-fields-invite 
FEATURE: add required user fields to invite accept form
 2017-06-12 21:06:22 +05:30
Arpit Jalan b9c94aa234 FEATURE: add required user fields to invite accept form 
UX: make "accept invitation" page consistent with sign up modal
 2017-06-12 20:43:07 +05:30
Blake Erickson 9b8bf9c18c reverting add readonly to site settings 
see this commit for more details:

2ffddfb32c (commitcomment-22480952)
 2017-06-12 06:53:57 -06:00
Guo Xiang Tan eab3562864 Merge pull request #4905 from tgxworld/strip-zero-width-chars-from-search-term 
FIX: Strip zero-width characters from search terms.
 2017-06-12 18:01:02 +09:00
Guo Xiang Tan 3acc9941dd Merge pull request #4920 from greysteil/dependabot/bundler/mail-2.6.6 
Bump mail from 2.6.6.rc1 to 2.6.6
 2017-06-12 18:00:08 +09:00
Guo Xiang Tan 5994c85ea9 FIX: Raise the right error when email params is missing. 2017-06-12 17:48:32 +09:00
Guo Xiang Tan 23420c0817 Merge pull request #4919 from tgxworld/allow_emails_to_be_skipped_for_a_notification 
UX: Don't send emails for discobot notifications.
 2017-06-12 17:11:58 +09:00
Guo Xiang Tan e888369f51 UX: Don't send emails for discobot notifications. 2017-06-12 17:00:27 +09:00
Guo Xiang Tan 41365f681c Pin eslint to version 3.x on travis. 2017-06-12 15:20:47 +09:00
Arpit Jalan 70927d57ec FIX: wrong reset password link for zh_CN locale 2017-06-12 11:39:09 +05:30
Guo Xiang Tan 666e3e2890 Fix eslint. 2017-06-12 14:48:50 +09:00
Guo Xiang Tan a7ed6bd9e1 Use `User#username_lower` instead. 2017-06-12 10:58:31 +09:00