Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,573 Commits 210 Branches 500 Tags 857 MiB
Commit Graph

2420 Commits

Author SHA1 Message Date
Jeff Atwood 7cfcad5636 add 'login' section to site_settings 2014-07-13 02:23:31 -07:00
Jeff Atwood 4093120ddf distinct FAQ vs guidelines copy 2014-07-11 23:49:51 -07:00
Sam 038b2ceca7 Merge branch 'master' of github.com:discourse/discourse 2014-07-12 11:11:20 +10:00
Sam fb335560f8 FIX: appears broken in multisite 2014-07-12 11:11:12 +10:00
Jeff Atwood d19a0bc06c add safety for max levenshtein spammer distance 2014-07-11 17:19:45 -07:00
Régis Hanol edba5c631f FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-12 01:59:43 +02:00
Régis Hanol b526cdc55c Revert "FEATURE: reject accounts created with an email address similar to a known spammer email" 
This reverts commit 39be48a441.

Conflicts:
	spec/models/screened_email_spec.rb
 2014-07-12 01:01:37 +02:00
riking 783454ebe1 Fix /p/post/user route not saving referrals 
Make user id optional for /p/id/uid
Add /posts/id/raw route for debugging failed post processing
 2014-07-11 14:44:07 -07:00
riking 07d8d5ed75 Change default email_in minimum trust to 2 
Also, rename MinTrustToCreateTopicSetting to TrustLevelSetting, and apply it to more settings
 2014-07-11 12:35:59 -07:00
Régis Hanol 39be48a441 FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-11 15:09:46 +02:00
Sam d9768a6195 FIX: pretending to support too many accelerated files 
This broke sidekiq web

(sidekiq serves resources out of /vendor/ path)
 2014-07-11 18:47:55 +10:00
Sam 833c50c460 FEATURE: Read Faq badge 2014-07-11 17:32:29 +10:00
Sam 89fc989adb FEATURE: First Quote badge 2014-07-11 14:17:43 +10:00
Jeff Atwood ed3bebfebe switch /faq to /guidelines in a bunch of places 2014-07-10 15:30:58 -07:00
Jeff Atwood 93c4067ab3 initial "Welcome to the Lounge" copyedit 2014-07-10 14:08:09 -07:00
Arpit Jalan 842f317d62 Update translations 2014-07-11 01:37:19 +05:30
Neil Lalonde fd55a3fd66 FEATURE: add a welcome topic to the Lounge category. Copy needs to be improved. 2014-07-10 15:13:18 -04:00
Neil Lalonde e565ae2528 FEATURE: /guidelines route will always show our FAQ, ignoring the faq_url site setting 2014-07-10 12:58:41 -04:00
Neil Lalonde 21d3785622 Merge pull request #2517 from ninjasphere/fix_avatar_refresh_task_name 
FIX: avatars:regenerate rake task is now avatars:refresh
 2014-07-10 11:31:52 -04:00
Neil Lalonde c6a313d458 Seed categories with capitalized names 2014-07-10 11:28:49 -04:00
Jeff Atwood a56db77172 copyedit 2014-07-10 00:43:41 -07:00
Sam 6019e3f257 FIX: remove hardcoding from middleware stack so we can control it 2014-07-10 17:01:21 +10:00
Sam 5032c96486 FIX: disable x accl redirect for CDN assets 
We need to keep headers in tact
 2014-07-10 16:32:46 +10:00
Jeff Atwood e4a7f652cc grammar tweak. It's shorter too! 2014-07-09 23:08:01 -07:00
Jeff Atwood 4654bb3688 Merge pull request #2524 from techAPJ/patch-3 
Improve invite email copy
 2014-07-09 22:47:23 -07:00
Jeff Atwood 3deba15c18 minor copyedits 2014-07-09 22:35:50 -07:00
Arpit Jalan 2f6c984c8c Improve invite email copy 2014-07-10 10:57:40 +05:30
Sam 103e2ebba9 FIX: properly support sendfile on all routes 
FIX: disable unused etags
 2014-07-10 15:18:51 +10:00
Jeff Atwood 95282a4c6d add badge glyph to edit button 2014-07-09 22:01:03 -07:00
Arpit Jalan 8395da5bd0 FIX: include topic title and domain name in topic invite mail 2014-07-10 10:05:28 +05:30
Sam 2f8d139ec0 BUGFIX: incorrect ordering in category permissions 
FEATURE: UI for categories that we allow badges on
 2014-07-10 12:02:16 +10:00
Sam 928848c0a8 FEATURE: First Link badge 2014-07-10 12:02:16 +10:00
Neil Lalonde 362adb0498 FIX: add site setting email_site_title, which overrides title in reply by email address in case the title has invalid characters 2014-07-09 16:44:18 -04:00
Jeff Atwood 0a643353cf slight improvements to invite email copy 2014-07-09 12:57:04 -07:00
Jeff Atwood 71b18ce5e2 minor copyedit on invites 2014-07-09 12:45:01 -07:00
Arpit Jalan 223bbc3da3 FEATURE: include topic context in topic invite 2014-07-09 21:23:20 +05:30
Régis Hanol 6b45b635f8 FIX: properly whitelist <code> classes needed for syntax highlighting 2014-07-09 16:27:47 +02:00
Sam 9c14385a86 FEATURE: explain which badges can be titles 2014-07-09 16:03:53 +10:00
Sam e32e96dabb FEATURE: new badges 
- Pay it forward renamed to first like
- First flag
- First share
 2014-07-09 12:17:39 +10:00
Jeff Atwood 0317e503b3 minor copyedit 2014-07-08 17:00:50 -07:00
Jeff Atwood 1c3dff2013 we don't use %{site_password} any more 2014-07-08 16:58:39 -07:00
Neil Lalonde df8b25d2f5 FEATURE: don't demote trust level 3 users who were promoted less than SiteSetting.leader_promotion_min_duration days ago 2014-07-08 17:39:49 -04:00
Jeff Atwood fd36142895 minor copyedit on email-in 2014-07-08 12:16:08 -07:00
Jeff Atwood aca592b99c a few copyedits on bulk user invites 2014-07-08 11:09:43 -07:00
Jeff Atwood 432f055315 none of this em@ail.com nonsense 2014-07-08 10:23:18 -07:00
Jeff Atwood b175eee89f semi-colon-ing it up 2014-07-08 00:04:01 -07:00
Sam ebe3ee0b1c FIX: serve statically compressed files when available 
PERF: default gzip to level 5
 2014-07-08 16:45:44 +10:00
Jeff Atwood e407c3df71 better copy for summarize topic 2014-07-07 22:26:32 -07:00
Elliot Shepherd 2762bc7be5 FIX: avatars:regenerate rake task is now avatars:refresh 2014-07-08 15:17:48 +10:00
Sam efd6bf1490 FIX: set last modified date on CDN assets 2014-07-08 14:48:20 +10:00
Sam 81682b74b7 Feature: Paying it forward badge 2014-07-08 14:26:53 +10:00
Régis Hanol 59b5ba7c0f BUGFIX: IP lookup wasn't working when using HTTPS 
REFACTOR: the ip locator into a ip-lookup component
 2014-07-07 22:18:18 +02:00
Sam 0f25bbeaf7 FEATURE: Editor badge 2014-07-07 17:55:40 +10:00
riking 680f057d8b Add notes about invites to SSO and local login settings 2014-07-05 12:55:48 -07:00
Jeff Atwood 8de5f014fc FEATURE: fit a bit more on the progress bar 2014-07-04 02:44:49 -07:00
Sam 5b310c21b4 FIX: less crazy error when post exceeds max length. 2014-07-04 16:39:15 +10:00
Jeff Atwood 35bd25c626 very minor copyedit 2014-07-03 16:50:03 -07:00
riking 9ad9e95d11 Alias /guidelines to /faq 2014-07-03 13:06:04 -07:00
Jeff Atwood c74e60ec51 add Discourse site link to version emails 2014-07-03 12:53:00 -07:00
Jeff Atwood fba2a00265 very minor copy update 2014-07-03 12:50:50 -07:00
riking 0d4163e0a2 FEATURE: Nice error handling page 2014-07-03 07:52:14 -07:00
Sam 0de564f598 Correct reqs 2014-07-03 22:34:45 +10:00
Sam 6bbb083d47 FEATURE: support "unlisted" badges. 2014-07-03 17:44:36 +10:00
Sam db34b534e6 Merge pull request #2494 from techAPJ/bulk-invite-4 
FEATURE: support txt file to be uploaded for bulk invite
 2014-07-03 17:33:16 +10:00
Sam 9a9ad9bda8 FEATURE: Badge progress 
- Refactor model so it stores backfill query
- Implement autobiographer
- Remove sample badge
- Correct featured badges to only include a badge once
 2014-07-03 17:29:44 +10:00
Jeff Atwood 162b5abae6 don't need thanks here 2014-07-02 15:13:34 -07:00
Neil Lalonde 337630a216 Update translations 2014-07-02 16:42:59 -04:00
Arpit Jalan 85ba55dc26 FEATURE: support txt file to be uploaded for bulk invite 2014-07-02 19:21:15 +05:30
Jeff Atwood df59f0a6e1 add one more SPF syntax link to email test 2014-07-02 01:03:30 -07:00
Jeff Atwood 89adbae3ca better email deliverability guidance 2014-07-02 01:01:04 -07:00
Sam 58ada6f847 FEATURE: enable badges by default. 2014-07-02 12:32:16 +10:00
Sam 60d93a62f6 FIX: tighten up email token durations 2014-07-02 09:08:25 +10:00
Jeff Atwood c40d999407 better generic "posting error" in email replies 2014-07-01 15:40:12 -07:00
Robin Ward 1f829c4e70 WIP: New site setting to show subcategory list on category list 2014-07-01 17:12:03 -04:00
Jeff Atwood 7f817526c6 better copy for site update notice modal 2014-07-01 13:10:40 -07:00
Neil Lalonde 292e9bb611 TL3: Add requirements for min all-time topics viewed, and min all-time posts read 2014-07-01 13:34:57 -04:00
Robin Ward d9e583af1a FEATURE: Add new site setting to restrict how many times you can click on an 
invite to "passthrough" as logged in, with a default of 0 hours. Also changes
default invite expiry from 7 days to 1.
 2014-07-01 12:52:52 -04:00
Jeff Atwood a60a1c0181 we were burying the lede on Tracking, update copy 2014-07-01 02:27:57 -07:00
Jeff Atwood 0847767a7f marked? wtf, we mean "flagged" 2014-06-30 22:51:30 -07:00
Régis Hanol 15120bb583 FEATURE: add staff counters on user profile 2014-06-30 22:46:47 +02:00
Robin Ward e22688a204 FEATURE: Can upload images to categories 2014-06-30 14:14:00 -04:00
Robin Ward 9000c358d1 REFACTOR: Use common path for RESTful `DELETE` action from upload image 
component
 2014-06-30 14:13:59 -04:00
Robin Ward 4088fba4f2 REFACTOR: Convert profile background uploader to be an ember component 2014-06-30 14:13:59 -04:00
Régis Hanol dcd0b8fecf BUGFIX: no translation for email_error_notifications to admin users 2014-06-30 15:21:26 +02:00
Arpit Jalan 923fa4646b Update Translations 2014-06-30 16:21:43 +05:30
Neil Lalonde 807bfbd9bb FEATURE: Trust level 3 promotion and demotion. Job is disabled for now. 2014-06-27 18:42:03 -04:00
Robin Ward 386a45aab7 Merge pull request #2479 from vikhyat/badge-system 
Badge system updates
 2014-06-27 15:09:04 -04:00
riking da9048f3ea Fix email code & tests 2014-06-27 12:04:31 -07:00
Jeff Atwood 0051cd8919 better copy for email errors 2014-06-26 16:05:14 -07:00
Neil Lalonde b69bc5a5f5 Trust level 3 measurements redone 2014-06-26 17:33:22 -04:00
Arpit Jalan dad2d34d02 Refactor methods post feedback 2014-06-26 22:50:09 +05:30
Sam 67804cb56b Merge pull request #2465 from riking/email_rejections 
Give specific message for each kind of email rejection
 2014-06-26 09:55:24 +10:00
Jeff Atwood 18a2e7901e add note about dupe spf and txt records 2014-06-25 13:38:41 -07:00
Jeff Atwood 2e62ab6f02 add default Uncategorized desc 2014-06-25 12:21:29 -07:00
Neil Lalonde 27fb65b562 Add uncategorized_description site setting 2014-06-24 17:45:34 -04:00
Jeff Atwood 2d2e12fd08 minor copyedits on 404 page 2014-06-24 13:16:22 -07:00
Jeff Atwood d7fe4d4997 minor copyedit 2014-06-24 02:29:26 -07:00
Sam c23a4fcbee FEATURE: flag resolution in admin screen 2014-06-24 13:20:57 +10:00
riking 222db71dd7 Cleanup 2014-06-23 17:48:51 -07:00
riking 8b5d2b835a Add case for bad reply key 2014-06-23 17:46:22 -07:00