Commit Graph

3289 Commits

Author SHA1 Message Date
Sam a6f67d85eb also should have caught this earlier 2013-06-08 07:47:48 +10:00
Sam 1e725629cd no idea how this was even working 2013-06-08 07:45:45 +10:00
Robin Ward f4d70b922d Merge pull request #986 from chrishunt/fix-local-onebox
Link to category slug instead of name in onebox
2013-06-07 14:23:53 -07:00
Robin Ward b2a6755a48 Merge pull request #984 from Supermathie/moreentropy
More entropy for foreign titles
2013-06-07 14:23:26 -07:00
Robin Ward fa4cfa1269 ScreenTrack refactor - removes logic from TopicView didInsertElement 2013-06-07 17:20:10 -04:00
Neil Lalonde 34e1f376f6 Add [PM] to subject of email notifications for private messages 2013-06-07 15:50:11 -04:00
Chris Hunt 1df5a50324 Link to category slug instead of name in onebox 2013-06-07 12:31:39 -07:00
Robin Ward 463be6fadf Merge pull request #982 from jd-erreape/add_scopes_to_roleable
Added role scopes to roleable
2013-06-07 12:08:26 -07:00
Robin Ward cdc3a57a91 Merge pull request #983 from ZogStriP/fix-combobox-not-working-properly
FIX: combobox were not working properly
2013-06-07 12:08:04 -07:00
Michael Brown f3fb10de03 settings: Update english description of entropy 2013-06-07 15:07:43 -04:00
Avdi Grimm 8cdd5d95fc Clarify job args dissection using destructuring assignment. 2013-06-07 15:02:21 -04: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
Régis Hanol 3f5c12ca1b FIX: combobox were not working properly 2013-06-07 20:45:31 +02: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 668a4a3042 Move MessageBus subscribing/unsubscribing out of view 2013-06-07 14:28:33 -04:00
Robin Ward 5217602ec3 FIX: RSS paths render a 404 for missing topics. 2013-06-07 12:52:12 -04:00
Robin Ward 1056b94b56 Don't apply styling unless the HTML template is active 2013-06-07 12:39:35 -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
Juan de Dios Herrero 36fe8fbc6d Added role scopes to roleable 2013-06-07 18:26:06 +02: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
Robin Ward 7c715e76e8 Refactor: Light pass of didInsertElement calls of views 2013-06-07 12:13:46 -04:00
Robin Ward f23807af8f Merge pull request #980 from jd-erreape/add_roleable_to_user
Added roleable module for User model
2013-06-07 07:24:08 -07:00
Juan de Dios Herrero 1b92d9d7f8 Added roleable module for User model 2013-06-07 12:33:48 +02: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 d1784f1f87 more moment goodness 2013-06-07 18:27:42 +10:00
Sam 000847b8d2 date helper uses the formatter now 2013-06-07 18:27:42 +10:00
Sam 5fa20ce357 more progress towards full migration to moment.js 2013-06-07 18:27:42 +10:00
Sam 875151f08a Merge pull request #970 from chrishunt/you-already-like-me
Improve on-boarding experience
2013-06-06 20:22:41 -07:00
Chris Hunt 2f59c5c513 Set line height on entire row, not two columns 2013-06-06 18:37:25 -07:00
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 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 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 a5a229598d missed a spot 2013-06-07 09:17:34 +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
Robin Ward 49f8e5a5d1 Merge pull request #976 from abbat/patch-1
Update js_locale_helper.rb
2013-06-06 14:38:56 -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
Anton Batenev 621d949033 Update js_locale_helper.rb
Fix "undefined method `end_with?' for 1:Fixnum" when field name in YML file is not quoted number like:

```
    user_action_groups:
      1: "Likes Given"
      2: "Likes Received"
```

(yamllint.com validates such file as valid YML file)
2013-06-06 22:20:17 +04:00