Commit Graph

2080 Commits

Author SHA1 Message Date
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
Robin Ward 2d47fe4473 Can list group members 2014-02-07 10:44:51 -05:00
Robin Ward 003eb06807 Move `Discourse.Group` into public models 2014-02-07 10:44:51 -05:00
Robin Ward de57f29467 More templates for the group page 2014-02-07 10:44:50 -05:00
Robin Ward a873f7a95a Client and Server side routes for a Group 2014-02-07 10:44:50 -05:00
Jeff Atwood 7feb480e20 Merge pull request #1915 from riking/patch-2
Update new_user top page redirect reason
2014-02-06 16:28:38 -08:00
Sam 227873df78 FEATURE: proper mailing list mode
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
2014-02-07 11:07:52 +11:00
Kane York d81519c0f8 Update new_user top page redirect reason
The goal of this text is to sublty hint that reading is the way to graduate out of it.
2014-02-06 16:04:16 -08:00
Jeff Atwood 929191ecd9 new intro message and better 404 copy 2014-02-06 14:51:24 -08:00
Neil Lalonde 113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Sam 4e3980896e Merge pull request #1906 from fabricioflores/patch-1
Update client.es.yml
2014-02-06 18:32:40 +11:00
Neil Lalonde 7d79d5a738 Change title of button from Starred to Star 2014-02-05 18:39:49 -05:00
Sam e1f293ad66 FEATURE: new scheduler
Removed sidetiq, introduced new scheduler

- add basic UI
- add schedule discover
- add scheduling in initializer
2014-02-06 10:26:16 +11:00
Fabricio Flores b27cc970a9 Update client.es.yml
Added tranlations in admin.users.nav
2014-02-05 14:15:20 -05:00
Robin Ward 1dac3cfd64 API endpoint for retrieving the current user 2014-02-05 13:46:24 -05:00
Vikhyat Korrapati 6acc5c19e7 Use LOAD_PLUGINS=1 instead of LOAD_PLUGINS=true for consistency. 2014-02-05 10:50:28 +05:30
Sam df65371d72 BUGFIX: microcontroller was consuming too much CPU
sleep 0.1 and file test were expensive compared to a signal every second
2014-02-05 10:48:36 +11:00
Robin Ward bf951689e8 FIX: Don't allow moving a category with children underneath another
category (creating grandchildren)
2014-02-03 15:09:35 -05:00
Régis Hanol d2974c2a15 BUGFIX: proper handling of top_menu_items 2014-02-03 16:08:00 +01:00
Régis Hanol 854fdae7cd Merge pull request #1892 from vikhyat/plugin-tests
Add rake task for running plugin tests.
2014-02-02 08:09:12 -08:00
Michael Berg fab72bcdbe German Translation updated (client.yml)
German Locale - starred
2014-02-02 15:47:57 +01:00
Vikhyat Korrapati 102352e205 Add rake task for running plugin tests. 2014-02-02 01:52:53 +05:30
macournoyer 9afe262942 Improve bluepill sample config.
Add stop_command to use `thin stop`.
Fix stdout & stderr being redirected to the wrong log file.
Rename PID file name to use a dash (like the log file).
2014-01-31 16:09:35 -05:00
Neil Lalonde e6096b4524 Revert "Try secure: true again" It's definitely broken 2014-01-31 15:02:57 -05:00
Neil Lalonde ad34a297fd Try secure: true again 2014-01-31 14:17:14 -05:00
Sam d83548964c BUGFIX: invited to pm email was using wrong key 2014-01-31 16:37:24 +11:00
Neil Lalonde f71c8bb533 Revert "Add secure flag to cookie" 2014-01-30 18:53:48 -05:00
Neil Lalonde 4e158b2316 Add secure flag to cookie 2014-01-30 17:07:08 -05:00
Robin Ward f5019be477 Support for a `/last` route to go to the last post in a topic. 2014-01-30 15:24:04 -05:00
Robin Ward 6f23870327 Bulk close operation 2014-01-30 12:44:40 -05:00
Robin Ward e9664d5cfa Merge pull request #1885 from schmatz/master
Fixed 'devloper' typo in quickstart config file
2014-01-30 09:27:19 -08:00
Robin Ward 0c73eb8ce1 Front end code is complete for changing categories of topics in bulk 2014-01-30 11:44:29 -05:00
Robin Ward 6ee266c7ee Modal for performing a bulk operation 2014-01-30 11:44:29 -05:00
Robin Ward 1696cde2ff Toggle button for bulk selection of topics 2014-01-30 11:44:29 -05:00
Michael Schmatz 9da657382c Fixed 'devloper' typo in quickstart config file 2014-01-30 08:35:07 -08:00
Jeff Atwood dc24226893 better help for category names, prefer 1 word 2014-01-30 01:31:35 -08:00
Neil Lalonde b5d0031105 Topic list dates formatting changes: use Dec '12 and Jan 21 2014-01-29 15:45:06 -05:00
Neil Lalonde 946e837542 Add twitter to Onebox.options 2014-01-29 14:14:07 -05:00
Robin Ward 2892153712 REMOVE: Get rid of the `hotness` control for good. 2014-01-29 11:54:34 -05:00
Francis Brunelle 94846f6a0a remplacer conversation par discussion (French locale) 2014-01-29 06:20:46 -05:00
sbaer 644c17d260 Trying again to merge changes to Chinese localizations done by Kelvin 2014-01-28 15:11:23 -08:00
Francis Brunelle ca1695406b minor corrections for French locale 2014-01-28 07:27:14 -05:00
Régis Hanol 8ccf519db3 Mark features as experimental
while we're fixing issues:

 - Keyboard shortcuts
 - Favcount
2014-01-28 00:39:11 +01:00
Eric Carlson bc033283c6 Google Universal Analytics 2014-01-25 17:42:25 -07:00
Neil Lalonde 90e195b2e7 More work on trust level 3 requirements page 2014-01-24 11:56:46 -05:00
Robin Ward 8493f4ad27 Merge pull request #1860 from ecuk/embed-category
Add site setting for category of topics created by embedding
2014-01-24 07:40:10 -08:00
Jeff Atwood 0634f3320a omit needless words 2014-01-24 01:44:02 -08:00
Jeff Atwood 05155c1bc1 /top tooltip clarification 2014-01-24 01:40:39 -08:00
Jeff Atwood aa1a0782a9 copyediting on topnav tooltips 2014-01-24 01:33:07 -08:00
Eric Carlson 6766451ab4 Add site setting for category of topics created by embedding 2014-01-23 22:25:48 -07:00
Régis Hanol 01cd63fff7 FEATURE: add a 14 days window to consider topics new 2014-01-24 00:22:04 +01:00
Robin Ward 97dd560d84 Allow CORS on .ico files. Should help with Favcount.js 2014-01-23 10:41:22 -05:00
Neil Lalonde ae3b53bb76 Add a page in admin to view trust level 3 requirements for a user. Only shows for users who are currently at trust level 2. 2014-01-22 18:17:45 -05:00
Neil Lalonde c1fec2d3e2 Lower default invite_expiry_days to 4 days 2014-01-22 18:17:45 -05:00
Jeff Atwood a4605f597c minor copyedit 2014-01-22 12:58:15 -08:00
Jeff Atwood 226a6c0c71 improve default meta category definition 2014-01-22 12:55:41 -08:00
Sam 7e5a17f277 FEATURE: mute/watch/track buttons for private conversations 2014-01-22 17:46:52 +11:00
Sam fc3bad8ff4 FEATURE: Seed a meta category, we want everyone to have it 2014-01-22 16:05:46 +11:00
Neil Lalonde 1dbc1c56b4 FIX: inviting a user again after the first invite expires will create a new invite 2014-01-21 16:56:40 -05:00
Neil Lalonde ba74226346 FIX: invited users get clearer messaging when setting a password for the first time 2014-01-21 12:42:26 -05:00
Michael Brown 8bd7dbfc3e Merge branch 'ubuntu-install-notes' of github.com:bloomberg/discourse into sysadmin-docs
Conflicts:
	docs/INSTALL-ubuntu.md
2014-01-21 01:39:46 -05:00
Sam 4bea4cbcaa BUGFIX: add [PM] string to private message emails 2014-01-21 17:24:05 +11:00
Régis Hanol 5feb5ee54d Changed the `topics_per_period_in_top_page` default to 50
100 was still too much
2014-01-20 22:55:32 +01:00
Neil Lalonde 0289053a70 Add the Lounge category, an exclusive area for trust level 3 users 2014-01-20 16:52:55 -05:00
Neil Lalonde 33c3e027b3 Revert "Add the Lounge category, an exclusive area for trust level 3 users" 2014-01-20 15:43:04 -05:00
Neil Lalonde 2d98720cc8 Add the Lounge category, an exclusive area for trust level 3 users 2014-01-20 15:06:20 -05:00
Sander Datema be5ecb7d3b Update client.nl.yml 2014-01-19 18:34:29 +01:00
Sander Datema 86ea3853a8 Update server.nl.yml 2014-01-19 18:33:29 +01:00
ofGEEK b7a0bee170 Update client.zh_CN.yml 2014-01-19 21:36:32 +08:00
Régis Hanol 0a8e791e14 changed `topics_per_period_in_top_page` default to 100 2014-01-18 22:58:29 +01:00
Régis Hanol 8d2e5041bc BUGFIX: proper handling of /none subcategory 2014-01-18 19:27:25 +01:00
Régis Hanol 129617b415 Lots of bugfixes
BUGFIX: navigation bar should always activate the right tab (even when diging into a top period)
BUGFIX: /top pages titles
BUGFIX: no "edit category" button on /top page after visiting a category
BUGFIX: properly hide category columns when there is no children category (on both filter + top pages)
BUGFIX: promises not caught when scrolling down a topic list to load more of them
BUGFIX: CSS on category dropdowns
Updated `top_menu` i18n with available filters
2014-01-18 19:27:25 +01:00
Robin Ward 4981525047 REFACTOR: Fixes poor class hierarchy for listing topics
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
2014-01-18 19:26:24 +01:00
worminfo 53b8baec4b Update server.zh_TW.yml
modify chinese words/sentences to HK/TW style.
2014-01-19 01:30:08 +08:00
ofGEEK 7bd1f0fc3a Update client.zh_CN.yml 2014-01-18 23:32:28 +08:00
Robin Ward 18e719b0af In development mode, if an avatar is missing just serve up a placeholder 2014-01-17 11:47:23 -05:00
Jeff Atwood e7c100aed3 another minor /top copyedit 2014-01-16 17:07:49 -08:00
Jeff Atwood 8e59b0cafd minor /top copyedit 2014-01-16 17:03:51 -08:00
Jeff Atwood 7b7fd25070 whoops, I meant "Topics Viewed" 2014-01-16 16:31:40 -08:00
Jeff Atwood 17a1c8759b Topics Entered -> Topics Visited 2014-01-16 16:30:31 -08:00
Régis Hanol c1a66b70bb BUGFIX: use previous_visit_at instead of last_seen_at to determine the best period to display in the top summary 2014-01-16 01:36:32 +01:00
Jeff Atwood defc450691 a bit more private cue on flag tooltip 2014-01-15 15:14:12 -08:00
Jeff Atwood cfcd4692b6 mention "privately" in flagging dialog 2014-01-15 14:45:00 -08:00
Régis Hanol a177732d28 FEATURE: top page should not be infinite. Limite them to 200 topics by default 2014-01-15 22:12:53 +01:00
Régis Hanol 0b2ead2248 rename topics_per_period_in_summary settings to topics_per_period_in_top_summary 2014-01-15 22:12:47 +01:00
Régis Hanol 812f195cae FEATURE: 2x the default number of topics showed in the top page 2014-01-15 19:47:59 +01:00
Sam a247389d4e FEATURE: automatically update site to latest version of assets
if a user neglects to move around the site it will prompt to do so 2 hours in
2014-01-15 12:08:35 +11:00
Sam abe814412e Source DB config more cleanly, fixes issues with socket in prd 2014-01-15 12:08:35 +11:00
Sam fd95dbe75a FEATURE: Automatically force a full refresh between pages if assets change 2014-01-15 12:08:35 +11:00
Neil Lalonde b9bda77abd Page title includes page number for web crawlers 2014-01-14 11:16:10 -05:00
Régis Hanol 3a6bffa05d FEATURE: better top pages 2014-01-14 01:09:12 +01:00
Robin Ward af3edfd5eb FEATURE: Show Reply count on blog index page when embedding 2014-01-13 12:47:41 -05:00
Sam e076682bc6 BUGFIX: Improve copy and correct instruction alignment 2014-01-13 10:11:40 +11:00
Sam 2b64118df1 Merge pull request #1782 from ligthyear/group-mention
Allow groups to be used as aliases for user mentions
2014-01-12 14:36:45 -08:00
Sam e20f5f89e6 Merge pull request #1795 from ok-harry/master
internationalize Discourse.Formatter.tinyDateYear
2014-01-12 14:34:10 -08:00
Sam 630507b83d Merge pull request #1813 from bbs4us/master
Update Simp Chinese (zh_CN) translation.
2014-01-12 14:23:00 -08:00
Jonathan f926eab055 Update Simp Chinese (zh_CN) translation #4. 2014-01-11 12:13:09 +08:00
Jonathan b5b33c8027 Update Simp Chinese (zh_CN) translation #3. 2014-01-11 09:33:36 +08:00
Jonathan f7695a83ac Update Simp Chinese (zh_CN) translation #2. 2014-01-11 09:27:54 +08:00
Julien Grillot 8bf8ab03fc Restore fr.topic.notifications.title 2014-01-11 00:19:38 +01:00
Neil Lalonde 52580f09af Rename favorite to starred everywhere 2014-01-10 14:54:19 -05:00
Neil Lalonde 888060d5d9 Add a link to meta.discourse.org in the new version notification email. 2014-01-10 11:31:26 -05:00
Jonathan 703e42a315 Update Chinese Translation. 2014-01-10 21:11:29 +08:00
Sam 166a8d2932 don't insert middleware its a problem 2014-01-10 13:51:02 +11:00
Sam 5242a49c02 BUGFIX: in some proxy scenarios https was not propergated properly 2014-01-10 12:21:09 +11:00
Jeff Atwood 20aa8bc224 Merge pull request #1805 from shivpkumar/master
username characters validation error should include underscores
2014-01-09 15:23:59 -08:00
Shiv Kumar 7df71f7bce username characters validation error should include underscores 2014-01-09 15:18:28 -08:00
Neil Lalonde 259295d865 Add post_edit_time_limit site setting to limit the how long a post can be edited and deleted by the author. Default is 1 year. 2014-01-09 11:55:04 -05:00
Shiv Kumar 6051b1a19c Update client.en.yml 2014-01-08 22:17:22 -08:00
Shiv Kumar 1f9d2e1dea add tooltip for user icon when not logged in 2014-01-08 22:13:44 -08:00
Sam adc9a58f4a BUGFIX: anon cache was mucking with params 2014-01-09 16:49:12 +11:00
Sam 1b8a32ba19 correct nginx rule forwarding header 2014-01-09 16:39:30 +11:00
Sam d4cc367a6f Disable cache for a bit to see if its killing the build 2014-01-09 16:08:59 +11:00
Sam 177983afe6 BUGFIX: mobile ui was being cached for anon views 2014-01-09 14:08:42 +11:00
Sam e8afe87412 BUGFIX: attempt to forward on the protocol set by haproxy 2014-01-09 12:40:45 +11:00
Régis Hanol cac3257b43 Merge pull request #1802 from voisintotoro/trad20140108
Updated French translation
2014-01-08 16:07:13 -08:00
Sam 1533a1163c use_ssl is just confusing, it means use_https , fix name of setting 2014-01-09 10:51:38 +11:00
Sam 5a036fc17e incorrect warning on site setting 2014-01-09 10:41:49 +11:00
Jeff Atwood a48fb956f0 increase delete user max age from 14->60 2014-01-08 14:50:08 -08:00
Jeff Atwood cf1c759cc3 minor copyedit on deleting user 2014-01-08 14:47:58 -08:00
voisintotoro e1dcb0272a Updated French translation 2014-01-08 22:00:17 +01:00
Harry Seo bb54de1e96 internationalize Discourse.Formatter.tinyDateYear
missed client.??_??.yml
2014-01-08 14:46:50 +09:00
Neil Lalonde e7975f25b8 Remove remaining code for two-column categories page 2014-01-07 18:13:49 -05:00
Robin Ward b268ea8363 Improved Embedded templates slightly. 2014-01-07 15:48:39 -05:00
Régis Hanol 0e246e65ad Merge pull request #1796 from wulff/feature-wulff-update-danish-l10n
Merged new strings from *.en.yml and completed the Danish translation
2014-01-07 07:53:55 -08:00
Benjamin Kampmann c743a985a4 Allow groups to be used as aliases for user mention
when configured by the admin a group can be found through the @mentions
feature in both the compose/reply and the private message user-selectors
and once selected the mention will be replaced by the list of users in
the group
2014-01-08 02:36:24 +11:00
Morten Wulff 63bd9da071 Merged new strings from *.en.yml and completed the Danish translation 2014-01-07 14:13:48 +01:00
Harry Seo 7713dfb8b0 internationalize Discourse.Formatter.tinyDateYear 2014-01-07 21:32:33 +09:00
Jeff Atwood 4d0ceb7551 copyedit on /top page orientation text 2014-01-07 00:48:23 -08:00
Sam af3d262bf3 BUGFIX: dots in the wrong spot 2014-01-07 11:22:55 +11:00
Sam 164418b3f6 FEATURE: added suppress_uncategorized_badge
site setting to remove the suppression of the uncategorized badge from topic lists
2014-01-07 11:00:01 +11:00
Sam 3bb2948437 BUGFIX: missing localization for auto watching topics 2014-01-07 11:00:01 +11:00
Régis Hanol f6cc3a798e fix typos in EN translations 2014-01-06 21:42:04 +01:00
Neil Lalonde 3328973f04 Category description placeholder text mentions that the category won't appear on categories page unless it has topics or the placeholder text is replaced with a real category description. 2014-01-06 11:21:46 -05:00
Robin Ward 14ec64a36a Give a better error message from the server if you've been replying too much. 2014-01-06 11:10:37 -05:00
Régis Hanol 87217d940e Merge pull request #1457 from skisulli/keyboard-shortcuts
Global Gmail style keyboard shortcuts
2014-01-06 06:40:55 -08:00
Régis Hanol d3c223e464 Merge pull request #1791 from vikhyat/smtp-auth-option
Make SMTP authentication mechanism configurable.
2014-01-06 05:28:21 -08:00
Vikhyat Korrapati 6d50504a83 Make SMTP authentication mechanism configurable. 2014-01-06 18:19:42 +05:30
Régis Hanol 8d73b7f94d BUGFIX: hide sensitive site settings 2014-01-06 13:03:53 +01:00
Régis Hanol a1f80e9e51 fixed a couple typos in the French translations 🇫🇷 2014-01-06 12:14:01 +01:00
Régis Hanol bd043ba60f Merge pull request #1790 from Bahanix/master
Update french locales
2014-01-06 03:12:26 -08:00
Sam b703d8c77a BUGFIX: redis-rails has always been a problem child
implemented an ActiveSupport::Cache::Store for our internal use.
* allows for expire by family
* works correctly in multisite
* namespaced correctly

Removed redis-rails from the project, no longer needed
2014-01-06 16:50:04 +11:00
Sam c7d99a288b try to default to sockets, so less people have issues configuring in prd 2014-01-06 12:25:29 +11:00
Sam 887ac10013 get rid of cache db, not needed 2014-01-06 12:24:11 +11:00
Sam f91163e146 FEATURE: added UI for tracking categories 2014-01-06 11:57:27 +11:00
Sam 3a2ae0061b Merge pull request #1788 from matsprea/patch-1
Update client.it.yml
2014-01-05 16:32:38 -08:00
Sam f1c5f4fa93 Merge pull request #1667 from cassiuschen/puma
Using Puma as Discourse's Webserver
2014-01-05 16:29:05 -08:00
Sam 92aee27028 Merge pull request #1765 from thisgeekza/patch-1
Add a few extra ProxyPass calls
2014-01-05 16:26:07 -08:00
Sam 6c60c9efc1 Merge pull request #1789 from ofgeek/patch-1
Update client.zh_CN.yml
2014-01-05 16:20:57 -08:00
Julien Grillot 9c049d9e43 Update french locales 2014-01-05 15:48:29 +01:00
ofGEEK 8a386eac49 Update client.zh_CN.yml 2014-01-05 22:14:10 +08:00
Matteo Spreafico 1522f1b44c Update client.it.yml 2014-01-04 23:40:32 +01:00
Robin Ward 25caec0e62 Change text at the bottom of embedded comments to be (x more replies) 2014-01-03 14:55:37 -05:00
Régis Hanol 2a79ed97ed BUGFIX: allow top to be the homepage 2014-01-03 19:36:49 +01:00
Régis Hanol 584a9f310b FEATURE: add a message explaining the user why they're being redirected to the top page 2014-01-03 19:20:40 +01:00
Robin Ward 1ffcf39448 Make embedded comments look nicer 2014-01-03 12:52:42 -05:00
Neil Lalonde a897c2b091 Add default_external_links_in_new_tab site setting 2014-01-02 15:27:37 -05:00
Régis Hanol abf910d210 FEATURE: allow for custom HTML inside the <head> tags 2014-01-02 16:22:04 +01:00
Sam 2da5d2311b FEATURE: Added UI for adding and removing watched and muted categories 2014-01-02 17:59:08 +11:00
Sam 1b259c59a5 Merge pull request #1780 from ofgeek/patch-1
Update client.zh_CN.yml
2014-01-01 17:01:00 -08:00
ofGEEK 8835e743a0 Update client.zh_CN.yml 2014-01-01 21:29:10 +08:00
Robin Ward cab6a3f339 Don't forget to precompile the embed css 2013-12-31 18:12:07 -05:00
Neil Lalonde df220ae973 Get detailed info about new versions from the Discourse Hub. Include version notes from the latest version in notification email. 2013-12-31 15:52:35 -05:00
Robin Ward 4f8aed295a FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra 2013-12-31 15:01:22 -05:00
Robin Ward 62db063e1e Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl
which not every server has. Have to rethink this.

This reverts commit e3e4c62887.
2013-12-31 12:52:31 -05:00
Robin Ward 6c4417e0f0 Use the standard .jshintrc file for JSHint options. 2013-12-31 12:41:40 -05:00
Robin Ward e3e4c62887 Support for Embeddable Comments via IFRAME 2013-12-31 12:26:24 -05:00
Sam d150bc20cf no need to remove what is not there 2013-12-31 15:12:07 +11:00
David Celis 0ed42707cc Allow configuration of Redis DB and cache DB
Hardcoding the Redis DB and Redis Caching DB to 0 and 2 in
`config/database.yml` makes an unsafe assumption that Discourse is the
only application using that install of redis-server. Instead of forcing
users to undergo yet another form of configuration, allow Discourse
admins a nicer way to configure the Redis databases used.

Signed-off-by: David Celis <me@davidcel.is>
2013-12-30 13:39:43 -08:00
Robin Ward a502266c42 Enable JSHINT's `unused` option. It caught a bunch of suspicious stuff which is fixed in this commit. 2013-12-30 13:30:22 -05:00
Sam 81eec5ff06 remove "host" so it uses sockets by default, easier to configure 2013-12-30 13:02:38 +11:00
Sam db1d01d1a2 Discourse as a Mailing List improvements
FEATURE: context is not emailed if we previously emailed you the post
FEATURE: site setting to enable_watch_new_topics , false by default.
  When enables users can elect to watch everything by default
FIX: Custom email subjects (x quoted you in [title], x replied to [title])
  was removed, this broke email grouping. TBD, include info in footer somehow
FIX: topic user specs were messy, reduce side effects
2013-12-30 13:02:12 +11:00
Neil Lalonde ad375e231a Fix wrapping of validation messages on signup form 2013-12-27 14:36:36 -05:00
Neil Lalonde b5d24c72b4 Improve wording of common password validation error 2013-12-27 14:07:51 -05:00
Régis Hanol 393ffeb6ad Merge pull request #1767 from Bahanix/master
similar_topics french locale was rough
2013-12-27 11:03:03 -08:00
Neil Lalonde aafb155db2 Merge pull request #1761 from hzeroo/patch-1
Added some missing spanish translations
2013-12-27 11:00:52 -08:00
Neil Lalonde ab12695d63 Block passwords that are in the top 5000 most common passwords. Site setting block_common_passwords can disable this feature. 2013-12-27 11:00:21 -05:00
Sam b4f547b3e2 oops missing quote 2013-12-27 13:40:13 +11:00
Régis Hanol 567d2bd23c add top page 2013-12-24 00:50:36 +01:00