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

17711 Commits

Author SHA1 Message Date
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 08801b835c put avatar in nested table 2016-01-17 12:36:15 -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
Jeff Atwood ffb24bf82d omit needless words 2016-01-14 00:31:57 -08:00
Arpit Jalan 69416dde96 FIX: set minimum value for email_token_valid_hours setting 2016-01-14 12:51:34 +05:30
Arpit Jalan f74f2f0b4f update Jive import script 2016-01-14 12:25:09 +05:30
Régis Hanol fc92166d5f FIX: when rouding numbers in poll resuls, *don't* select a never-been-voted-for option to round up from zero 2016-01-14 01:59:46 +01:00
Sam 1a27d887fa FIX: if topic did not save do not attempt to skip inbox 2016-01-14 10:38:20 +11:00
Régis Hanol 68026bdab3 Merge pull request #3959 from gschlager/phpbb3-importer 
Improve error handling for phpBB3 importer
 2016-01-13 23:08:54 +01:00
Gerhard Schlager 1164129edc Better error handling for polls imported from phpBB3 2016-01-13 22:57:57 +01:00
Gerhard Schlager bed9135f40 Failed file upload shouldn't crash phpBB3 importer 2016-01-13 22:56:45 +01:00
Robin Ward 166c56ee0d Merge pull request #3958 from halfstrik/master 
FIX: Incorrect subfolder authors urls when embedding
 2016-01-13 10:20:41 -05:00
Régis Hanol 50408bc7a1 Merge pull request #3957 from tgxworld/allow_opts_to_datepicker 
Allow date-picker component to be extended with custom options.
 2016-01-13 15:51:34 +01:00
Guo Xiang Tan a362ad9407 FIX: Emoji in Discourse onebox is wrapped in square brackets. 2016-01-13 19:00:11 +08:00
Guo Xiang Tan 365301fb23 FIX: Typo. 2016-01-13 18:52:59 +08:00
Guo Xiang Tan 0d51315ec0 Merge pull request #3930 from tgxworld/ux_better_representation 
UX: Improve copy for toolbar button that triggers emojis modal.
 2016-01-13 18:52:29 +08:00