codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-24 06:22:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
19223 commits 7 branches 179 tags 87 MiB
Commit graph

4272 commits

Author SHA1 Message Date
Sam
95076050f4 FEATURE: warn about mailing list mode if it is checked 2016-03-29 18:50:17 +11:00
Kane York
f2ddd44712 FEATURE: Add /search discovery 
The opensearch.xml results in a "site search engine" being added to
Chrome, while the sitelinks search tag results in "Search this website"
being added to Google Search.
 2016-03-28 15:07:59 -07:00
Sam
c650c2a16f FIX: regression in badge grant admin page 2016-03-29 07:58:45 +11:00
Jeff Atwood
a307689621 slightly better avatar missing copy 2016-03-28 12:04:27 -07:00
Arpit Jalan
b6a0b891b8 Update Translations 2016-03-28 23:34:04 +05:30
Arpit Jalan
6b01287e98 Update Translations 2016-03-28 14:00:18 +05:30
Sam
fe51f84aa7 FEATURE: allow admins to enter badge long descriptions 
FIX: fallback to description if badge long description is missing

Also moves all badge localization into server.en, this slims the client down

serializers pass down localized names/descriptions/long descriptions
 2016-03-28 18:38:57 +11:00
Jeff Atwood
483c19199e slightly shorter badge copy 2016-03-25 16:31:38 -07:00
Arpit Jalan
64feffbb60 FEATURE: site setting for suppressing categories from digest email 2016-03-26 01:06:03 +05:30
Arpit Jalan
fc9519af52 Merge pull request #4117 from techAPJ/invite-email 
UX: user invite email style should be consistent with other user notifications
 2016-03-25 23:15:52 +05:30
Robin Ward
2c5eed9a85 FIX: Basic badge description was missing 2016-03-25 12:11:39 -04:00
Arpit Jalan
17afdc34cc UX: user invite email style should be consistent with other user notifications 2016-03-25 19:28:55 +05:30
Jeff Atwood
9bd8ea4633 more long badge descriptions 2016-03-24 15:06:35 -07:00
Robin Ward
db15772ab1 UX: Make user info rendering more consistent 2016-03-24 13:49:35 -04:00
Neil Lalonde
476a5fd43c FIX: unhandled extensions like .php on static routes will show the usual not found page 2016-03-24 13:22:06 -04:00
Robin Ward
e407ef9d0e FIX: Also support nil values for the site settings 2016-03-24 11:14:17 -04:00
Robin Ward
b270e0142b FIX: If site settings are missing don't do anything 2016-03-24 11:12:54 -04:00
Guo Xiang Tan
621372eb7b FIX: Pluralize logs notice message. 2016-03-24 09:14:20 +08:00
Arpit Jalan
df565da3b3 UX: move wiki button in post wrench 2016-03-24 01:40:54 +05:30
Robin Ward
f0552af5f1 FIX: Don't log validation errors for sso 2016-03-23 14:44:34 -04:00
Régis Hanol
39863953cd new 'enable_staged_users' site setting 2016-03-23 18:56:03 +01:00
Arpit Jalan
ddebd76c44 Update Translations 2016-03-23 22:25:29 +05:30
Arpit Jalan
bba0393c87 Merge pull request #4105 from manelvf/galician_language 
Galician language
 2016-03-23 21:19:20 +05:30
jomaxro
cc07f421f1 Update automated account blocked by staff PM 
When a user's account is blocked by staff, they receive an automated PM informing them of such.  Unlike the new user too many flags PM, this PM does not inform that user what blocked means.  This PR adds two lines to the PM, one explaining what blocking means, the other informing the user to contact staff with questions.
 2016-03-23 00:21:15 -04:00
Sam
c095304d6d FEATURE: limit daily emails per user to 100 per day via site setting 
- controlled via max_emails_per_day_per_user, 0 to disable
- when limit is reached user is warned
 2016-03-23 15:08:48 +11:00
Manel Villar
6a2fe44e51 Support for Galician language added 2016-03-22 16:42:54 +01:00
Robin Ward
a9320f668c FIX: Invalid YAML 2016-03-22 11:15:15 -04:00
Jeff Atwood
1f2aa3aa8b clearer "gives back" descriptions 2016-03-22 04:38:56 -07:00
Jeff Atwood
69268786c4 lots more + better long badge descriptions 2016-03-22 04:19:45 -07:00
Jeff Atwood
d31cc98ea7 copyedit on some badge short descriptions 2016-03-21 17:06:00 -07:00
Régis Hanol
afacc70fbe improve error message when trying to change email address to one used by a staged user 2016-03-21 19:36:26 +01:00
Arpit Jalan
34469e725b FEATURE: separate API endpoints for public and private posts 2016-03-21 18:21:15 +05:30
Guo Xiang Tan
5dc5767851 FIX: Assigning wrong value to variable. 2016-03-21 15:18:31 +08:00
Guo Xiang Tan
54bdcd9b98 Update to new rate limit Redis config. 2016-03-21 14:00:50 +08:00
Gerhard Schlager
81e174c47a Fix Permalink normalization regex example 2016-03-19 22:37:29 +01:00
Régis Hanol
1c19548e30 Merge pull request #4094 from fantasticfears/omniauth-config 
FIX: redirect output omniauth log to Rails logger instead of stdout
 2016-03-19 18:03:16 +01:00
Erick Guan
7df33ca287 FIX: redirect output omniauth log to Rails logger instead of stdout 2016-03-19 13:17:13 +01:00
Jeff Atwood
d14bcc5681 let's avoid advising users on being wise 2016-03-18 16:46:34 -07:00
Jeff Atwood
0ad5f22644 more positive copy on like remain warning 2016-03-18 16:38:29 -07:00
Arpit Jalan
bd83cf7f4c FEATURE: add group posts and mentions RSS 2016-03-18 22:29:10 +05:30
Robin Ward
5d4ee2ca1d FEATURE: Warn a user when they have few likes remaining 2016-03-18 11:30:29 -04:00
Sam
77242e4680 FEATURE: in:pinned and in:unpinned search filters 2016-03-18 16:26:54 +11:00
Neil Lalonde
213950e4cf FEATURE: add option to include topics from trust level 0 users in digest emails 2016-03-17 17:35:23 -04:00
Robin Ward
b0e23c9f56 FIX: Thank you badge had incorrect criteria 2016-03-17 13:03:47 -04:00
Robin Ward
d9080b9d69 Rename "My Cup Runneth Over" to "Higher Love". Winwood! 2016-03-17 11:42:41 -04:00
Régis Hanol
99b1059537 improve 'private_email_time_window_seconds' site setting helper text 2016-03-17 16:29:23 +01:00
Neil Lalonde
9f30a28a8e Update translations 2016-03-17 11:01:02 -04:00
Sam
a8dbba9a01 warn about setting 2016-03-17 17:03:12 +11:00
Régis Hanol
20ce7f29e0 FEATURE: new 'manual_polling_enabled' site setting 2016-03-16 22:28:01 +01:00
Sam
84d234a98a Merge pull request #4076 from scossar/locale-from-header-setting 
FEATURE: add site setting for setting locale from header
 2016-03-17 07:53:20 +11:00
Régis Hanol
162fcb75da FEATURE: admin dashboard check when email polling errored in the past 24 hours 2016-03-16 21:17:48 +01:00
Robin Ward
7c384fc740 Adjusted "Gives Back" badge 2016-03-16 13:48:14 -04:00
Robin Ward
35c2339c2a Updated badges for receiving likes 2016-03-16 13:03:17 -04:00
Sam Saffron
e84d5549ef FEATURE: only allow sidekiq in master site when hosted on multisite 2016-03-17 00:26:07 +11:00
Arpit Jalan
9b3218b041 update tl3 settings description 2016-03-16 14:31:50 +05:30
Jeff Atwood
40d6f062f7 clarify why block all mobile/tablet for miniprofiler 2016-03-15 16:54:40 -07:00
Jeff Atwood
d052f1746c add support for other Nexus devices as "mobile" 2016-03-15 16:46:46 -07:00
Robin Ward
06591022fe FEATURE: Generous badge 2016-03-15 16:08:29 -04:00
Robin Ward
cfe18c3f5b FEATURE: Gives Back badge 2016-03-15 16:08:29 -04:00
Robin Ward
e60da531ba FEATURE: Admired Badge for high like ratio 2016-03-15 16:08:29 -04:00
scossar
1914495e88 make error message translatable 2016-03-15 10:02:10 -07:00
Arpit Jalan
ee5acf1948 Update Translations 2016-03-15 21:11:18 +05:30
scossar
0cbeda8414 add site setting for setting locale from header 2016-03-14 16:18:19 -07:00
Arpit Jalan
ff12b5bf57 FIX: newly created categories were not showing up 2016-03-14 23:17:02 +05:30
Régis Hanol
4a3cb4a000 FIX: use MD5 of the email_string when there's no 'Message-Id' 2016-03-14 18:18:58 +01:00
Régis Hanol
9fc9f029ea fix title for posted notification 2016-03-14 16:53:53 +01:00
Sam Saffron
e00850a1ab FEATURE: implement before and after filters in search remove max_age and min_age 
supports

- before:monday
- after:june
- before:2001
- before:2001-01-22
 2016-03-14 23:27:02 +11:00
Arpit Jalan
01f2f05f2d Merge pull request #4070 from techAPJ/revert-post 
FEATURE: revert post to a specific revision
 2016-03-11 23:00:13 +05:30
Régis Hanol
6d84a8a1b3 FIX: don't send out elided message in email notifications 
UX: improved details tag for elided messages
 2016-03-11 17:51:16 +01:00
Guo Xiang Tan
90fde5053d FIX: Load Redis patch much earlier. 2016-03-11 17:29:00 +08:00
Guo Xiang Tan
89b1998174 Add default port for redis_slave. 2016-03-11 15:07:07 +08:00
Guo Xiang Tan
c07c474575 FEATURE: Master-Slave Redis configuration with fallback and switch over. 2016-03-11 12:18:58 +08:00
Arpit Jalan
89248580dc FEATURE: revert post to a specific revision 2016-03-11 02:46:55 +05:30
Robin Ward
5771d2aee2 SECURITY: Support for confirm old as well as new email accounts 2016-03-08 14:52:22 -05:00
Robin Ward
d62689fa76 Move updating a user's email to its own controller 2016-03-08 14:52:22 -05:00
Régis Hanol
031146a821 FIX: ensure email in address insn't used it both Groups & Categories 2016-03-08 20:52:04 +01:00
Régis Hanol
cf140aaaec Merge pull request #4067 from fantasticfears/translation 
FIX: Add missing translation in groups page
 2016-03-08 15:58:34 +01:00
Erick Guan
e9bff2e550 FIX: Add missing translation in groups page 2016-03-08 12:25:46 +01:00
Guo Xiang Tan
ee8be3d1a8 Merge pull request #4059 from gdpelican/feature/disable-mailing-list-mode 
FEATURE: Add site setting for disabling mailing list mode site wide
 2016-03-08 16:27:09 +08:00
James Kiesel
2f00e2179f Don't use unnecessary stubs; site setting language update 2016-03-08 19:40:16 +13:00
Neil Lalonde
b49e0e0f4a FIX: add path to cookie on subfolder installs 2016-03-07 13:40:21 -05:00
Régis Hanol
622d804d46 FEATURE: Add rejection message on rejected IncomingEmail 
FIX: Better RateLimit description in rejected IncomingEmail
FEATURE: Send email when hitting a rate limit
 2016-03-07 16:56:17 +01:00
Arpit Jalan
bdb290ccdb Update Translations 2016-03-07 19:44:32 +05:30
Sam
7b4cc136ea Merge pull request #4046 from RalfJung/strings 
Profile page: Use "I" to refer to the user
 2016-03-07 14:07:58 +11:00
Sam
fe6ea48123 Merge pull request #4038 from markbiegel/instagram-login 
FEATURE: Instagram OmniAuth login methods
 2016-03-07 14:05:07 +11:00
Sam
af577a5854 FEATURE: like notification frequency of never 2016-03-06 09:12:59 +11:00
James Kiesel
54b4fb69db FEATURE: Add site setting for disabling mailing list mode site wide 2016-03-05 11:08:31 +13:00
Sam Saffron
8b1772ac0f FIX: if user undos like, and relikes notify 
FEATURE: roll up likes for notify on all likes
 2016-03-04 22:56:27 +11:00
Régis Hanol
341037d6fb FIX: less restricting 'BACKUP_ROUTE_FORMAT' 2016-03-03 18:52:32 +01:00
Neil Lalonde
c1aea91d63 FEATURE: More digest email frequency options. Digests can be sent as often as every 30 minutes. 2016-03-02 15:43:47 -05:00
Robin Ward
be257225b6 Adjustment: New User Posts must be reviewed at TL0 + TL1 2016-03-02 14:54:03 -05:00
Guo Xiang Tan
f32f0d6337 Merge pull request #4017 from tgxworld/add_admin_banner_for_logster 
FEATURE: Admin Banner when Logster logs is getting flooded.
 2016-03-02 23:44:56 +08:00
Guo Xiang Tan
fdd6920ae7 FEATURE: Admin Banner when Logster logs is getting flooded. 2016-03-02 22:03:16 +08:00
Sam Saffron
5f4075a6cf FEATURE: users can select how frequently they are notified on likes 
- first time
- first time and daily (default)
- always
 2016-03-02 23:16:52 +11:00
Arpit Jalan
50e65634d7 FEATURE: new setting min_admin_password_length and better default 2016-03-02 14:43:26 +05:30
Jeff Atwood
83fda03495 remove modal flag hint, no longer needed 2016-03-01 14:22:36 -08:00
Arpit Jalan
8349669f8e streamline topic_invite locale 2016-03-02 00:39:17 +05:30
Robin Ward
618eef680e FEATURE: Disable removal of backups from S3 2016-03-01 14:02:10 -05:00
Arpit Jalan
41a0f9b7fd UX: better error message when inviting user to a topic 2016-03-02 00:30:31 +05:30
Arpit Jalan
9dc533a26c fix broken locale 2016-03-01 22:52:55 +05:30
David García-Navas López de Cuéllar
a66c236adb very little typo [ci skip] 
[ci skip]
 2016-03-01 12:06:27 +01:00
Guo Xiang Tan
bfea842d32 UX: Better error message when logging out in read only mode. 2016-03-01 17:37:50 +08:00
Arpit Jalan
d70e4ac5b6 Update Translations 2016-03-01 14:25:01 +05:30
Régis Hanol
be5a54d67d FEATURE: new 'allow_all_attachments_for_group_messages' site setting 2016-02-29 22:39:24 +01:00
Arpit Jalan
01e1bb53f1 FEATURE: add RSS feed for top topics 2016-02-29 23:46:36 +05:30
Ralf Jung
11ab72db18 Profile page: Use "I" to refer to the user 
This is consistent with "Don't jump to my post after I reply", "Send me an email when someone messages me", ...
 2016-02-28 09:58:15 +01:00
Jeff Atwood
f2c67a5010 remove mandrill RIP 2016-02-27 15:21:17 -08:00
Arpit Jalan
8f62a0caa8 FEATURE: log backup operation 2016-02-27 23:33:18 +05:30
Arpit Jalan
09257f6c85 remove duplicate translation file 2016-02-27 12:40:32 +05:30
Sam
0a128852de Merge pull request #4018 from httvncoder/patch-1 
Create client.vi_VN.yml
 2016-02-27 17:01:51 +11:00
Régis Hanol
21b51090bf FIX: don't tell staged users they can visit topics in email notifications 2016-02-26 23:56:56 +01:00
Sam Saffron
820a435af8 FEATURE: add "email in-reply-to user option" 
We no longer include previous replies as "context", instead
we include and excerpt of the post being replied to at the bottom
of notifications, this information was previously missing.

Users may opt in to emailing previous replies if they wish
or opt out of "in-reply-to" which makes sense in some email clients that
are smarter about displaying a tree of replies.
 2016-02-26 00:05:59 +11:00
Ubuntu
5c603bf8ec Added Instagram login method 2016-02-25 12:13:59 +10:00
Régis Hanol
f7432d8ec9 FEATURE: add support for multiple incoming emails for groups & categories 2016-02-24 19:47:58 +01:00
Jeff Atwood
0097dc55b5 more entertaining 404 header copy 2016-02-24 02:00:12 -08:00
Guo Xiang Tan
b500f35d14 Ignore ActionController::UnknownHttpMethod error in logs. 2016-02-24 12:58:23 +08:00
Sam
d7ac056606 puma config is a production thing 2016-02-24 14:49:31 +11:00
Robin Ward
ee1aec6766 Merge branch 'vdom' 2016-02-23 15:30:40 -05:00
Arpit Jalan
9de5c340b0 FIX: invite link should not auto-accept invitation if user is already logged in 2016-02-23 12:10:25 -05:00
Arpit Jalan
72784d23e7 improved already_logged_in copy 2016-02-23 21:56:34 +05:30
Arpit Jalan
1253afdf95 FIX: invite link should not auto-accept invitation if user is already logged in 2016-02-23 19:49:58 +05:30
Sam Saffron
d0a86f8032 Merge branch 'master' into vdom 2016-02-23 15:58:46 +11:00
Jeff Atwood
69461ec1ce slightly better upgrade email text 2016-02-22 15:50:28 -08:00
Robin Ward
026bba1876 Merge branch 'master' into vdom 2016-02-22 15:28:07 -05:00
Neil Lalonde
7e39619bc9 Update translations 2016-02-22 11:10:12 -05:00
Jeff Atwood
f6b1238d6c reduce maximum_backups default from 7 to 5 2016-02-22 00:56:26 -08:00
Sam
c404da248a Merge branch 'master' into vdom 2016-02-22 12:20:59 +11:00
Sam
5a47199528 Merge pull request #3947 from khoa-le/update-locale-vietnamese 
Add locale for Vietnamese
 2016-02-22 11:41:37 +11:00
Dan Dascalescu
5fdc0ebe8a Typo fix: "your sure" 2016-02-21 14:12:32 -08:00
Dan Dascalescu
9aa3653e2f Fix typo: are your sure 2016-02-21 02:26:28 -08:00
Neil Lalonde
e8d837269b FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting. 2016-02-19 15:21:18 -05:00
Jeff Atwood
6c684944c5 add link to mail-tester.com in test email 2016-02-19 09:19:36 -08:00
Sam
29c2423daf Merge branch 'master' into vdom 
# Conflicts:
#	app/assets/javascripts/discourse/views/post.js.es6
 2016-02-19 14:09:31 +11:00
Sam
ab06f86fbe FEATURE: allow users to control how many previous replies they get 
- always means we always send previous replies with every email
- never means we do not
- "unless previously sent" ... is the default, in which we only email you each reply once

The default_email_previous_replies site setting can control this toggle
 2016-02-19 13:57:07 +11:00
Régis Hanol
e204144a58 UsernameValidator error messages weren't matching the code 2016-02-18 23:19:14 +01:00
Hung Thinh
acad93f431 Create client.vi_VN.yml 
Vietnamese file : translate for use
 2016-02-19 02:26:01 +07:00
Sam
e8f76c335a Merge branch 'master' into vdom 2016-02-17 18:10:12 +11:00
Régis Hanol
63b9d1c645 FIX: sends an email notifcation when a user's post is linked 2016-02-16 18:29:23 +01:00
Robin Ward
3ea1f88cdc Merge branch 'master' into vdom 2016-02-16 11:48:42 -05:00
Erick Guan
0c6e5befe4 FIX: topic summary description text was conflicts with reply counter 2016-02-16 12:38:51 +01:00
Dan Dascalescu
c75360f809 Capitalize "ip" in "ip address" 2016-02-15 15:59:31 -08:00
Sam
1dc168a7e6 Merge branch 'master' into vdom 2016-02-15 19:29:59 +11:00
Jeff Atwood
2c0b36cb72 omit needless words 2016-02-13 15:58:52 -08:00
Robin Ward
d1e85bdd8b FEATURE: Use virtual dom framework for faster post rendering 2016-02-11 11:00:40 -05:00
Régis Hanol
cad7fc1062 FIX: don't allow blocked user to send emails in 2016-02-11 10:39:57 +01:00
Jeff Atwood
5120dcfb3d we don't need to show (currently enabled) 2016-02-10 16:36:25 -08:00
Jeff Atwood
081c196b52 minor copyedit 2016-02-10 16:34:37 -08:00
Régis Hanol
91bb38626c FEATURE: new incoming email details modal 2016-02-10 22:00:27 +01:00
Régis Hanol
c2cc9da9a7 remove the wiki color 2016-02-10 11:18:37 +01:00
Régis Hanol
8944d62aa6 add validator for the 'reply_by_email_enabled' site setting 2016-02-09 23:35:40 +01:00
Arpit Jalan
e5aecdf09f Update Translations 2016-02-09 20:24:03 +05:30
Erick Guan
35142847ba FIX: Prepend the user id before username in admin user routes 2016-02-09 15:14:13 +01:00
Arpit Jalan
82a75c00c0 UX: change 'Visit Topic' to 'Visit Message' for message notification email 2016-02-09 13:39:10 +05:30
Jeff Atwood
1a1dcb59f9 this period bothered me and it had to go 2016-02-08 15:37:49 -08:00
Régis Hanol
460665895c properly name purge emails/email logs site settings 2016-02-08 22:18:52 +01:00
Régis Hanol
ac863bab91 FEATURE: new 'suppress_email_logs_after_days' site setting 2016-02-08 18:47:35 +01:00
Gerhard Schlager
f7eb7f25bd UX: Use i18n for date picker 2016-02-05 21:49:21 +01:00
Guo Xiang Tan
0058d09e35 Second attempt which removes any kind proxying. 2016-02-05 08:51:10 +08:00
Guo Xiang Tan
46589a1a0c FEATURE: AR adapter to failover to a replica DB server. 2016-02-05 08:51:10 +08:00
Neil Lalonde
71a87bea0c Update translations 2016-02-04 13:35:14 -05:00
Régis Hanol
2d170712d7 new 'private_email_time_window_seconds' site setting 2016-02-04 17:22:16 +01:00
Régis Hanol
03938afc9b Merge pull request #3992 from techAPJ/report-filter 
FEATURE: filter admin reports via user group
 2016-02-04 11:21:14 +01:00
Arpit Jalan
eec8436cfe FEATURE: filter admin reports via user group 2016-02-04 11:23:49 +05:30
Sam Saffron
209b022385 PERF: cut down on memory usage allowed to redis 
This limits the amount of backlog message bus channels can have.
 2016-02-04 13:58:38 +11:00
Sam Saffron
bc75010b20 FEATURE: suggested messages for messages 
FEATURE: clicking envelope takes you to inbox

Suggested messages works somewhat like suggested topics.

- New show up first (in either group inbox or inbox)
- Then unread (in either group inbox or inbox)
- Finally "related" which are messages with same participants as the current pm.
 2016-02-03 18:50:05 +11:00
Arpit Jalan
bcc0ed7c9c Update Translations 2016-02-02 15:24:01 +05:30
Régis Hanol
cf4c256b17 FEATURE: new 'raw email' modal when listing rejected emails 2016-02-01 21:41:49 +01:00
Régis Hanol
49d1f88f6e FIX: support incoming emails with no subject 2016-02-01 12:16:15 +01:00
Jeff Atwood
161170aabe Merge pull request #3928 from jamielinux/nginx204 
Return 204 instead of 404 for favicon.ico requests
 2016-01-30 01:48:22 -08:00
Jeff Atwood
9cf57e3ca4 more email rejection copy edits 2016-01-28 15:42:05 -08:00
Jeff Atwood
223e324eb9 some copyedits on mail rejection text 2016-01-28 12:20:59 -08:00
Gerhard Schlager
f4f87921c2 Replace uncategorized_description setting with translation 2016-01-28 00:26:25 +01:00
Jeff Atwood
6a7bdfecc8 better shorter copy for group inbox 2016-01-27 10:25:54 -08:00
Sam Saffron
8aea75edec improve copy 2016-01-27 21:51:12 +11:00
Sam Saffron
a764cc3a42 FEATURE: by default users track a group (as opposed to watch) 
FEATURE: a rollup counting number of messages in the group inbox to tracking users
 2016-01-27 21:38:33 +11:00
Arpit Jalan
74f22f95da FEATURE: log admin/moderator grant/revoke action 2016-01-27 15:39:04 +05:30
Jeff Atwood
f71ae355ae minor copyedit 2016-01-26 15:14:02 -08:00
Gerhard Schlager
1368e2182a UX: Distinguish between noun and verb for "Archive" 2016-01-26 22:41:49 +01:00
Arpit Jalan
915afa703d Update Translations 2016-01-26 23:41:00 +05:30
Khoa, Le Ngoc
06e637fc4a Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese 
* upstream/master: (185 commits)
  SECURITY: Upgrade rails.
  FIX: new user summary page was broken
  Version bump to v1.5.0.beta9
  Remove addressable from Discourse.
  UX: change glyph when inviting existing user to a topic
  FIX: Allow for large free disk space
  Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)"
  UX: improve styling of messages and mobile view of messages
  FIX: correct counts on user summary
  FIX: link to filtered down list of badges from summary FEATURE: pick featured badges in summary page
  FIX: do not allow new email to be duplicate FIX: return proper error message when email already exists
  retain unactivated accounts a bit longer default
  FEATURE: blocked users can send and reply to private messages from staff
  Remove Arel patch that has been merged upstream.
  correct path
  little typo
  FIX: Missing tag in CSS.
  PERF: remove 10-20ms of work from every page view
  FIX: remove green background for wiki (this can be re-added via a customization if needed)
  Hotfix for unsubscribe via email
  ...

# Conflicts:
#	.tx/config
 2016-01-26 12:44:29 +07:00
Jeff Atwood
734450dcc3 retain unactivated accounts a bit longer default 2016-01-22 13:13:07 -08:00
Khoa, Le Ngoc
003399bf96 Update translation code 2016-01-22 14:54:48 +07:00
David García-Navas López de Cuéllar
954e3be7cf little typo 2016-01-21 15:05:03 +01:00
Arpit Jalan
1cee914565 FEATURE: make top criteria formula multipliers controlled by site 
setting
 2016-01-21 10:30:06 +05:30
Régis Hanol
fc3bedaaed Merge pull request #3921 from gschlager/locale-sk 
Add Slovak locale
 2016-01-20 15:38:48 +01:00
Régis Hanol
c2c01cdb5d FIX: username suggester to account for the more relaxed username rules (closes #3907) 2016-01-20 15:37:34 +01:00
Régis Hanol
ea02b7f54d Merge pull request #3961 from dandv/patch-5 
Include backups among items uploadable to s3
 2016-01-20 14:39:21 +01:00
Régis Hanol
f61537bc16 Merge pull request #3952 from gdpelican/unsubscribe-via-email 
Unsubscribe via email
 2016-01-20 14:38:14 +01:00
James Kiesel
c7283751a3 Unsubscribe via email 2016-01-20 22:25:25 +13:00
Sam Saffron
7303f8f309 FEATURE: first pass at user summary page 2016-01-20 15:14:25 +11:00
Neil Lalonde
9ad226aaa8 FEATURE: add email query param to login, signup, and password-reset URLs to prefill form 2016-01-19 16:53:46 -05:00
Régis Hanol
11ea16a91a FIX: localize S3 region names 2016-01-19 17:14:45 +01:00
Régis Hanol
5018a8033d FIX: add link to user profile for staged users 2016-01-19 16:41:07 +01:00
Régis Hanol
29fbc2d7bc FIX: add missing 'user_replied_pm' translation 2016-01-19 15:47:38 +01:00
Régis Hanol
3083657358 FEATURE: better email in support 
FEATURE: new incoming_email model
FEATURE: infinite scrolling in emails admin
FEATURE: new 'emails:import' rake task
 2016-01-19 00:57:55 +01:00
Jeff Atwood
d0bcea3411 better copy on read only mode 2016-01-18 14:17:38 -08:00
Jeff Atwood
28cbeaf6be add reply formatting info to new user tips 2016-01-18 14:10:14 -08:00
Arpit Jalan
bfa4e6b69c Update Translations 2016-01-19 01:29:19 +05:30
Sam
ca3e2b4da3 FEATURE: you can not drill down and see why you have badges 
Clicking on badges filters down the list to a particular user.
 2016-01-18 17:59:20 +11:00
Dan Dascalescu
a566adc5b2 Include backups among items uploadable to s3 
Enabling S3 backups comes with a warning "requires valid S3 credentials entered in Files settings". This commit amends the description of s3_access_key_id to confirm it's the correct location for backup as well as image uploads to S3.
 2016-01-16 18:08:27 -08:00