github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:37:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2,824 Commits 190 Branches 500 Tags 938 MiB
8298a07fd9
Commit Graph

1514 Commits

Author SHA1 Message Date
Chris Hunt
d50a598e62 Notify admin of successful user approval 2013-06-06 18:37:25 -07:00
Chris Hunt
f6ce985121 Send activation email after user approved 2013-06-06 18:37:25 -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
Sam
1eed1e240b Merge pull request #977 from chrishunt/add-apple-touch-icon 
Add 'apple touch icon url' site setting
 2013-06-06 17:40:12 -07:00
Sam
7ff42377ac $.browser is gone from jQuery 1.9 ... and this is a check for ie7 and 6 ... don't care 2013-06-07 10:38:39 +10:00
Sam
6ed79e66bc jquery 1.9.1 upgrade ... remove jquery rails 2013-06-07 09:12:46 +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
Chris Hunt
268a5debbf Add 'apple touch icon url' site setting 2013-06-06 14:43:05 -07: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
Robin Ward
b758427572 Fix annoying jshint :) 2013-06-06 16:48:15 -04:00
Robin Ward
ba5f2d23a1 Fixed ContainerView code to build views correctly 2013-06-06 16:45:25 -04:00
Robin Ward
8f32aed944 Only use HTML templates for the digest email. 2013-06-06 15:08:56 -04:00
Robin Ward
7bc80c2dcf Changed HTML Digest template. Removed margins, shrunk logo. 2013-06-06 14:45:32 -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
f268b882fd The posts rebake task should regenerate links too. 2013-06-06 13:52:30 -04:00
Robin Ward
526f2af69a FIX: Touch events conflicted on mobile safari with {{action}}s, preventing admin menu 
option from working. Mobile Safari works with click so this seems to fix it.
 2013-06-06 13:16:36 -04:00
Robin Ward
06e83c9e6a FIX: Hitting enter while the invite dialog is up should submit the form, not refresh the 
entire page :)
 2013-06-06 12:06:43 -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
255a614142 keep /srv/status exposed 2013-06-06 14:40:10 +10:00
Robin Ward
7b70330e85 FIX: Javascript errors when navigating to some topics 2013-06-05 20:53:48 -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
4d1e8356b8 FIX: Again, try to get a flexible absolute logo_url 2013-06-05 18:23:43 -04:00
Robin Ward
8328aa97fd FIX: HTML email should use image_tag to get the correct path to the image 2013-06-05 18:01:40 -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
eb673c7e5d Merge pull request #963 from chrishunt/chrishunt/refresh-user-list-after-approval 
Refresh admin user list after approval
 2013-06-05 12:07:49 -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
Stephan Kaag
469bf044c3 Remove superfluous } 2013-06-05 21:54:07 +03:00
Chris Hunt
a523fa56ac Don't require authentication for invites 2013-06-05 11:12:37 -07: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
Chris Hunt
8f14e46964 Hide registration on login modal if 'invite only' 2013-06-05 11:06:54 -07:00
Chris Hunt
24da1ab07e Add 'invite only' site setting 2013-06-05 11:06:05 -07:00
Robin Ward
7d089fdfb5 FIX: Compile templates properly with the latest handlebars 2013-06-05 14:00:02 -04:00
Robin Ward
07cd87f941 FIX: Couldn't navigate to Categories list via link 2013-06-05 12:40:06 -04: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
Chris Hunt
f05c30ab8d Refresh admin user list after approval 2013-06-05 08:57:25 -07:00
Neil Lalonde
f0d4a38433 Admin flags UI shows when it's loading and when there are no results 2013-06-05 10:24:50 -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
913a607528 need to punch through account creation stuff 2013-06-05 14:01:24 +10:00
Sam
2dfba8d6de we need to be able to do username checks for registration to work 2013-06-05 12:50:42 +10:00
Sam
2509d0f4fa Merge pull request #959 from chrishunt/chrishunt/login-required-fixes 
'login required' site setting improvements
 2013-06-04 19:09:40 -07:00
Sam
93be638d93 message format is awesome, remove 0 unread and 0 new links. 2013-06-05 12:04:54 +10:00
Chris Hunt
3074300f76 Allow customization of 'login required' message 2013-06-04 18:53:36 -07:00
Chris Hunt
3774808a6e Redirect to '/' if OmniAuth login from '/login' 2013-06-04 18:35:20 -07:00
Sam
e52e46a609 fix blank created_at .. date is unbound, we should rename it to unboundDate 2013-06-05 11:32:53 +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
Chris Hunt
28aeb1d36c Remove static navigation from login page 2013-06-04 18:20:03 -07:00
Sam
5e305eaf0a missing skip filter for omniauth 2013-06-05 10:30:51 +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
122f9188c9 Redirect Ember routes to login if login required 2013-06-04 16:10:10 -07:00
Chris Hunt
789289a290 Show login modal on header buttons if required 2013-06-04 16:10:10 -07: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
Chris Hunt
85ceb5efa7 Add 'login required' site setting 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
Chris Hunt
f58dd7a6fb Set properties of AdminApi after ajax response 2013-06-04 11:05:44 -07:00
Robin Ward
11e703f6a0 Merge pull request #953 from chrishunt/chrishunt/fix-featured-topic 
Add missing handlebar in featured_topics template
 2013-06-04 10:31:44 -07:00
Robin Ward
02b1f78410 FIX: Include preloaded data even if the request type isn't explicitly text/html 2013-06-04 12:56:12 -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
2259e97d42 Add a count of blocked users on the dashboard 2013-06-04 11:53:19 -04:00
Chris Hunt
5ef4bcdecc Add missing handlebar in featured_topics template 2013-06-04 08:33:47 -07: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
24131bcc0e correct regressions, not loading topics on click 2013-06-03 19:03:57 +10:00
Sam
978bc0ca4e auto refresh suggested list 2013-06-03 14:54:51 +10:00
Sam
3ef16f292d remove dead code 
update title properly when count in list changes
remove broken (*) title notification from topic cause its just weird
 2013-06-03 10:38:57 +10:00
Robin Ward
1833c124d9 FIX? : Sometimes preloaded data is missing 2013-06-02 14:05:38 -04:00
Robin Ward
33d0a6a876 FIX: Safety checks for categories index 2013-06-02 11:20:08 -04: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
Jeff Atwood
0606725b29 fix some /tos and /privacy issues 2013-05-31 16:43:29 -07: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
Jeff Atwood
476ffcc627 make delete user button a Danger Button 2013-05-31 12:50:11 -07: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
Jeff Atwood
2982c23265 add quotes around favicon URL 2013-05-31 12:18:41 -07:00
Robin Ward
a4d88fbaa7 New categories weren't getting correct default colors 2013-05-31 13:42:46 -04:00
Robin Ward
fea3f326a9 FIX: Persona login was not using promises 2013-05-31 13:16:14 -04:00
Robin Ward
0af0a214b2 Refactor: Back all modals by controllers 2013-05-31 12:29:38 -04:00
Robin Ward
830b7805e9 Merge pull request #927 from bplexico/extract_invite_redeemer 
Extract InviteRedeemer from Invite
 2013-05-31 08:30:42 -07:00
Sam
b35b3da077 allow eviction of computer help for @geek 2013-05-31 15:09:19 +10:00
Sam
b228a7c185 Merge pull request #923 from eriko/cas_support 
remove hardcoded value and replace with SiteSetting.cas_domainname
 2013-05-30 21:39:29 -07:00
Sam
d2c1eb090e Merge pull request #921 from nirnanaaa/postgres-truefalse 
removed t's and f's from models
 2013-05-30 21:38:26 -07: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
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
Régis Hanol
6cc0f8f2d4 added more file uploads test for better coverage 2013-05-31 03:13:37 +02:00
Neil Lalonde
42714b424f For 403 errors, show the same html page as 404 2013-05-30 16:39:39 -04:00
Chris Hunt
afa519b3ae Only pass searchContext type, id in search request 2013-05-30 12:54:34 -07: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
Brian Plexico
0591d5be11 Extract InviteRedeemer from Invite 2013-05-30 11:49:11 -04: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
Sam
3898d90142 fix bugs with sync being wonky 2013-05-30 20:44:53 +10:00
Sam
d20056ad0e correct watcher, live updates for unread 2013-05-30 16:49:58 +10:00
Sam
6ad86aa305 read state is now published 2013-05-30 16:49:58 +10: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
f2da06a78f gmefile lock 2013-05-30 16:49:57 +10:00
Sam
90167e427b highlight logic changed 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
Sam
33683715a9 work in progress live unread / new counts 2013-05-30 16:49:57 +10:00
Sam
33ff87bf44 work in progress, live unread / new counters 2013-05-30 16:49:57 +10:00
Sam
4e2c6f43d1 correct broken pm draft 2013-05-30 08:55:23 +10:00
Erik Ordway
364a59d344 remove hardcoded value and replace with SiteSetting.cas_domainname 2013-05-29 15:47:49 -07:00
Robin Ward
830b93a16b Reduced complexity of admin flags controller, split up into methods, moved reports into model. 2013-05-29 16:49:34 -04:00
nirnanaaa
364113a4d5 removed t and f 's from group model 
removed t and f 's from user model as mentioned in #919

removed t's and f's from category model
 2013-05-29 22:10:43 +02:00
Robin Ward
5ae7707000 Refactor: Convert repeated {{view Discourse.xyz}} to registered view helpers 2013-05-29 15:14:31 -04:00
Robin Ward
57d5355ce8 wat 2013-05-29 15:00:35 -04:00
Robin Ward
4d5c145198 Refactor: Adds Discourse.Utilities.registerViewHelper to register view helpers 2013-05-29 14:32:39 -04:00
Robin Ward
3d0587d8ce Refactor: move category slug helper to Category model 2013-05-29 14:18:02 -04:00
Robin Ward
fe3ac50aae Use {{aceEditor}} helper to display the ace editor 2013-05-29 14:09:21 -04:00
Robin Ward
0601bb6d74 Trivial JS clean up 2013-05-29 14:09:17 -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
Robin Ward
acb2623b4b JSHINT: extra comma 2013-05-29 13:30:03 -04:00
Robin Ward
9717a344c3 Refactor: Less reliance on views for logic for topic list 2013-05-29 13:28:07 -04:00
Robin Ward
4cf1d9c266 Display details about the search context in the placeholder 2013-05-29 12:19:31 -04:00
Neil Lalonde
b1bdebd611 url for uncategorized category topic list is always /category/uncategorized 2013-05-29 12:06:33 -04:00
Robin Ward
f151b30044 Show excerpts on Categories page 2013-05-29 11:46:01 -04:00
Robin Ward
2e26fca36b FIX: Hitting ESC while autocomplete is open shouldn't close the composer. 2013-05-29 11:28:41 -04:00
Robin Ward
5cb1cc6fcb FIX: Categories pill wasn't always being highlighted properly. 2013-05-29 11:02:37 -04:00
Robin Ward
27c1f1044c FIX: Regression, messages were hidden 2013-05-28 21:24:45 -04:00
Robin Ward
92dc59fba9 Properly assign draft keys to Categories List view. 2013-05-28 21:16:24 -04:00
Sam
46389754d6 Merge pull request #892 from eriko/cas_support 
Cas support
 2013-05-28 16:13:29 -07:00
Robin Ward
d75b160385 Enable subscribing to notifications on start, instead of currentUser 
change which was hokey.
 2013-05-28 17:12:37 -04:00
Robin Ward
fc7fefb581 Merge pull request #913 from chrishunt/chrishunt/style-api-button 
Add styling to 'Generate API Key' button
 2013-05-28 13:26:30 -07:00
Robin Ward
c73455bfa2 FIX: Missing () made notifications invisible 2013-05-28 16:17:32 -04:00
Robin Ward
ee319ea7f7 FIX: Issues that didn't show up originally 2013-05-28 15:57:11 -04:00
Neil Lalonde
264dd65410 Fix replying in a topic that is uncategorized after allow_uncategorized_topics is set to false 2013-05-28 15:53:01 -04:00
Robin Ward
560fb15d8a Include pinned topics in category list. 
- removes an (n+1) query for user data
- supports the preload store for the data to avoid a second request
- fix a bug where uncategorizes was reporting (0, 0, 0) for topics by week, month, year
 2013-05-28 15:36:16 -04:00
Chris Hunt
e75f881d58 Add styling to 'Generate API Key' button 2013-05-28 12:10:18 -07:00
Neil Lalonde
dda831fd41 Fix a regression that broke pre-fill of username when sending private message 2013-05-28 14:17:35 -04:00
Robin Ward
320b35bf90 Merge pull request #910 from novemberkilo/master 
WIP - Reduce complexity of Post#raw_links
 2013-05-28 10:07:41 -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
Neil Lalonde
f190a96b30 Allow stuff in gutter to be selected 2013-05-28 12:57:33 -04:00
Neil Lalonde
a4b90ac54f Prevent avatars from wrapping on topic list 2013-05-28 12:57:32 -04:00