Sam
eb91a0c9df
Merge pull request #1012 from ZogStriP/extract-imgur-support-to-a-gem
...
Extract imgur support to a gem
2013-06-11 16:59:53 -07:00
Chris Hunt
a362d62b42
Do not return mail password in EmailController
2013-06-11 16:00:13 -07:00
Régis Hanol
8a2d635e62
removed imgur support
2013-06-11 21:51:41 +02:00
Neil Lalonde
82b5f57e40
Make it possible to set a site setting to empty string
2013-06-11 14:31:38 -04:00
Neil Lalonde
811a0df68b
Make s3 region site setting a drop down
2013-06-11 14:24:04 -04:00
Neil Lalonde
5ff7e570ac
Add support for enum site settings that render as a dropdown; use a dropdown for default_locale
2013-06-11 11:40:14 -04:00
Sam
c2cfbce9ce
automatically updating times for posts on topic
...
moved moment.js into localization file (we need to localize it)
added helpers for date formatting use, moment().shortDate() moment().longDate() moment().shortDateNoYear()
2013-06-11 17:25:50 +10:00
Sam
fa8a84f20c
removed sugar.js, port functionality to moment and underscore.js
...
bring in latest ace from local so we don't mess up with https
2013-06-11 15:27:26 +10:00
Robin Ward
ab5507ac06
Merge pull request #1002 from chrishunt/add-stack-exchange-onebox
...
Add Stack Exchange onebox
2013-06-10 12:38:03 -07:00
Robin Ward
93bbe190c0
Moved Email components into a module
2013-06-10 15:34:10 -04:00
Neil Lalonde
9b1d0baf45
Send a message to moderators when a newuser_spam_host_threshold is exceeded. Send it no more than once per day per user.
2013-06-10 13:17:32 -04:00
Chris Hunt
1fb0b424ed
Add Stack Exchange onebox
2013-06-10 09:27:13 -07:00
Robin Ward
68d849419b
FIX: Don't email '(user deleted)' posts. Seriously.
2013-06-10 12:02:04 -04:00
Robin Ward
ad6705cca7
Update Ember to latest master (RC5)
2013-06-10 10:14:42 -04:00
Jeff Atwood
b4a4774165
extend consumer email warning to yahoo & outlook
2013-06-10 00:08:06 -07:00
Chris Hunt
15efecd536
Remove html rendering test for commit onebox
...
This is a very brittle test. We want to be able to change our markup
without breaking tests.
2013-06-09 21:32:13 -07:00
Sam
cbec9efc16
Merge branch 'master' of github.com:discourse/discourse
2013-06-10 09:48:51 +10:00
Chris Hunt
d741798d9c
Add onebox for GitHub pull requests
2013-06-08 11:01:06 -07:00
Sam
9aa2cc2262
extra spec
2013-06-08 23:56:40 +10:00
Sam
1756f713d6
SECURITY HOLE, upgrade right away if you are using Secure Groups.
2013-06-08 23:52:06 +10:00
Robin Ward
b2a6755a48
Merge pull request #984 from Supermathie/moreentropy
...
More entropy for foreign titles
2013-06-07 14:23:26 -07:00
Michael Brown
bb77d2c38b
More entropy for foreign titles
...
* Treat strings with non-ASCII characters as having more entropy
2013-06-07 14:47:07 -04:00
Neil Lalonde
169125e96d
Fix a case where a random topic with null slug will be rendered instead of 404
2013-06-07 14:30:26 -04:00
Robin Ward
1b5ec42173
FIX: Regression where a topic rollback would not properly report errors to the client.
2013-06-07 12:36:37 -04:00
Robin Ward
3ae72259a6
Merge pull request #979 from iancmyers/strong-parameters
...
All parameters for #create in PostsController pass through strong_parameters
2013-06-07 09:17:29 -07:00
Ian Christian Myers
b61e10f9ad
All parameters for #create in PostsController pass through strong_parameters.
...
We are now explicitly whitelisting all parameters for Post creation. A nice side-effect is that it cleans up the #create action in PostsController. We can now trust that all parameters entering PostCreator are of a safe scalar type.
2013-06-07 01:29:25 -07:00
Sam
5fa20ce357
more progress towards full migration to moment.js
2013-06-07 18:27:42 +10:00
Chris Hunt
f6ce985121
Send activation email after user approved
2013-06-06 18:37:25 -07:00
Chris Hunt
93fc0e74bc
Test correct login behavior when pending approval
2013-06-06 18:36:16 -07:00
Chris Hunt
41b0692543
Show 'waiting approval' and don't send email
...
When 'must approve users' in enabled, we don't want to send an
activation email to users after they sign up. Instead, we will show them
'waiting approval' and not take an action until their account is
approved by an admin.
2013-06-06 18:36:16 -07:00
Chris Hunt
e7b38fb188
Move duplicated request to helper method
2013-06-06 18:36:16 -07:00
Chris Hunt
4a182f8bba
Fix spec doc; sends welcome email for active users
2013-06-06 18:36:16 -07:00
Sam
a5a229598d
missed a spot
2013-06-07 09:17:34 +10:00
Neil Lalonde
564d242832
Notify moderators when someone is automatically blocked because of spam flags
2013-06-06 18:49:19 -04:00
Sam
11afa0c11b
work in progress migrate to moment
2013-06-07 08:49:22 +10:00
Neil Lalonde
a151bfc7ec
Store when a topic was first set to auto-close and report that amount of time when it closes. And do some refactoring.
2013-06-06 17:04:21 -04:00
Neil Lalonde
62041da7e0
Handle /t/only-the-slug urls by trying to find the topic by slug (second try)
2013-06-06 14:41:37 -04:00
Robin Ward
b062b4a98e
Unapproved users should not receive digest emails. Fixes #974
2013-06-06 11:45:18 -04:00
Robin Ward
bac03a3369
Merge pull request #975 from jd-erreape/username_refactor
...
[WIP] Refactored user_name suggestion methods into a module
2013-06-06 08:12:29 -07:00
Juan de Dios Herrero
96d23ddd8d
Refactored user_name suggestion methods into a module to reduce the complexity of User model
2013-06-06 16:40:10 +02:00
Ian Christian Myers
0d01c33482
Enabled strong_parameters across all models/controllers.
...
All models are now using ActiveModel::ForbiddenAttributesProtection, which shifts the responsibility for parameter whitelisting for mass-assignments from the model to the controller. attr_accessible has been disabled and removed as this functionality replaces that.
The require_parameters method in the ApplicationController has been removed in favor of strong_parameters' #require method.
It is important to note that there is still some refactoring required to get all parameters to pass through #require and #permit so that we can guarantee that parameter values are scalar. Currently strong_parameters, in most cases, is only being utilized to require parameters and to whitelist the few places that do mass-assignments.
2013-06-06 00:30:59 -07:00
Robin Ward
a3d62fdf69
Temporarily roll back ember rc5. We identified some things we need to fix.
2013-06-06 01:25:43 -04:00
Sam
2ca734c118
Merge pull request #964 from chrishunt/exclusive-club
...
Add 'invite only' site setting
2013-06-05 16:38:47 -07:00
Robin Ward
6384518599
Allow images in the daily digest for top scoring posts
2013-06-05 18:55:27 -04:00
Robin Ward
0b97ea6345
Better HTML emails, smarter email digests, new email section in admin with digest preview
2013-06-05 17:47:25 -04:00
Neil Lalonde
f030d9b420
Make default_logo_check more smarter
2013-06-05 16:59:19 -04:00
Neil Lalonde
4e8ff74b99
Show dashboard warning when favicon and/or logo urls contain the same filename as the shipped defaults
2013-06-05 16:43:39 -04:00
Neil Lalonde
b55182b983
Use PostDestroyer when deleting all of a user's posts; deleting a post removes its flags and resets its flag counts
2013-06-05 16:05:13 -04:00
Robin Ward
dfba2b6e0a
FIX: Strip links from google indexed bios when the users are new.
2013-06-05 15:28:10 -04:00
Robin Ward
729e4080a6
Merge pull request #958 from ZogStriP/fix-have-onebox-ignore-internal-links
...
FIX: Have onebox ignore internal links
2013-06-05 12:09:53 -07:00
Robin Ward
112d57e899
Merge pull request #960 from iancmyers/strong-parameters
...
Began implementing strong_parameters
2013-06-05 12:03:17 -07:00
Régis Hanol
01855b70b4
FIX: Have onebox ignore internal links
2013-06-05 20:53:07 +02:00
Chris Hunt
acf147ef88
Disable OmniAuth account creation if 'invite only'
2013-06-05 11:11:02 -07:00
Chris Hunt
d432798ff8
Silently fail if user tries to sneak in
...
When 'invite only' is enabled, there's no way for a user to create an
account unless they try and sneak in by POSTing to /users/. We will
silently fail if this happens.
2013-06-05 11:08:21 -07:00
Robin Ward
a0bd51862e
Upgrade Ember to RC5. Disabled a deprecation warning that I believe is in error.
2013-06-05 12:07:18 -04:00
Ian Christian Myers
41528f5d11
Implemented strong_parameters for Upload/UploadsController.
...
The topic_id param is now required using strong_parameters' #require method. If the parameter is missing ActionController::ParameterMissing will be raised instead of Discourse::InvalidParameters.
2013-06-05 00:55:55 -07:00
Ian Christian Myers
f50b648844
Implemented strong_parameters for PostAction/PostActionsController.
...
PostActionsController now uses strong_parameters' #require to require certain parameters. ActionController::ParameterMissing is now thrown when a reqired parameter is missing, rather than Discourse::InvalidParameters.
2013-06-05 00:23:51 -07:00
Ian Christian Myers
3b245031a4
Implemented strong_parameters for Invite/InvitesController.
...
The email parameter is now required using strong parameters and will throw ActionController::ParameterMissing if it is missing. If the email address is incorrect or invalid, Discourse::InvalidParameters will still be thrown.
2013-06-05 00:04:03 -07:00
Ian Christian Myers
130d837952
Implemented strong_parameters for Category/CategoriesController.
...
Category now requires parameters to be permitted by strong_parameters using #require or #permit for mass-assignment. Missing required parameters now throw a ActionController::ParameterMissing execption instead of the Discourse::InvalidParameters execption.
2013-06-04 23:45:25 -07:00
Sam
870e59883b
secure the links on the topic pages, eliminated deleted topics as well.
2013-06-05 16:10:26 +10:00
Sam
74502172f3
speed up test
2013-06-05 12:48:34 +10:00
Sam
9a57aaaaa9
fix encoding for category excerpt
...
fix missing secure category topics in categories page
2013-06-05 11:22:47 +10:00
Sam
21b3359ea4
Merge pull request #957 from chrishunt/chrishunt/lock-down-the-base
...
Add 'login required' site setting
2013-06-04 17:22:08 -07:00
Sam
56ee7cdc1f
Merge pull request #956 from ZogStriP/fix-image-upload-to-s3
...
fix image uploads on s3/imgur
2013-06-04 16:34:42 -07:00
Sam
5f85aaee1d
correct message bus regression
...
implement automatically updating dates in list
2013-06-05 09:32:44 +10:00
Chris Hunt
978785720a
Redirect to root after login if no path provided
...
If we do not do this, then people that login from /login will just be
redirected back to the login page. We'd rather have them see the root
path.
2013-06-04 16:10:10 -07:00
Chris Hunt
92a4828f72
Redirect all controllers to login if required
...
We want to skip the filter for sessions controller so that we can login
and we want to skip the filter for static pages because those should be
visible to visitors.
2013-06-04 16:10:10 -07:00
Régis Hanol
e3e55d4dad
fix image uploads on s3/imgur
2013-06-05 00:35:42 +02:00
Neil Lalonde
2465c9c724
Add min_private_message_title_length site setting so private messages can have short titles
2013-06-04 17:59:23 -04:00
Robin Ward
4392a17b54
Strip out links when displaying a new user's bio
2013-06-04 12:06:25 -04:00
Neil Lalonde
c4904aacc0
Automatically flag someone as a spammer if their posts get at least X spam flags from N users while their trust level is 'new user'. Staff can clear and set this status from the user record in admin.
2013-06-03 16:37:40 -04:00
Sam
ef976ba891
fix pending tests
2013-06-03 17:07:44 +10:00
Sam
8b69ee26ff
forking in passenger was bust, message bus subscriptions would stop working after fork
2013-06-03 16:50:30 +10:00
Sam
da22c0f359
omit single quotes from slug
2013-06-03 09:08:34 +10:00
Navin
cab3502c15
Replace PostAnalyser module with a class
...
Encapsulate Post#cooked_document as well
Include specs for PostAnalyzer class
2013-06-01 14:59:27 +02:00
Robin Ward
545dbfc07e
New Feature: Staff can choose to "Take Action" when flagging to immediately reach hiding
...
thresholds.
2013-05-31 17:39:32 -04:00
Robin Ward
d23ef1d090
FIX: You could update a topic to have a title that's too short if the TextCleaner
...
removed extra characters. Additionally, updating the title will not return an error
message to the client app if the operation fails (rather than failing silently.)
2013-05-31 15:24:13 -04:00
Robin Ward
9ba25b2b61
Merge pull request #934 from ZogStriP/fix-upload-specs
...
Fix upload specs
2013-05-31 09:56:45 -07:00
Neil Lalonde
e0dae88885
remove specs for redirect_to_show, i'll figure out how to do this properly later
2013-05-31 12:10:07 -04:00
Régis Hanol
bf6b846c0b
Fix upload specs
2013-05-31 17:51:22 +02:00
Sam
d00ba60ad3
file is uploaded but hash is not matching ... why?
2013-05-31 15:04:01 +10:00
Sam
41187a5de1
Merge pull request #931 from ZogStriP/more-file-upload-test-coverage
...
added more file uploads test for better coverage
2013-05-30 21:36:33 -07:00
Sam
037cbfd648
Merge pull request #926 from netzpirat/fix-s3-images
...
Don't append the base url to absolute image urls without protocol.
2013-05-30 21:33:37 -07:00
Sam
e5f8297670
Merge pull request #928 from jd-erreape/master
...
Refactored some class methods to scopes in order to achieve a better 'Rails way'
2013-05-30 21:31:53 -07:00
Sam
d6d3f74405
Merge pull request #901 from xtream/master
...
Refactored AvatarLookup
2013-05-30 21:30:39 -07:00
Régis Hanol
6cc0f8f2d4
added more file uploads test for better coverage
2013-05-31 03:13:37 +02:00
Juan de Dios Herrero
807f763fb0
Merge remote-tracking branch 'upstream/master'
2013-05-30 21:42:26 +02:00
DI2uNk
24e32092e7
Refactored two class methods into scopes (to achieve a better 'rails way')
...
Also added some tests to the methods
2013-05-30 21:21:31 +02:00
Neil Lalonde
b82a5dfd56
Move logic to reject slugs that are just numbers into the slug module
2013-05-30 11:54:02 -04:00
Michael Kessler
d2e45cb8fd
Don't append the base url to absolute image urls without protocol.
2013-05-30 17:17:07 +02:00
Neil Lalonde
7d5c313456
Don't allow category slugs that are numbers
2013-05-30 11:09:09 -04:00
Neil Lalonde
5d444be72b
Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number
2013-05-30 10:39:15 -04:00
Victor Cruz Dueñas
5d2a6e3994
refactored and tested AvatarLookup
...
less array copying
Avoid N queries
2013-05-30 11:04:05 +02:00
Sam
8874c9ea75
Add message format support that can be used on complex localization strings
...
Add message about new and unread topics at the bottom of topics
move localization helper into lib
2013-05-30 16:49:57 +10:00
Sam
e93b7a3b20
more progress towards live unread and new counts, unread message implemented, still to implement delete messages
2013-05-30 16:49:57 +10:00
Sam
73834370a5
work in progress, live unread and new counts
2013-05-30 16:49:57 +10:00
Robin Ward
8182a9d10c
Merge pull request #918 from chrishunt/chrishunt/quiet-tests-please
...
Clean up test output
2013-05-29 12:17:04 -07:00
Robin Ward
3d0587d8ce
Refactor: move category slug helper to Category model
2013-05-29 14:18:02 -04:00
Neil Lalonde
6abd9ddd2d
Add warning on admin dashboard if production env is configured to send email through gmail
2013-05-29 14:00:35 -04:00
Chris Hunt
e94e9b7621
Set UTF-8 charset for plain text email part
2013-05-29 09:54:36 -07:00
Chris Hunt
46a5066aed
Set SeedFu to quiet mode. No talking please.
2013-05-29 09:36:51 -07:00
Sam
46389754d6
Merge pull request #892 from eriko/cas_support
...
Cas support
2013-05-28 16:13:29 -07:00
Robin Ward
8d47f92c27
Merge pull request #908 from chrishunt/chrishunt/extract-topic-status-update
...
Extract topic status update
2013-05-28 10:00:49 -07:00
Robin Ward
feb966a1cf
Fixed jasmine specs that relied on old Discourse user api.
2013-05-28 12:09:03 -04:00
Chris Hunt
be234a2bc7
Add test to verify autoclose moderator post
2013-05-27 18:02:15 -07:00
Sam
c32399a80b
added test condition that fails with latest AM serializer
2013-05-28 10:42:04 +10:00
Robin Ward
197909246c
Weigh staff likes higher when calculating scores. New site setting: staff_like_weight
...
can set the factor (default is 3)
2013-05-27 12:46:08 -04:00
Robin Ward
e1781240a6
Merge branch 'refactoring' of git://github.com/mattvanhorn/discourse
...
Conflicts:
lib/text_sentinel.rb
2013-05-27 10:42:20 -04:00
Robin Ward
a15910ad1e
Merge pull request #899 from chrishunt/chrishunt/extract-topic-posters-summary
...
Extract topic posters summary
2013-05-27 06:30:58 -07:00
Sam
bf16b4f381
Merge pull request #903 from chrishunt/chrishunt/extract-post-move
...
Extract post move
2013-05-26 19:10:50 -07:00
Sam
661ddbb158
introduce strong_parameters
2013-05-27 11:06:09 +10:00
Sam
d84ae80074
Simplify user action make it more idiomatic
2013-05-27 10:22:37 +10:00
Chris Hunt
13c4266c74
Allow Chinese characters in Topic titles
2013-05-26 13:56:42 -07:00
Chris Hunt
1ba18318ac
Add test to verify posts are moved in transaction
2013-05-25 17:44:32 -07:00
Matt Van Horn
d5958f8779
Sliding window rate limiting
...
Switched the algorithm to use a circular buffer
based on a redis list
2013-05-25 12:37:28 -07:00
Chris Hunt
c1841a6c89
Extract Topic#posters_summary
2013-05-24 15:33:45 -07:00
Matt Van Horn
d7817cf314
extract TopicNotifier class from topic
2013-05-24 13:36:33 -07:00
Robin Ward
1313c0f094
FIX: When using a search context, *prefer* the context's results, don't restrict to only them.
2013-05-24 16:17:09 -04:00
Robin Ward
d1fdc66ca4
FIX: For spam detection, don't count total occurances of links of the same host, but
...
post count including that host.
2013-05-24 15:20:58 -04:00
Robin Ward
bd779834e5
Use search context for filtering search results by current category or user
2013-05-24 14:04:26 -04:00
Robin Ward
84bc798afa
Merge pull request #891 from GlitchMr/iPhone-casing
...
Thread title fixer should ignore special cases like iLetter
2013-05-24 07:02:34 -07:00
Sam
9926b0dbc8
staff styling
2013-05-24 13:32:41 +10:00
Sam
ca2dee52db
moved comments to the bottom, they are way less intrusive there
2013-05-24 12:48:32 +10:00
Erik Ordway
1575ce7b10
add cas support with a few tests
2013-05-23 13:40:50 -07:00
Konrad Borowski
8bc4264c98
Thread title fixer should ignore special cases like iLetter
2013-05-23 21:31:08 +02:00
Robin Ward
8e8d9af2bf
Use classes instead of a complicated nested hash for search results
2013-05-23 12:44:47 -04:00
Neil Lalonde
4492d06a9f
Don't send notifications for moderator action posts
2013-05-23 11:42:52 -04:00
Robin Ward
0bd61df34c
Merge pull request #884 from mattvanhorn/refactor_topic
...
Refactor topic
2013-05-23 07:26:22 -07:00
Matt Van Horn
24c25895f0
remove unnecessary title quality tests from topic
2013-05-22 22:56:27 -07:00
Matt Van Horn
806255b3c4
refactor Topic validation
...
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
2013-05-22 22:31:52 -07:00
Sam
fcc7192fd2
User tracking state implementation progress for live unread / new counts
2013-05-23 15:22:06 +10:00
Robin Ward
7a31630837
Search Refactor: Remove some manual SQL, make search data tables more idomatic Rails/AR
2013-05-22 16:31:13 -04:00
Robin Ward
b9a310f4b1
Search Refactor: Let's use a class to keep track of our state rather
...
than passing params everywhere. Also make the private API private.
2013-05-22 15:22:06 -04:00
Matt Van Horn
872995db57
refactor guardian class for clarity & correctness
...
introduce NullUser to avoid type-checking
DRY up code
reduce number of multiple returns
remove some redundant/impossible logic branches
add pending test for possible bug
add test & fix for ability to flag archived posts
add #secure_category? method to topic class
Fix bug that prevented flagging of archived topics
Rename NullUser to AnonymousUser
DRY up can_<action>? methods
Fix some ownership logic, and a test, for Guardian
2013-05-22 01:09:34 -07:00
Sam
96f8d79e83
Merge pull request #876 from chrishunt/chrishunt/observe-changes-for-topic-users
...
Trigger UserActionObserver when updating TopicUser
2013-05-21 23:02:27 -07:00
Sam
da6a88634b
improve best filter so it properly excludes all admin messages from count as well
2013-05-22 15:14:47 +10:00
Sam
c4d8085fc5
remove moderator status posts from best feed
2013-05-22 15:04:53 +10:00
Chris Hunt
d0bc8c95d3
Trigger UserActionObserver when tracking visit
2013-05-21 20:45:03 -07:00
Chris Hunt
685f4960f1
Trigger UserActionObserver when updating TopicUser
2013-05-21 20:43:43 -07:00
Jason Kriss
c22435562d
fix small typo in search_spec
2013-05-21 05:56:04 -03:00
Sam
b5eff93a9d
update message bus to support per client filtering
...
start work on user_tracking_state
fix can_ban? in guardian
expose protected scopes on topic_query we need
move guardian spec to use build as opposed to creating topics / posts / users
start work on user tracking spec
2013-05-21 16:39:51 +10:00
Sam
e91ed83586
the private message stream is different to normal streams, improving the ui a bit and collapsing conversations
2013-05-20 16:44:06 +10:00
Sam
80fb20816c
get rid of nonsense 404.html
...
correct 404 handling for invalid pages
2013-05-20 10:29:49 +10:00
Sam
18b00d01d0
Merge pull request #859 from lengarvey/user_refactoring
...
Light refactoring of the User model
2013-05-19 16:41:20 -07:00
Sam
24c997966e
Merge pull request #861 from sanderdatema/post_creator
...
Set created_at manually through PostCreator
2013-05-19 16:34:45 -07:00
Chris Hunt
fb4e5973db
Fix spelling mistake in spec doc
2013-05-18 13:11:34 -07:00
Chris Hunt
c2a4f16f24
Show posts for last page when page out of range
2013-05-18 13:11:01 -07:00
Sander Datema
286a06bd4e
Set created_at manually through PostCreator
2013-05-18 21:24:29 +02:00
Leonard Garvey
3de632f892
Added a spec for staff? and regular?
2013-05-18 18:07:07 +10:00
Neil Lalonde
f3282e33a3
Add tabs to category create/edit modal. Categories can have a default auto-close setting that applies to all new topics created in the category. Add rspec-given and write some integration tests. Tests for topic auto-close with category default
2013-05-17 11:05:35 -04:00
