Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,555 Commits 189 Branches 500 Tags 847 MiB
Commit Graph

29555 Commits

Author SHA1 Message Date
Neil Lalonde 1062d45430 recover translations for Terms of Service 2018-08-30 10:31:10 -04:00
Neil Lalonde 5a4d6f9656 Update translations 2018-08-30 09:40:31 -04:00
Joffrey JAFFEUX ceae3d0a93
fix js tests (#6343) 2018-08-30 15:09:08 +02:00
Joffrey JAFFEUX bb93179609
FEATURE: charts will now use tertiary color (#6342) 2018-08-30 14:56:11 +02:00
Joffrey JAFFEUX 90e67b671b
DEV: support for settings/locales in plugin generator (#6341) 2018-08-30 14:12:06 +02:00
David Taylor 103509b9dd SECURITY: Prevent users from modifying custom fields 2018-08-30 12:59:36 +01:00
Osama Sayegh 9efbf2c49f FIX: changing component settings should trigger refresh for parent theme CSS (#6340) 2018-08-30 20:53:03 +10:00
Joffrey JAFFEUX 3ed9533066
FEATURE: adds support for seconds in local-dates (#6339) 2018-08-30 12:38:05 +02:00
Joffrey JAFFEUX d40d241e72
DEV: adds --help --no-help options to plugin generator (#6338) 
help will add helpful comments in the various generated files
 2018-08-30 12:16:37 +02:00
Joffrey JAFFEUX acc96abe1a
DEV: plugin generator will now ask for github username (#6337) 2018-08-30 12:03:30 +02:00
Guo Xiang Tan 9c7e029d01 DEV: Attempt to stablize multisite tests. 2018-08-30 17:31:17 +08:00
Joffrey JAFFEUX 5afb09ebbe
FEATURE: displays "today" if event is... today (#6336) 2018-08-30 11:25:36 +02:00
Guo Xiang Tan f39c38d281 DEV: Support stable branch tests for `discourse-spoiler`. 2018-08-30 17:20:42 +08:00
Guo Xiang Tan 0f812aa768 Make prettier happy. 2018-08-30 15:56:30 +08:00
Guo Xiang Tan 492b6dc306 DEV: `yarn exec` doesn't do what I think it does. 2018-08-30 15:55:36 +08:00
Guo Xiang Tan a928bf4300 Revert `rails_multisite` back to `2.0.4`. 2018-08-30 15:42:51 +08:00
Guo Xiang Tan 4f81d4cc8e Minor fixes to `Jobs::BulkInvite`. 2018-08-30 15:35:16 +08:00
Vinoth Kannan 092fb0c170
Merge pull request #6333 from vinothkannans/rich-text-pasting 
FIX: Use tight list format for GDocs html to markdown
 2018-08-30 12:14:50 +05:30
Guo Xiang Tan a6319ccf21
Merge pull request #6334 from pfaffman/patch-3 
Add shadows to enable S3 backups to Digital Ocean
 2018-08-30 08:58:54 +08:00
David Taylor f0abb4d09a FIX: Allow user actions to be saved even if the post has nil user 
This issue made it impossible to delete users if they had flagged a post with nil user
 2018-08-30 01:03:32 +01:00
Sam e6970151a6 FEATURE: allow specifying locale via SSO 
Use:

locale
locale_force_update

To force user locale on users where SiteSetting.allow_user_locale is enabled

Note: If an invalid locale is specified no action will occur
 2018-08-30 09:58:03 +10:00
Jeff Atwood 22110d3106 minor copyedit on pm a/r button 2018-08-29 16:51:38 -07:00
Joshua Rosenfeld 34a5ac2fd8
Add 'discobot' to site setting description 
https://meta.discourse.org/t/where-exactly-can-i-disable-discobot/95920/3
 2018-08-29 18:29:16 -04:00
Bianca Nenciu 72ffabf619 UX: Improve email testing admin tool. (#6308) 2018-08-29 23:14:16 +02:00
Bianca Nenciu c1a5a7504e FIX: Reset email preferences controller. (#6316) 2018-08-29 23:10:56 +02:00
Jay Pfaffman 7b601ff2f8
Add shadows to enable S3 backups to Digital Ocean 
With these changes, backups to Digital Ocean spaces can be configured with the following variables:

  DISCOURSE_S3_ACCESS_KEY_ID: 'XXX'
  DISCOURSE_S3_SECRET_ACCESS_KEY: 'YYY'
  DISCOURSE_S3_UPLOAD_BUCKET: 'backups-bucket'
  DISCOURSE_S3_ENDPOINT: 'https://nyc3.digitaloceanspaces.com'
  DISCOURSE_ENABLE_S3_BACKUPS: true
 2018-08-29 12:33:05 -07:00
Vinoth Kannan 4c99acea1b FIX: Use tight list format for GDocs html to markdown 2018-08-29 16:21:31 +00:00
Kris afec673c2b Fixing test 2018-08-29 11:44:04 -04:00
Kris 8ff83d174e
FIX: Changing tag name class to data attribute (#6326) 2018-08-29 10:49:19 -04:00
Kris 6ec43f3472 FIX: poll avatar spacing too large 2018-08-29 09:11:03 -04:00
Kris 78089e3577 Removing unneeded background color 2018-08-29 08:58:28 -04:00
Joffrey JAFFEUX 06f18b0e9f
typo 2018-08-29 13:51:16 +02:00
Joffrey JAFFEUX ef36fdfb64
DEV: rails generator to create plugin skeleton (#6332) 
rails g plugin --help
rails g plugin DiscourseRacoon --author joffrey
 2018-08-29 13:32:41 +02:00
Arpit Jalan 2872b100dc bump onebox version 2018-08-29 16:55:06 +05:30
Gerhard Schlager b2cf725700 FIX: Don't try to send invite email when invite was deleted 2018-08-29 12:43:12 +02:00
Joffrey JAFFEUX bf9b7f1f25
UX: reserved_usernames should be a compact list (#6330) 2018-08-29 12:12:35 +02:00
Dax74 5f51ef27e7
Added sitemap plugin in the official list 2018-08-29 10:58:26 +02:00
Joffrey JAFFEUX 1281fb964e
FIX: prevents remove user btn to overflow parent (#6329) 2018-08-29 10:11:44 +02:00
Vinoth Kannan 26f17150e1
Merge pull request #6327 from vinothkannans/rich-text-pasting 
FIX: Keep emojis and remove clicks count on html to markdown
 2018-08-29 13:38:55 +05:30
Joffrey JAFFEUX ad34bdca09
UI: minor tweaks to new message participants list (#6328) 
* Icon for button
* Display name when editing on mobile
* Always display name on mobile when less/or 4 participants involved
 2018-08-29 10:07:49 +02:00
Vinoth Kannan fb35b0b3c3 FIX: Keep emojis and remove clicks count 2018-08-29 07:26:25 +00:00
Guo Xiang Tan 720726ea68 Use `yarn exec` when running eslint and prettier. 2018-08-29 11:03:42 +08:00
Sam 44cf3cf975 FIX: queue heartbeats in readonly modes 
If sidekiq is paused or Discourse is in readonly continue to queue
heartbeats

If we do not do that then a master process can end up reaping sidekiq
workers and causing various badness

This also impacts restore which can do weird stuff TM in cases like this
 2018-08-29 12:36:59 +10:00
Neil Lalonde 7516f5159e FIX: /rules route showed error page 2018-08-28 20:40:37 -04:00
Kris feeaac81df FIX: Mobile admin menu iOS rendering bug 2018-08-28 16:39:20 -04:00
Kris 3a4a6cb41a alignment fix 2018-08-28 16:27:34 -04:00
Kris 7deb86ad8b A more subtle mobile lightbox hint 2018-08-28 15:25:54 -04:00
Neil Lalonde 15f657309a FEATURE: Zendesk importer that uses its API to get data 2018-08-28 10:21:39 -04:00
Guo Xiang Tan 83bf641292 Use `yarn exec` on Travis to ensure we use the right version. 2018-08-28 15:14:21 +08:00
Sam 740308675b FEATURE: erode bounce score every time an email is sent 
Introduces a hidden setting (default is 0.1) that erodes bounce score
every time we send an email. This means that erratic failures are less
painful cause system auto corrects
 2018-08-28 17:02:12 +10:00