github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 10:54:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,281 Commits 190 Branches 500 Tags 938 MiB
86fcc72546
Commit Graph

2561 Commits

Author SHA1 Message Date
Sam
e9a1af0113 FIX: Do not suppress reply-to when other posts quoted 2014-07-31 11:40:02 +10:00
riking
f9ef715357 Improve email-in category settings UI 2014-07-30 09:58:41 -07:00
Sam
e7e70d14da Merge pull request #2591 from BenLubar/benlubar-edit-history-public 
add profile option for edit history visibility
 2014-07-30 14:09:10 +10:00
Sam
58e05cb083 Merge pull request #2604 from vikhyat/fix-cors 
Add Access-Control-Allow-Credentials
 2014-07-30 14:07:27 +10:00
Sam
87dd681497 FEATURE: setting suppress reply when quoting 2014-07-30 10:55:49 +10:00
Vikhyat Korrapati
2f30ce79c8 Add Access-Control-Allow-Credentials to the CORS headers. 2014-07-30 02:36:30 +05:30
Régis Hanol
5bd1dbd953 Merge pull request #2600 from fantasticfears/patch-8 
typo
 2014-07-29 12:45:09 +02:00
Régis Hanol
cd06224e82 TRIVIAL: fix flag disposition auto messages 2014-07-29 09:27:53 +02:00
Erick Guan
faaecabc62 typo 2014-07-29 11:22:28 +08:00
Sam
1c25f00615 Fix build 2014-07-29 12:47:26 +10:00
Sam
1dcc10d035 Merge pull request #2585 from riking/logster-csrf 
Suppress trackback CSRF errors from Logster
 2014-07-29 12:34:25 +10:00
Régis Hanol
bddffa7f9a FEATURE: flag dispositions normalization 
All flags should end up in one of the three dispositions
  - Agree
  - Disagree
  - Defer

In the administration area, the *active* flags section displays 4 buttons
  - Agree (hide post + send PM)
  - Disagree
  - Defer
  - Delete

Clicking "Delete" will open a modal that offer to
  - Delete Post & Defer Flags
  - Delete Post & Agree with Flags
  - Delete Spammer (if available)

When the flag has a list associated, the list will now display 1
response and 1 reply and a "show more..." link if there are more in the
conversation. Replying to the conversation will NOT give a disposition.
Moderators must click the buttons that does that.

If someone clicks one buttons, this will add a default moderator message
from that moderator saying what happened.

The *old* flags section now displays the proper dispositions and is
super duper fast (no more N+9999 queries).

FIX: the old list includes deleted topics
FIX: the lists now properly display the topic states (deleted, closed,
archived, hidden, PM)
FIX: flagging a topic that you've already flagged the first post
 2014-07-28 19:28:07 +02:00
Neil Lalonde
e639a2613e FIX: leader_requires_days_visited should allow 0 2014-07-28 12:33:55 -04:00
Sam
32cea9d8cc Feature: Show keyboard shortcuts link on desktop hamburger 
(only shows up for desktop, hides "mobile view")

If you really need mobile view add ?mobile_view=1 to end of URL (also fixed)
 2014-07-28 11:48:56 +10:00
Sam
1a6aa07611 FEATURE: editable badge groups 2014-07-27 18:22:01 +10:00
Ben Lubar
44dc4b4a17 add profile option for edit history, visible only when edit history is disabled globally. 2014-07-26 23:04:46 -05:00
Neil Lalonde
46bdd13491 FIX: too_few_topics_notice check and message should use basic_requires_read_posts site setting 2014-07-25 15:58:22 -04:00
riking
400bbb57fe Suppress trackback CSRF errors from Logster 2014-07-25 12:43:57 -07:00
Neil Lalonde
5a33e6f00c Move FAQ, Terms of Service, and Privacy Policy into topics in the Staff category. First post of those topics will be rendered on their respective pages. Site settings and content are not used for these documents anymore. Translations of the default text is moved into the standard YML files. 2014-07-25 14:41:20 -04:00
Arpit Jalan
2413da4157 Update translations 2014-07-25 19:05:28 +05:30
Sam
ec03d135fa FEATURE: allow advanced badge options in admin screen 
clean up serializer, allow simplistic preview
 2014-07-24 18:28:23 +10:00
Sam
526da15b9e Improve badge UI add links to badge descriptions 2014-07-24 12:21:24 +10:00
Neil Lalonde
b4ad70d767 FEATURE: Continue to Discourse links are now buttons, and those pages will redirect automatically after 5 seconds 2014-07-23 12:32:12 -04:00
Robin Ward
c93a7020ec Merge pull request #2565 from swalkinshaw/move-discourse-plugin 
Move discourse_plugin to lib
 2014-07-23 10:56:12 -04:00
Sam
46c406360d FIX: cors setting was broken 
Some days I wonder why we bother taking a whole gem
dependency when 10 lines of code does the job right
 2014-07-23 17:04:09 +10:00
Jeff Atwood
fc1fa2d104 Caps Lock clearly needs more exclamation sign 2014-07-22 21:15:54 -07:00
Scott Walkinshaw
7e2aa5acfb Move discourse_plugin to lib 2014-07-23 00:03:48 -04:00
Sam
b9a7d945c3 Improve badge grouping UI 
Start work on triggers
 2014-07-23 11:43:17 +10:00
Jeff Atwood
aad5d439d0 we were burying the lede on hide flag notify 2014-07-22 16:12:40 -07:00
Robin Ward
c004ad1d51 Merge pull request #2563 from techAPJ/patch-2 
FEATURE: group name is required for private topic invite
 2014-07-22 14:44:26 -04:00
Arpit Jalan
e7e823129e FEATURE: group name is required for private topic invite 2014-07-23 00:03:15 +05:30
Neil Lalonde
386b6213a5 FEATURE: warn when caps lock is on during password input 2014-07-22 13:53:58 -04:00
Jeff Atwood
b3316b9f68 minor copy error 2014-07-22 01:46:58 -07:00
Jeff Atwood
5efca54bee yet more New User Welcome Tip edits 2014-07-21 23:45:04 -07:00
Jeff Atwood
a82cad78af more New User Welcome Tip improvements 2014-07-21 22:16:10 -07:00
Jeff Atwood
a4cdf33b22 don't need giant screenshot there 2014-07-21 16:52:49 -07:00
Jeff Atwood
7f55a6b78c improved New User Welcome tips with pictures 2014-07-21 16:42:07 -07:00
Jeff Atwood
880c16982b add note about possibly losing TL3 designation 2014-07-21 15:26:10 -07:00
Neil Lalonde
7c898f2e61 FIX: topic_exists_no_oldest translation 2014-07-21 10:36:41 -04:00
Robin Ward
da717c55d7 FEATURE: Like button should act like a toggle and stay there once you've 
clicked it.
 2014-07-18 17:01:27 -04:00
Sam
ed6766ccad FEATURE: push Reader up to 100 2014-07-18 15:57:03 +10:00
Sam
c8284170ad FEATURE: badge grouping UI 
FIX: not loading more badges on badge show page
 2014-07-18 15:46:36 +10:00
Sam
1359a02128 Merge pull request #2532 from riking/sidekiq 
Pass more context from Sidekiq jobs to Logster
 2014-07-18 10:24:51 +10:00
riking
d90404e830 Change 'code' to 'message' 2014-07-17 15:19:58 -07:00
riking
12cb682548 Start passing more context to Discourse.handle_exception 2014-07-17 14:11:56 -07:00
riking
2b5a955c18 Pass more context from Sidekiq jobs to Logster 2014-07-17 11:19:59 -07:00
Robin Ward
3265360ff7 Merge pull request #2546 from riking/hide_deleted 
Hide deleted posts by default for staff
 2014-07-17 13:40:58 -04:00
riking
19b757b058 FEATURE: Hide deleted posts by default for staff 2014-07-17 10:40:15 -07:00
riking
c8d322d1be Include the email subject line in rejection messages 
This change has a tradeoff.
It increases our backscatter vulnerability - the subject could have spammy content - but it's extremely valuable to the user to know exactly which message was rejected.
If you sent two at the same time, and only one was rejected, you would have no way of knowing which worked and which to resend without going to the website (which is what email-in is trying to avoid, kinda).
 2014-07-17 10:25:53 -07:00
riking
1682f5d584 Fix message, and add test, for EmailUnparseableError 2014-07-17 10:25:53 -07:00
riking
17db265b41 Remove use of email_in_address and email_in_category 2014-07-17 10:25:13 -07:00
riking
3df3a908ac Remove email_in_address and email_in_category site settings 
The functionality is entirely covered by per-category email in addresses, and the category being a number was confusing people.
 2014-07-17 10:22:33 -07:00
Robin Ward
f06f8abedd Merge pull request #2537 from ligthyear/group-member-management-on-user 
Improved Group Member Management on User Administration
 2014-07-17 11:00:05 -04:00
Jeff Atwood
f2093fb4de omit needless words 2014-07-17 03:00:29 -07:00
Sam
1713fd4b59 Add localization for moderators snooping through PMs 2014-07-17 18:01:17 +10:00
Régis Hanol
abf97db7ad Merge pull request #2552 from techAPJ/patch-1 
Update translations
 2014-07-17 09:36:53 +02:00
Sam
e8ca1a2469 FEATURE: allow overriding badge names 
FEATURE: allow html in badge description
 2014-07-17 16:11:09 +10:00
Arpit Jalan
37981fb258 Update translations 2014-07-17 10:33:49 +05:30
Erick Guan
9c233073f2 Saved draft tip is more likely a bar instead of box. 2014-07-17 09:59:49 +08:00
Sam
20ccfbf718 FIX: up invite expiry to 30 days 2014-07-17 09:40:03 +10:00
Sam
cc5152e962 FIX: missed this setting when I amended NGINX 2014-07-17 08:39:17 +10:00
Sam
9468ebeb2e CHANGE: Mini Profiler only enabled for developers in prd 2014-07-17 08:34:41 +10:00
Sam
acee21cb6f FIX: disable cdn js debugging out of the box 
Some plugins mess it up
 2014-07-17 08:34:40 +10:00
Régis Hanol
f43293a7bc FEATURE: replace 'deleted by' with the trashcan glyph 2014-07-16 22:38:39 +02:00
Neil Lalonde
5c70d878a7 FEATURE: show a reason why a category can't be deleted 2014-07-16 15:43:51 -04:00
Régis Hanol
7dcf2a2c4f FEATURE: show the user's flagged/deleted posts 2014-07-16 21:04:55 +02:00
Neil Lalonde
939e8505a9 Remove hub username integration 2014-07-16 12:25:24 -04:00
Sam
5ad519e2bc Rename Read Faq, Read Guidelines 2014-07-16 17:55:08 +10:00
Robin Ward
f2dd35ab08 Improve the unsubscribe to digest experience. Give a link in case it 
fails, provide a different message if you are logged in as a different
user, increase expiry to 2 months from 1 week.
 2014-07-15 17:20:59 -04:00
Robin Ward
c6df00a5cc FIX: You shouldn't be able to add a parent to Uncategorized 2014-07-15 15:19:39 -04:00
Sam
4c25fedf70 FEATURE: Reader badge 
Read a every post in a topic that if 50 posts or longer
 2014-07-15 15:16:41 +10:00
Sam
cea5350a3c FIX: cache avatars in NGINX 2014-07-15 10:30:43 +10:00
Jeff Atwood
1d717088c3 improve test email copy help 2014-07-14 17:01:22 -07:00
Neil Lalonde
4f6d5d9215 FEATURE: add site settings rate_limit_new_user_create_topic and rate_limit_new_user_create_post to have different rate limits for topic and post creation for new users 2014-07-14 16:58:16 -04:00
Jeff Atwood
6412958d1e make Send Test Email easier to see 2014-07-14 13:58:06 -07:00
Neil Lalonde
766196af87 FEATURE: add site setting allow_new_registrations which can be used to block all new account registrations 2014-07-14 15:42:22 -04:00
Neil Lalonde
42dcb77d93 FEATURE: add site setting leader_links_no_follow to control whether users with trust level 3 or higher have nofollow on their links 2014-07-14 13:34:29 -04:00
Robin Ward
cce7cf8c85 FEATURE: Require Javascript to activate an account via email link 2014-07-14 12:26:10 -04:00
Gary Windham
3f6bd0606a support for EC2 IAM roles with Amazon S3 file store/backup 2014-07-14 09:14:16 -07:00
Robin Ward
c12780eb2b Merge pull request #2538 from techAPJ/patch-1 
FEATURE: disposable invite tokens
 2014-07-14 12:13:44 -04:00
Arpit Jalan
575b5e3d13 FEATURE: disposable invite tokens 2014-07-14 21:30:46 +05:30
Sam
4a2cc269ab FIX: allow selection of no title 2014-07-14 18:07:07 +10:00
Sam
88469721b9 FEATURE: Allow admins to disable specific badges 2014-07-14 17:40:36 +10:00
Jeff Atwood
49dbded250 remove title_sanitize setting 2014-07-14 00:18:02 -07:00
Jeff Atwood
a9ff3ab9ff copyedit pass on all Site Settings 2014-07-14 00:03:06 -07:00
Sam
d4cd2f1ebf FEATURE: bump upload size to 3 megs 2014-07-14 14:32:55 +10:00
Sam
6a685e822a FIX: multisite uploads broken 2014-07-14 14:26:25 +10:00
Sam
b560b11f6e FIX: add admin/logs route for right click 2014-07-14 13:21:29 +10:00
Jeff Atwood
b2d17a09ff missing translation for new site settings category 2014-07-13 13:43:44 -07:00
Benjamin Kampmann
ac3f1ba3d6 Improved Group Member Management on User Administration 
Allows for a quick and easy group membership management on the
user-administration page. Uses the select2 UI component to
autosuggest other groups, remove existing ones and lock in automatic
groups.
 2014-07-13 20:11:38 +02:00
Jeff Atwood
2a40c04480 don't need "new" here 2014-07-13 02:54:39 -07:00
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