Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,522 Commits 212 Branches 500 Tags 864 MiB
Commit Graph

17522 Commits

Author SHA1 Message Date
Régis Hanol 29fbc2d7bc FIX: add missing 'user_replied_pm' translation 2016-01-19 15:47:38 +01:00
Régis Hanol 735017dd9f FIX: don't invite users with the same email as 'reply_be_email_address' 2016-01-19 15:24:34 +01:00
Sam d18085c57d Merge pull request #3962 from scossar/category-dropdown-badge-wrapper-width 
FIX: category-dropdown-menu badge-wrapper width
 2016-01-19 19:54:43 +11:00
Sam f5e84d1656 Remove SSH refs 2016-01-19 19:42:27 +11:00
Régis Hanol 522e0dc9ca Merge pull request #3964 from keepcosmos/add-s3-region 
Add new s3 region
 2016-01-19 09:16:48 +01:00
Sam 665fc44741 FIX: message_archived? not set correctly for groups 2016-01-19 18:35:46 +11:00
Sam 8d392066d8 oops (tests were running in other window but was trigger happy) 2016-01-19 18:22:59 +11:00
Sam dec40ea3cf FIX: raise proper error if system message creation fails 
FIX: skip validations when creating system messages
 2016-01-19 18:19:35 +11:00
Guo Xiang Tan 843f93594f UX: Smaller margins for category badges. 2016-01-19 13:45:18 +08:00
Guo Xiang Tan c2c1aea381 Merge pull request #3965 from tgxworld/decorate_category_hashtag 
Decorate category hashtag
 2016-01-19 11:49:32 +08:00
Guo Xiang Tan 4a7f560a35 FEATURE: Decorate category hashtag links. 2016-01-19 10:58:15 +08:00
Guo Xiang Tan 0812807a53 FIX: Use declared constant. 2016-01-19 10:58:15 +08:00
scossar a1d08cad6a use default font 2016-01-18 16:41:52 -08:00
Régis Hanol 61cc776fdd FIX: only send email notifications for regular and whisper type of posts 2016-01-19 01:39:57 +01:00
Régis Hanol 02d9ec5bde oops, should not have been commited 2016-01-19 01:01:17 +01:00
Régis Hanol 3083657358 FEATURE: better email in support 
FEATURE: new incoming_email model
FEATURE: infinite scrolling in emails admin
FEATURE: new 'emails:import' rake task
 2016-01-19 00:57:55 +01:00
Jeff Atwood d0bcea3411 better copy on read only mode 2016-01-18 14:17:38 -08:00
Jeff Atwood 28cbeaf6be add reply formatting info to new user tips 2016-01-18 14:10:14 -08:00
scossar 0c4e28cd0b pad link with border 2016-01-18 14:06:35 -08:00
Régis Hanol 8b0ffd9a88 don't bother iterating over disabled badges 2016-01-18 21:41:12 +01:00
Arpit Jalan bfa4e6b69c Update Translations 2016-01-19 01:29:19 +05:30
Robin Ward 57c3d65777 Change `d-editor` to use `_` instead of `*` for italics. 2016-01-18 14:54:54 -05:00
Arpit Jalan 4e8a2981a7 downgrade omniauth-oauth2 gem 2016-01-19 00:50:58 +05:30
Robin Ward 1f290a8336 FIX: Rebake all HTML due to handlebars upgrade 2016-01-18 12:46:54 -05:00
Arpit Jalan 85f51f8b57 update onebox version 2016-01-18 21:28:29 +05:30
Arpit Jalan cf1bd35fc6 FIX: while changing site text, old and new values can be nil 2016-01-18 20:56:14 +05:30
keepcosmos c53b4ae66d add s3 region 2016-01-18 22:50:15 +09:00
Sam e6c1f1db52 FEATURE: link to filtered badge list from notification 
When notified on a badge link to the badge page filtered on username
 2016-01-18 18:20:16 +11:00
Sam ca3e2b4da3 FEATURE: you can not drill down and see why you have badges 
Clicking on badges filters down the list to a particular user.
 2016-01-18 17:59:20 +11:00
Guo Xiang Tan a055c37939 Merge pull request #3956 from tgxworld/fix_clashing_slug 
FIX: Clashing category slug.
 2016-01-18 10:15:13 +08:00
scossar 02c3884661 box-sizing border box 2016-01-17 11:46:37 -08:00
Arpit Jalan ea1a0e31ee update onebox version 2016-01-18 00:54:21 +05:30
Dan Dascalescu a566adc5b2 Include backups among items uploadable to s3 
Enabling S3 backups comes with a warning "requires valid S3 credentials entered in Files settings". This commit amends the description of s3_access_key_id to confirm it's the correct location for backup as well as image uploads to S3.
 2016-01-16 18:08:27 -08:00
Arpit Jalan 4e269368fc Merge pull request #3960 from techAPJ/ux 
UX: set max-width for topic list
 2016-01-16 19:16:29 +05:30
Arpit Jalan 380764dc92 FIX: validate email when changing via user preferences page 2016-01-16 10:50:49 +05:30
Neil Lalonde 1fb3c2cee6 make top period chooser styled more like the heading 2016-01-15 17:55:00 -05:00
Neil Lalonde 89be23a5d4 FEATURE: show date ranges in top period chooser 2016-01-15 17:45:00 -05:00
Neil Lalonde 6e3d52901a Vanilla importer: add an option for whether vanilla_mysql.rb should convert html markup into literals 2016-01-15 16:47:05 -05:00
Robin Ward 7b755c3280 FIX: Precompiler should apply `get` magic too 2016-01-15 14:26:10 -05:00
Robin Ward 4bbbdd8dc4 SECURITY: Upgrade Ember to fix CVE-2015-7565. Also upgrade Handlebars 2016-01-15 13:57:45 -05:00
Robin Ward 7a28338a07 Revert "SECURITY: Upgrade Ember to fix CVE-2015-7565" 
This reverts commit 211521df4f.
 2016-01-15 11:39:07 -05:00
Robin Ward 211521df4f SECURITY: Upgrade Ember to fix CVE-2015-7565 2016-01-15 11:31:02 -05:00
Régis Hanol 825a01cec3 fix the build 2016-01-15 12:34:28 +01:00
Régis Hanol c9c6b09f36 FIX: allow staff members to edit staged users preferences 2016-01-15 12:16:00 +01:00
Neil Lalonde 1aa68e085e don't hide all a user's posts when staff manually blocks them 2016-01-14 15:20:26 -05:00
Arpit Jalan 6aa376576f UX: set max-width for topic list 2016-01-15 01:42:09 +05:30
Neil Lalonde b8299a2710 log when staff blocks/unblocks someone 2016-01-14 15:05:11 -05:00
Neil Lalonde 12790d8dcc FEATURE: staff can block users, which prevents them from creating topics and replies 2016-01-14 14:42:06 -05:00
Arpit Jalan 0dec98f50a FIX: CDN URL should start with protocol 2016-01-14 18:31:23 +05:30
Arpit Jalan d2c297955a FIX: use CDN URL for audio/video uploads 2016-01-14 17:44:22 +05:30