Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,925 Commits 244 Branches 502 Tags 901 MiB
Commit Graph

27925 Commits

Author SHA1 Message Date
Ryan Mulligan fac4bf2f85 ignore emails that are from the reply by email addresses (#5843) 2018-05-23 10:04:45 +02:00
Sam 930ebb5684 skip failing test 2018-05-23 13:26:42 +10:00
Sam 6974b7d6a8 FIX: run deferred jobs inline in sidekiq 2018-05-23 12:05:37 +10:00
Andrew Schleifer ff15d95983 FIX s3_helper.list for buckets with folders 
s3_bucket_folder_path does not contain a trailing slash so it was
smashingstufftogether
 2018-05-22 20:09:08 -05:00
Guo Xiang Tan ad9e0d6bea
Merge pull request #5848 from OsamaSayegh/fix-social-login-groups 
FIX: apply automatic group rules when using social login providers
 2018-05-23 08:17:42 +08:00
Sam 41d37fd498 improve erratic test 2018-05-23 10:16:52 +10:00
OsamaSayegh f6d412465b FIX: apply automatic group rules when using social login providers 2018-05-23 02:26:07 +03:00
Blake Erickson 3edca8b104 Return a 403 instead of 200 when trying to delete a user with posts 
See [this commit][1] for more info

[1]: bd352a17bf
 2018-05-22 17:02:02 -06:00
OsamaSayegh 609804f5ef REFACTOR: merge posts controller specs into request specs 2018-05-23 08:53:46 +10:00
Sam 45f65859c9 improve erraticly failing spec 2018-05-23 08:39:15 +10:00
Sam 8e9531657a skip erratic test 2018-05-23 08:28:00 +10:00
Gerhard Schlager 2f0e230dba Adds import script for Zendesk 
It also adds a generic SQLite database that can be used when the data needs some transformation before the actual import.
 2018-05-22 21:55:54 +02:00
Gerhard Schlager eceeef8413 Imported categories use colors from settings instead of brown 2018-05-22 21:55:54 +02:00
Gerhard Schlager beed676b04 FIX: Check group names when checking username availability 2018-05-22 21:55:54 +02:00
Kris d19d491d65 Styling dashboard user tables 2018-05-22 15:33:06 -04:00
Neil Lalonde 79d202a73c FIX: update Indonesian translations to fix date translations 2018-05-22 12:00:34 -04:00
Joshua Rosenfeld cd8d512429
Fix user tag preferences icon 2018-05-22 11:37:18 -04:00
Joshua Rosenfeld d86bd48397
Copyedit 2018-05-22 11:14:16 -04:00
Joffrey JAFFEUX 508b65b76a
UX: refactoring/refining tables of new dashboard 2018-05-22 16:47:23 +02:00
Joffrey JAFFEUX 7285e7fbba
FIX: uses tooltip to display local dates previews 2018-05-22 13:58:06 +02:00
Gerhard Schlager 95db5f0c8c FIX: Do not replace wrong avatars when renaming user 2018-05-22 13:41:51 +02:00
Guo Xiang Tan f6becd6a4e
Merge pull request #5838 from discourse/fix-for-s3-subfolders 
FIX for bucket name in GlobalSetting with folder
 2018-05-22 18:10:44 +08:00
Joffrey JAFFEUX a0c5b48558
fix failing spec 2018-05-22 10:50:54 +02:00
Joe 48c4f192e9
FIX: make the image field use its own help string 2018-05-22 16:06:25 +08:00
Joe 3ef3b5b67a
FIX: both icon and image fields used the same string. 
Added new string for image field and edited the current string for the icon field.
 2018-05-22 16:02:50 +08:00
Sam 1ac1ee4287 FEATURE: allow registration of an array custom field 2018-05-22 16:48:39 +10:00
Sam bcfd9cf8b5 attempt to stabilize spec 2018-05-22 16:15:24 +10:00
riking d4639bc734 TEST: Add TopicLinkClick spec for ip logging 2018-05-22 16:05:38 +10:00
riking 9b0efe9c84 FIX: TopicLinkClick: do not log IP of logged in users 2018-05-22 16:05:38 +10:00
Sam 24abf38d38 PERF: lower the priority on user emails 
User emails can wait behind other regular jobs, they are usually somewhat
slower as they involve smtp transactions
 2018-05-22 15:20:55 +10:00
Sam 9e2131ace8 improve erratic test 2018-05-22 13:58:12 +10:00
OsamaSayegh 450a600721 REFACTOR: about & badge controllers => requests 2018-05-22 13:45:13 +10:00
Kris 209a8d5e31 Reucing vertical spacing for github onebox pre 2018-05-21 23:29:36 -04:00
Sam 99088f4d77 skip slow erratic test 2018-05-22 13:03:26 +10:00
Sam 3e06def856 FIX: If we have no logo defined use sketch in manifest 2018-05-22 12:10:59 +10:00
Sam 661d89f489 skip erratic spec 2018-05-22 09:42:50 +10:00
Sam 39bfd836c6 FEATURE: do not boot Ruby if not on 2.4 or up 2018-05-22 09:21:47 +10:00
Sam 788ca1f112 FIX: stop adding email to unsubscribe url 
Instead of adding email to unsubscribe url store it in redis for 1 hour
rate limit calls to unsubscribe endpoint to ensure there is no risk of
bloating redis

Also move controller to request specs
 2018-05-22 09:07:03 +10:00
Guo Xiang Tan ae3a7ca08d Fix unexpected return error. 2018-05-21 22:28:44 +08:00
Vinoth Kannan bb12fa3fdc Migrate user mentions in lithium import 2018-05-21 18:19:22 +05:30
Guo Xiang Tan 37ad2dd936 Fix the build. 2018-05-21 17:59:47 +08:00
Guo Xiang Tan aae5575d33 Remove spec file that was accidentally added. 2018-05-21 17:35:55 +08:00
Guo Xiang Tan 467d91347a Missing specs for `Group`, `Tag`, `Category` and `Flag` web hooks. 2018-05-21 17:29:58 +08:00
Guo Xiang Tan bf84037f79 FIX: Payload for webhooks should be current as of the time the event was triggered. 
https://meta.discourse.org/t/group-category-tag-user-deleted-webhooks-not-firing/87752
 2018-05-21 17:29:58 +08:00
Guo Xiang Tan cba3942850 Refactor `WebHookFlagSerializer`. 2018-05-21 17:29:58 +08:00
Guo Xiang Tan f0024f5ec7 Inherit from `BasicGroupSerializer` for `WebHookGroupSerializer`. 2018-05-21 17:29:58 +08:00
Guo Xiang Tan 00c6b078e3 Trim `WebHookUserSerializer`. 2018-05-21 17:29:58 +08:00
Guo Xiang Tan 60e7b13f59 Trim `WebHookPostSerializer` further. 2018-05-21 17:29:58 +08:00
Guo Xiang Tan 3ff0074e9d Trim `WebHookTopicSerializer` further. 2018-05-21 17:29:58 +08:00
Vinoth Kannan b229c112f6 FIX: variable name typo 2018-05-21 13:47:30 +05:30