Commit graph

1848 commits

Author SHA1 Message Date
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
Jeff Atwood
b2d17a09ff missing translation for new site settings category 2014-07-13 13:43:44 -07:00
Jeff Atwood
2a40c04480 don't need "new" here 2014-07-13 02:54:39 -07:00
Jeff Atwood
4093120ddf distinct FAQ vs guidelines copy 2014-07-11 23:49:51 -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
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
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
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
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
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
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
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