github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 14:55:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8,004 Commits 214 Branches 500 Tags 960 MiB
7870afbfd4
Commit Graph

2058 Commits

Author SHA1 Message Date
Jeff Atwood
2a6849b387 add additional reply via email help text example 2014-03-21 23:41:33 -07:00
riking
7237eb5e00 Shuffle around the order of site settings 
The goal of this is twofold:
 - Make the more commonly changed settings higher
 - Find groups for more uncategorized settings

Additionally, the SEO category was deleted, its contents folded into Security and Spam.
 2014-03-21 19:03:29 -07:00
riking
f75a7f8832 Clean up site_settings.yml 
- Hide several variables that the client does not use
 - Use concise default syntax when possible
 2014-03-21 18:01:39 -07:00
Jeff Atwood
84a7d75828 clarity: change flag "Notify" to "Private message" 2014-03-21 13:02:27 -07:00
Jeff Atwood
256186c836 Merge pull request #2162 from archon432/master 
'Topics' are capitalized
 2014-03-21 12:15:41 -07:00
Neil Lalonde
e7ae0bba5f Update pt_BR translations from Transifex. Thanks, translators 2014-03-21 14:00:46 -04:00
Sam
28ffb3025c Merge pull request #2150 from vikhyat/badge-system 
Interface for granting/revoking badges from admin user page
 2014-03-21 17:56:08 +11:00
Jeff Atwood
c37b08908d Omitted is too fancypants. Say "hidden" instead 2014-03-20 23:25:20 -07:00
Vikhyat Korrapati
dcaa069bb5 Log badge grant/revoke to the staff actions log. 2014-03-21 11:10:07 +05:30
Vikhyat Korrapati
0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Sam
31ce05b5ae Merge pull request #2157 from Aselox/master 
Updated Italian Translation + added Italian poll locales
 2014-03-21 16:19:13 +11:00
Robin Ward
b0a130db86 Precompile break_string 2014-03-20 14:50:34 -04:00
Archon
02965515e9 Update client.id.yml 2014-03-19 21:02:15 +01:00
Archon
57945c30f6 Update client.en.yml 2014-03-19 21:01:22 +01:00
Robin Ward
d3f1eb395d Updated import for TypePad 2014-03-19 15:02:49 -04:00
Aselox
62d0ae4a30 Update server.it.yml 2014-03-19 16:51:46 +01:00
Aselox
e34b18fcc8 Update client.it.yml 2014-03-19 16:49:53 +01:00
Sam
b7f2a3e512 VIM helper 2014-03-19 12:08:00 +11:00
Robin Ward
84e608079b Ability to customize the logo in digest emails 2014-03-18 15:56:17 -04:00
Robin Ward
d0edfe2179 Better error messages if the "Send Test Email" button fails. 2014-03-18 15:26:36 -04:00
Robin Ward
3cf0adaed0 Merge pull request #2139 from riking/s3-backup-warning 
Add s3_backup_config_warning
 2014-03-18 14:41:42 -04:00
Régis Hanol
a627a062de Merge pull request #2135 from Onaldanm/poll-badge-fr 
Translation: Badges, poll and french updates
 2014-03-18 17:41:06 +01:00
Sander Datema
580a55ec03 Dutch translation updated 2014-03-18 11:47:50 +01:00
Sander Datema
5c0b6eaac1 Dutch translation updated 2014-03-18 11:46:47 +01:00
Sam
76c7d42027 require rbtrace in development cause it is handy 2014-03-18 15:22:53 +11:00
Sam
24667cedee FEATURE: notify users when linked 
Extract out PostAlerter from observer
Track outgoing post links correctly
Notify users they are linked when linked
 2014-03-18 15:22:53 +11:00
riking
ffd4f367e3 Add s3_backup_config_warning 
Note that only one of the two warnings can be shown, because they are checked in the same method.
 2014-03-17 12:56:59 -07:00
Jeff Atwood
2cff3c20f7 clarify invite copy 2014-03-17 12:07:21 -07:00
Onaldanm
134af37cbd Badges, poll and french Translation 
New Badges system
New string in the poll plugin + change the term "poll option"
Re-add some empty strings (like notifications.title)
And updates
 2014-03-17 11:21:47 +01:00
Régis Hanol
2d49374357 Merge pull request #2130 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-17 09:31:17 +01:00
Aselox
9a8dff1d32 Update server.it.yml 2014-03-17 00:26:45 +01:00
Aselox
3f4ad3a29d Update client.it.yml 2014-03-17 00:25:29 +01:00
Sam
fe63db7953 Merge pull request #2115 from vikhyat/badge-system 
Initial badge system implementation
 2014-03-17 10:06:37 +11:00
Noel B. A
6e667476a0 updated spanish translation 2014-03-15 21:47:55 +03:00
Jeff Atwood
2d0dba0869 omit needless words 2014-03-15 00:32:00 -07:00
Jeff Atwood
dcbf412957 improve invite friends email cues 2014-03-14 17:35:28 -07:00
Jeff Atwood
2967b1e06c put top before categories 2014-03-14 16:03:07 -07:00
Jeff Atwood
3f858801a3 omit needless words from welcome email header 2014-03-14 13:31:19 -07:00
Jeff Atwood
93bced5a5e remove login-specific info 2014-03-14 10:21:33 -07:00
Vikhyat Korrapati
9b26c8584e Initial badge system implementation. 2014-03-14 21:49:26 +05:30
Onaldanm
761dccbe73 French Translation 
Big update translation from Transifex

Changelog:
- topic = sujet
- Uniformisation des termes
 2014-03-14 16:12:11 +01:00
Jeff Atwood
a07062644c improve new version emails 2014-03-13 16:22:31 -07:00
Régis Hanol
50cc7dedb0 Merge pull request #2098 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-13 11:00:04 +01:00
Régis Hanol
582a30ed4a Merge pull request #2113 from blang/feat_locale_de 
German translation updated (client)
 2014-03-13 10:59:31 +01:00
Jeff Atwood
aea608c81c simplify version number display a bit 2014-03-12 17:13:39 -07:00
Robin Ward
085f7997a2 FEATURE: Upload backups to S3 when complete. 2014-03-12 16:24:45 -04:00
Robin Ward
42ca83ece5 FEATURE: New site setting to enable a daily automatic backup 2014-03-12 13:30:47 -04:00
Robin Ward
dc1d6decf5 Support for removal of old backups automatically via a site setting 2014-03-12 12:24:35 -04:00
Neil Lalonde
659e7fa4ce FEATURE: Warn when reviving a topic that has been inactive for X days. Setting warn_reviving_old_topic_age controls when the warning is shown. Set it to 0 to disable this feature. 2014-03-12 10:44:12 -04:00
Benedikt Lang
b7315cfc05 German translation updated (client) 2014-03-12 14:18:13 +01:00
riking
c29c15a7a3 Switch from MMM D to D MMM to separate from year 
Additionally, in German, the format is 'D. MMM'.
 2014-03-11 03:28:13 -07:00
Régis Hanol
b42a19184e FEATURE: top is now by default in the top menu 2014-03-10 21:21:16 +01:00
Robin Ward
9929560c40 FIX: Suggested Topics had a hardcoded 5 and was ignoring the 
SiteSetting
 2014-03-10 15:36:45 -04:00
Noel B. A
2d9aae80be updated spanish translation 2014-03-10 17:55:47 +03:00
Jeff Atwood
ef854d459b few more quick new user tips tweaks 2014-03-10 00:52:36 -07:00
Jeff Atwood
9abc2217ee improve quick tips PM all new user copy 2014-03-10 00:43:30 -07:00
Sam
e68e106be7 UI: we only intended to add the word "new" for new topics 2014-03-10 13:40:49 +11:00
Sam
57626a3930 Merge pull request #2064 from staryume/patch-5 
Update client.zh_TW.yml
 2014-03-10 10:30:48 +11:00
Sam
766c8f8f64 Merge pull request #2075 from riking/second-person 
Standardize on second person on preferences page
 2014-03-10 10:29:23 +11:00
Mikulas
3fb4e36766 update czech localization 
Contributors: marmat, OukiDouki, Mirek2, zoul, MikulasDite
 2014-03-08 23:53:36 +01:00
riking
3f7f272550 Standardize on second person on preferences page 2014-03-07 15:26:33 -08:00
Robin Ward
055b367e2b Add link counts to alt tags of their badges. 2014-03-07 14:43:29 -05:00
Régis Hanol
be8128b0c2 force refresh when the 'top_menu' setting changes 2014-03-07 19:07:53 +01:00
Régis Hanol
8214536614 BUGFIX: don't show redirect reason if you aren't redirected 
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
 2014-03-07 18:58:53 +01:00
Régis Hanol
f52ab7fc77 Merge pull request #2067 from riking/better-backup-name 
Add site name to beginning of backup filename
 2014-03-07 11:47:58 +01:00
riking
d0dbc26281 Change BACKUP_ROUTE_FORMAT to support pretty-name backups 2014-03-06 20:59:10 -08:00
riking
ccd3e635d2 Refresh the site after updating certain site settings 2014-03-06 20:24:23 -08:00
staryume
21d561bc3a Update client.zh_TW.yml 
Minor fixes for the chinese translations
 2014-03-06 20:17:57 +09:00
CirnoKaster
334ae44fb7 fix translate mistake 
Line 626
minor change : favourite > starred
 2014-03-06 15:02:55 +08:00
Régis Hanol
ca12ea42a7 FEATURE: only redirect new users to top page for a limited period 
That period is defined by the `redirect_new_users_to_top_page_duration`
site setting and defaults to 7 days.
 2014-03-05 22:11:01 +01:00
Robin Ward
b0f3061113 It doesn't make sense to redirect when not logged in on a non-GET 
request. We should report a failure then. They likely logged out or
in another tab or timed out.
 2014-03-05 12:12:53 -05:00
Régis Hanol
bce4130d39 Merge pull request #2036 from ArmedGuy/profile-backgrounds 
FEATURE: Profile Backgrounds
 2014-03-05 16:00:49 +01:00
Johan Jatko
98c479c3c4 FEATURE: Profile Backgrounds 
Shares a modified codebase with avatars called "user_image"
 2014-03-05 15:10:44 +01:00
Sam
adb6541635 FEATURE: mailing list mode always available 2014-03-05 14:21:53 +11:00
Sam
69b498da24 Merge pull request #2034 from birarda/custom_username_length 
allow for custom username length via site setting
 2014-03-05 12:06:23 +11:00
Stephen Birarda
4a2dab9c5e allow for custom min_username_length 
change constant in user to be global range and not default
 2014-03-04 16:37:05 -08:00
Sam
ea553202f0 Merge pull request #2033 from birarda/master 
add option to override user attributes from SSO payload
 2014-03-05 11:33:32 +11:00
Sam
b4688fc4c5 Merge pull request #2046 from staryume/patch-4 
Update client.zh_TW.yml for better Tradtional Chinese translations
 2014-03-05 11:30:56 +11:00
Sam
4289c909b8 Merge pull request #2047 from jpsullivan/patch-2 
Typo fix
 2014-03-05 11:23:16 +11:00
Sam
3be310a0cb Merge pull request #2049 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-05 11:22:16 +11:00
Jeff Atwood
d5ec409434 add Transifex link to header of translation files 2014-03-04 14:35:23 -08:00
Stephen Birarda
c3eb2025d8 add option to override user attributes from SSO payload 
add an external_username attribute for username from SSO payload

repair the field name in SingleSignOnRecord migration

move setting of external_username for sso to controller

add settings toggle to override username/email from SSO payload

fix changing of external username after override toggle

complete tests and logic for sso override

add some extra context to username override option

add external_email and external_name to single sign on record

add setting for name override from SSO payload

complete override with stored external_email and external_name

add missing checks to tests

remove an unneeded describe block

break up a monster method for single sign on

fixes for sso attribute override after failed tests
 2014-03-04 09:52:21 -08:00
Jeff Atwood
744eecfe9f add keyboard shortcuts to progress bar tooltips 2014-03-04 00:31:40 -08:00
Jeff Atwood
2b343a9d94 minor improvements to welcome message 2014-03-04 00:29:48 -08:00
Jeff Atwood
d976623303 clarify use_https setting 2014-03-03 23:50:10 -08:00
Jeff Atwood
8010ed3ba1 we don't use the term "nickname" use -> "username" 2014-03-03 23:30:43 -08:00
Robin Ward
28f84ef0e1 TEXT: Change to "Dismiss New" 2014-03-03 17:15:53 -05:00
Noel B. A
2fd49934e8 updated spanish translation 
still there are a ton of things to do
 2014-03-04 00:24:08 +03:00
Robin Ward
f9cd354a2c FEATURE: Button to reset new 2014-03-03 15:47:01 -05:00
Josh Sullivan
cf9b2f7c3b Typo fix 
Just another simple typo fix
 2014-03-03 11:19:17 -05:00
staryume
19b1d5890e Update client.zh_TW.yml 
Change for better Traditional Chinese terms 

Admin > 管理員
Moderator > 版主
Posts > 帖子 (sometimes 發表 as a verb )
Topics > 討論話題 (主題 makes user confused with "Themes" ) 
Catogeries > 分類
Mute > 消音 (阻決 is weird )
 2014-03-03 15:23:52 +09:00
Sam
172e517b31 Merge pull request #2012 from ligthyear/incoming-emails 
Advanced New-Topic via Email Feature
 2014-03-03 10:58:10 +11:00
Sam
fb10cfdc1e Merge pull request #2025 from KiiPlatform/updated_japanese_locals 
Updated Japanese locales
 2014-03-03 10:49:04 +11:00
Sam
7004b3f3b9 Merge pull request #2037 from infogulch/abandon-button-text 
Explicit button text in abandon dialog in all lang
 2014-03-03 10:37:32 +11:00
staryume
ae344e6cd8 Update client.zh_TW.yml 
Major update of client.zh_TW.yml (eg. favourite > starred)
 2014-03-03 01:38:19 +09:00
staryume
700ccf2ca9 Update client.zh_TW.yml 
Major update for filling a lot of new Traditional Chinese translations and fixes eg. favorite > starred
 2014-03-03 01:20:06 +09:00
infogulch
bf21a55571 Explicit button text in abandon dialog in all lang 
The current post abandon dialog displays typical yes/no buttons and should
instead show more informative button text.

This commit updates all `config/locales/client.*.yml` files and *alters the
structure* of the `post.abandon` node, and *adds three new nodes* under it:
`confirm`, `yes_value`, and `no_value`. The current value of the
`post.abandon` node is moved into `post.abandon.confirm` for all languages.
For English language text, the nodes `post.abandon.yes_value` and
`.no_value` are changed to `"Yes, abandon"` and `"No, keep"`, respectively.
For other languages, the standard yes/no values are copied, allowing simple
copyedits to make them more explicit in the future.

I also make the necessary changes to the `composer_controller.js` file so
the new values are used correctly.
 2014-02-28 23:42:14 -06:00
Benjamin Kampmann
024597e643 Switch to proper exception handling system for better user feedback 
- Replace implicit return code-system in Email::Receiver with proper exception system
 - Update tests to check for exceptions instead
 - Test the PollMailbox for expected failures
 - Add proper email-handling of problematic emails
"
 2014-02-28 17:02:58 +01:00
Benjamin Kampmann
d32cb55837 Add public-inbox to Email-In-Feature 
- Adds the advanced option to accept email from non-users per category email-address
 - Adds tests covering the new feature
 - Adds UI to configure this feature in the frontend
 2014-02-28 16:53:58 +01:00
Benjamin Kampmann
37cea49459 Add Email-In-Per-Category 
- allow the configuration of an inbox-email-address per category
 - post emails to that email into that category instead of global

 - Adds UI for configuration
 - Adds Documentation for configuration
 - Adds Tests for new feature
 2014-02-28 16:53:58 +01:00
Benjamin Kampmann
4af2cf3f23 Refactor and clean up New-Topic via Email 
With the new email_in admin configuration setting, emails to the email_in_address fetched via POP will now be processed and posted as new topics to the forum.

With the email_in_min_trust you can control the trust level the user needs to have at least to be able to post an email as a new topic.

Also contains tests for the email-in feature and minor clean ups
 2014-02-28 16:53:58 +01:00
Allen Hancock
dad43b9853 Optionally allow discourse to create new topics from email. 2014-02-28 16:53:58 +01:00
German Viscuso
e383921b34 Updated Japanese locales 2014-02-28 03:36:36 +01:00
Sam
ab17e1476b Revert "Add explicit confirm button text on post abandon" 
BROKEN

This reverts commit 6bab39b9cd.
 2014-02-28 10:19:00 +11:00
Neil Lalonde
ec7ef21403 Add a Staff category. Have a topic for assets in the Staff category. Move admin quick start guide to Staff category. Quick start guide is not invisible anymore. 2014-02-27 17:38:20 -05:00
Régis Hanol
6e8559d9ef Merge pull request #2013 from wpp/update_german_translation 
Fixes a few typos in the German translation
 2014-02-27 10:50:36 +01:00
Joe
6bab39b9cd Add explicit confirm button text on post abandon 2014-02-26 23:58:38 -06:00
Sam
1992271bf9 FEATURE: white_listed_spam_host_domains for domains that are not blocked for spam 
BUGFIX: bypass host spam detection for current host
 2014-02-27 15:43:57 +11:00
Neil Lalonde
7322345039 FIX: when shown 403 error page and logging in, it will take you to the same page 2014-02-26 17:53:53 -05:00
Régis Hanol
043901ef46 FEATURE: warn the user when there is not enough space on disk to upload a backup 2014-02-26 19:38:06 +01:00
Philipp Weissensteiner
4e3a2d91ff Fixes a few typos in the German translation 2014-02-26 19:09:19 +01:00
Régis Hanol
c6bc324259 CLEANUP: remove unused pseudo locale 2014-02-26 19:03:04 +01:00
Neil Lalonde
0b1d1ffcba FIX: problems with mobile login modal 2014-02-25 16:40:30 -05:00
Neil Lalonde
7288bf1f31 Add previous page link for crawlers 2014-02-25 12:15:48 -05:00
Jeff Atwood
64258de688 shorten to "Invite Friends" 2014-02-24 23:23:55 -08:00
Sam
6f31d3f0e5 FEATURE: single sign on support 
Added support for outsourcing auth to a different website, documentation on meta
 2014-02-25 14:31:03 +11:00
Régis Hanol
88fb1f75b3 Merge pull request #1997 from dmitry/locale_ru 
Adding additional RU translations
 2014-02-24 10:30:26 +01:00
Régis Hanol
e6d4bc1b56 Merge pull request #2001 from voisintotoro/trad20140215 
Updated French translations
 2014-02-24 10:29:28 +01:00
Sam
11f031c8f9 Merge branch 'fix_commit' 2014-02-24 13:16:01 +11:00
Omega Coleman
bc56d821bb Translate client into Chinese. 2014-02-24 13:15:27 +11:00
Sam
0a26a12461 Merge pull request #1989 from Dreami/patch-1 
Update client.de.yml
 2014-02-24 09:33:31 +11:00
voisintotoro
5723124be9 Updated French tranlations 2014-02-23 20:46:18 +01:00
Jeff Atwood
fbf9006a63 email deliverability test copy update 2014-02-23 02:42:06 -08:00
Dmitry Polushkin
5b197bcf6f Adding additional RU translations 2014-02-23 01:47:02 +00:00
Dreami
520c393960 Some small changes 
Will squash later...
 2014-02-22 12:05:39 +01:00
Jeff Atwood
41843e96b6 improved copy for watching/tracked adapted f/BBS 2014-02-21 17:26:32 -08:00
Jeff Atwood
a604ebb5b5 simplify category definition copy 2014-02-21 17:04:59 -08:00
Régis Hanol
68a935c36b FEATURE: upload backups 2014-02-22 01:41:01 +01:00
Robin Ward
a07e9f7e71 FEATURE: Bulk reset read status. 2014-02-21 15:18:45 -05:00
Robin Ward
7a07f14dfc FEATURE: Can select topics and hit Dismiss Read on the /unread filter 2014-02-21 15:18:45 -05:00
Dreami
215f3b14d2 Update client.de.yml 
Changes in admin section
 2014-02-21 12:54:17 +01:00
Dreami
9252c7b3d1 Update client.de.yml 
Updated it to sound more natural in German and corrected some errors

Can anyone tell me where "latest_by: "latest by"" is used? I can't find it.
 2014-02-21 11:34:39 +01:00
Sam Saffron
2ab76f60d1 FEATURE: Discoruse.handle_exception 
to report exception via sidekiq helper, adds extra context
 2014-02-21 14:30:25 +11:00
Robin Ward
d95887c57d CHANGE: We now include the _escaped_fragment_ support by default, but 
only if the crawler check fails. It is a fallback for non-google search
engines that support the Ajax crawling API.
 2014-02-20 17:02:26 -05:00
Neil Lalonde
b696c96a19 Look at the age of a user's first post to determine if the user can be nuked, instead of looking at when the user registered. 2014-02-20 12:29:40 -05:00
Régis Hanol
0fefdb3ed9 Merge pull request #1980 from Onaldanm/patch-fr-bulk 
Add topics.bulk french translation
 2014-02-20 10:15:30 +01:00
Onaldanm
7d1a39de84 Add topics.bulk french translation 
First proposition, I hope doing it correctly :)

Fix extra space
 2014-02-20 03:31:56 -05:00
Régis Hanol
d443ddd43d Merge pull request #1922 from joallard/language-toggle 
Allow users to toggle interface language in their preferences
 2014-02-19 18:28:00 +01:00
Régis Hanol
c8795d8aa4 fix typo 2014-02-19 17:21:47 +01:00
Neil Lalonde
7f6b2e5563 Show login button on 404 page. Add routes to show login and signup modals when page/route loads. If logged in and showing 404 page, load ember app. 2014-02-18 17:18:53 -05:00
Sam
2a8734f0d5 Suppress search in topic unless we have more than 10 posts 
(configurable in site setting)
 2014-02-19 08:59:18 +11:00
Robin Ward
f19b0b5fe0 Include members count on groups page. 2014-02-18 16:17:04 -05:00
Jonathan Allard
0592420e52 Add a site setting to allow users to toggle I18n.locale 
It is false by default.
 2014-02-18 14:54:00 -05:00
Jonathan Allard
c513725f26 Allow users to toggle interface language in their preferences 2014-02-18 14:53:59 -05:00
Robin Ward
3f3c07f136 FEATURE: Can bulk update the notification level of topics 2014-02-18 13:02:22 -05:00
Sam
884346cbea Merge pull request #1951 from thoughtbot/bb-erb 
Use ERB to pull conf files into app
 2014-02-18 16:23:55 +11:00
Stephan Kaag
f12925887c Drop Rails3 support 2014-02-17 19:42:08 +01:00
Matt Campbell
ef24882999 Adding additional ES translations 2014-02-17 10:55:08 -05:00
Régis Hanol
c6cf88470d Merge pull request #1952 from stackbuilders/spanish_translations 
Added and updated Spanish translations
 2014-02-17 09:49:39 +01:00
lonehangman
739c9688ae Added endpoint for site JSON 
Removed unneeded code
 2014-02-17 15:16:53 +09:30
Sam
2b10fdc97f FEATURE: search auto scopes on topic first 2014-02-17 13:54:51 +11:00
Sam
73aca9063d FEATURE: allow overriding server static asset if needed 2014-02-17 10:44:37 +11:00
Sam
c0d947aa98 allow bench to run with unicorn optionally 
memstats can output yaml now
 2014-02-16 16:44:51 +11:00
Jose Anasco
294d7cb555 Added and updated Spanish translations 
Updated:
1. client.es.yml
2. server.es.yml
3. server.en.yml
 2014-02-14 19:29:16 -05:00
Régis Hanol
683bf8c0a4 FEATURE: add all email logs tab 2014-02-15 01:17:13 +01:00
Britt Ballard
60e1a5aa69 Use ERB when importing conf files into app 2014-02-14 16:14:55 -08:00
Régis Hanol
3f3c9ca7cb FEATURE: add filters on email logs 2014-02-15 00:50:08 +01:00
Régis Hanol
21f757fd72 mention shortcut in the tooltip on the submit button 2014-02-15 00:49:36 +01:00
Robin Ward
5f080a9b5e Revert "Merge pull request #1943 from bdthinh/VietnameseLocale" 
This reverts commit b95db5fcae, reversing
changes made to 4a44cca2d7.
 2014-02-14 18:42:19 -05:00
Robin Ward
b95db5fcae Merge pull request #1943 from bdthinh/VietnameseLocale 
Add Vietnamese locale
 2014-02-14 14:14:30 -05:00
Robin Ward
4a44cca2d7 Merge pull request #1946 from bbonamin/es_locale 
Improve Spanish client locale considerably
 2014-02-14 14:13:09 -05:00
Neil Lalonde
e83ec810e1 FIX: heading shouldn't say Sent At on the page that shows email that were not sent. duh. 2014-02-14 13:09:22 -05:00
Neil Lalonde
35dae76bbd Log when and why an email was not sent in email_logs 2014-02-14 13:06:39 -05:00
verg
de9cac0406 Add Private Message count to User Dropdown 2014-02-14 08:45:09 -05:00
Sam
b75620973f FEATURE: memory stats route for diagnostics in admin 2014-02-14 15:45:12 +11:00
bdthinh
71b6910a32 Fix server.vi.yml at header vi 2014-02-14 09:53:10 +07:00
Bruno Bonamin
406cfb1691 Improve Spanish locale considerably 
Adds some missing spanish translations

Translations up to es.admin_js.admin.flags

Translations up to admin_js.admin.groups

Translations up to admin_js.admin.logs

Translations up to admin_js.admin.users

Translations up to admin_js.admin.user

Finishes admin_js.admin translation to spanish

Adds translation for remaining keys
 2014-02-13 19:47:45 -03:00
Régis Hanol
50273ba815 rename site setting to 2014-02-13 13:31:14 -08:00
Régis Hanol
5725f02d9e allow full access to /admin/backups while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol
0e941a6253 add an alert when trying to login while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol
7993998fc5 update translations 2014-02-13 13:31:13 -08:00
Régis Hanol
e7472dc374 readonly mode 2014-02-13 13:31:13 -08:00
Régis Hanol
faf03fdeb1 update NGINX sample to allow admin to download backups 2014-02-13 13:31:13 -08:00
Régis Hanol
67a8d784fc update routes 2014-02-13 13:31:13 -08:00
Régis Hanol
0e686aca95 update sidekiq initializer to use the pausable middleware 2014-02-13 13:31:13 -08:00
Robin Ward
d3b2f87f8e In email digests, try to get longer excerpts if we don't have enough 
characters from the first paragraph.
 2014-02-13 16:11:01 -05:00
Neil Lalonde
8711762143 Users who have made no more than one post can delete their own accounts from their user preferences page. 2014-02-13 13:52:06 -05:00
bdthinh
e4a0ec1d8f Add Vietnamese locale 2014-02-13 17:41:13 +07:00
Sam
4ff6780758 Merge pull request #1935 from eriko/remove_cas 
Remove cas
 2014-02-13 17:26:20 +11:00
Ibragimov "MpaK" Renat
a04e4f388b Update puma.rb fixed: num_worker(S) 2014-02-13 11:08:27 +07:00
Robin Ward
669247977b FEATURE: Show the posts count on the groups page. It seems a bit odd 
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
 2014-02-12 14:01:36 -05:00
Neil Lalonde
6bbc3ec3e0 Add a way to flag a topic 2014-02-12 12:57:55 -05:00
Erik Ordway
98bac3b57d Purge settings and .en.yml translations. 2014-02-12 08:38:19 -08:00
Jeff Atwood
3ef65fffb8 clarify _to_block_new_user settings 2014-02-11 14:43:37 -08:00
Robin Ward
d98fee5fd4 Merge pull request #1918 from fabricioflores/master 
added translations to spanish
 2014-02-11 15:50:46 -05:00
Robin Ward
4dc24c6a77 Merge pull request #1925 from slainer68/cors_config 
Use GlobalSetting to enable CORS at application level
 2014-02-11 15:46:48 -05:00
Sam
7ad00f426c FEATURE REMOVAL: persona login 
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
 2014-02-11 16:56:48 +11:00
Robin Ward
b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it 
and apply a CSS class to their posts.
 2014-02-10 17:00:15 -05:00
slainer68
a89018db87 Use GlobalSetting to enable CORS at application level 2014-02-09 23:11:52 -08:00
Sam
212ece3e80 Remove memory profiler at least until I push a new docker image 2014-02-10 15:40:32 +11:00
Sam
ca170e4636 Add memory profiler gem for ruby 2.1 2014-02-10 15:27:46 +11:00
Fabricio Flores
5569f52f70 Update client.es.yml 2014-02-09 20:51:01 -05:00
Jonathan Allard
862faf2a17 Locales/fr: Add filter strings and change :read_more_MF 2014-02-08 18:51:18 -05:00
Sam
87a07e2355 attempt to work around concurrency issue with active record 2014-02-08 15:19:10 +11:00
Jeff Atwood
6c8e47bcc6 minor copyedits on name entry 2014-02-07 16:34:29 -08:00
Fabricio Flores
84fbb8028c added translations to spanish 2014-02-07 19:08:17 -05:00
Neil Lalonde
e0df404d7e Add site setting tos_accept_required. If enabled, users must check a box saying that they've read and accept the terms of service. 2014-02-07 16:04:13 -05:00
Jeff Atwood
6bea09a82a clarify on mutes, because noise 2014-02-07 12:39:58 -08:00
Jeff Atwood
ecca66dbfe simpler copy for mailing list mode 2014-02-07 12:35:47 -08:00
Robin Ward
3b617b04b0 FEATURE: First stab at groups page with member list 2014-02-07 10:44:51 -05:00