Commit Graph

2659 Commits

Author SHA1 Message Date
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
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
b062b4a98e Unapproved users should not receive digest emails. Fixes #974 2013-06-06 11:45:18 -04:00
Robin Ward
207ad9049a Merge pull request #973 from jd-erreape/spanish_server_translation
Spanish server and client translation
2013-06-06 08:13:08 -07: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
Robin Ward
0990af3e1c Merge pull request #971 from iancmyers/strong-parameters
Enabled strong_parameters across all models/controllers.
2013-06-06 08:09:53 -07:00
Robin Ward
2d54537d6d Merge pull request #972 from Supermathie/sysadmin-docs
documentation: further improvements and TESTING!
2013-06-06 08:06:43 -07:00
Robin Ward
b078596a4a Merge pull request #968 from davidpp/master
Change CHEF Omnibus cookbook base_uri attribute because Opscode changed their omnibus S3 bucket.
2013-06-06 08:05:40 -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
Juan de Dios Herrero
90c46ab62a Little review on client.es.yml and added a lot of translation that were missing and made the page looks ugly 2013-06-06 11:35:10 +02:00
Michael Brown
e53cd0b083 documentation: further improvements and TESTING! 2013-06-06 04:58:39 -04:00
Juan de Dios Herrero
a2ee43b511 Finished server.es translation, ready for review (still a few sentences left because no good translation has been found) 2013-06-06 10:53:29 +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
David Paquet
6243965c64 Change CHEF Omnibus cookbook base_uri attribute because Opscode as migrated their omnibus S3 bucket. 2013-06-05 23:44:25 -03: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
Neil Lalonde
0dc678c1e7 Version bump to v0.9.2.5 2013-06-05 18:46:11 -04:00
Jeff Atwood
6f57564c54 add edit hint to "no topic definition" 2013-06-05 15:36:26 -07: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