Commit graph

2698 commits

Author SHA1 Message Date
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
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
Régis Hanol
fe6fc3e9b0 Merge pull request #1766 from ofgeek/patch-1
Update client.zh_CN.yml
2013-12-23 05:45:31 -08:00
Julien Grillot
54b2242d6b similar_topics french locale was rough 2013-12-23 14:42:57 +01:00
ofGEEK
e452517b18 Update client.zh_CN.yml 2013-12-23 21:05:29 +08:00
thisgeekza
42f42270b8 Add a few extra ProxyPass calls
These avoid a lot of 404 errors, and things like the style editor not working because the browser can't reach scripts, etc.
2013-12-23 13:15:39 +02:00
Sam
0d63197e7a update psuedo locale 2013-12-23 10:34:54 +11:00
Sam
b67a3a85dd split js with vendor/application
avoid one huge js bundle and instead break it down
to application and vendor (3rd party) our app changes
a lot, vendor changes a lot less
2013-12-23 10:32:07 +11:00
Sam
f7827456af move unhashed images into public images directory. asset precompile does not keep around unhashed urls in prd 2013-12-23 10:06:33 +11:00
Ryan Sullivan
5100c2bbd2 Add Global Keyboard Shortcuts
Not all of these have been fully implemented yet.

**Jump To**
* `g` then `h` - Home (Latest)
* `g` then `l` - Latest
* `g` then `n` - New
* `g` then `u` - Unread
* `g` then `f` - Favorited
* `g` then `c` - Categories List

**Navigation**
* `u` - Back to topic list
* `k` / `j` - Newer/Older conversation or post
* `o` or `Enter` - Open selected conversation
* <code>`</code> - Go to next section
* `~` - Go to previous section

**Application**
* `c` - Create a new topic
* `n` - Open notifications menu
* `/` - Search
* `?` - Open keyboard shortcut help

**Actions**
* `f` - Favorite topic
* `s` - Share topic
* `<Shift>` + `s` - Share selected post
* `r` - Reply to topic
* `<Shift>` + `r` - Reply to selected post
* `l` - Like selected post
* `!` - Flag selected post
* `b` - Bookmark selected post
* `e` - Edit selected post
* `d` - Delete selected post
* `m` then `m` - Mark topic as muted
* `m` then `r` - Mark topic as regular
* `m` then `t` - Mark topic as tracking
* `m` then `w` - Mark topic as watching
2013-12-22 12:16:42 -07:00
bent
6d47d9d249 Really add that file! 2013-12-22 00:33:17 +00:00
[Zero]
b7b0c4a20b Added some missing spanish translations 2013-12-21 21:31:47 +01:00
illspirit
e47efa6b7a Update failing_emails_warning 2013-12-20 22:08:49 -05:00
illspirit
1b2e3bf141 Fix smtp settings, added password 2013-12-20 20:50:17 -05:00
Neil Lalonde
f91cb11666 Show why a user can't be deleted on the page instead of as a tooltip 2013-12-20 11:37:01 -05:00
Neil Lalonde
6135d1d214 Add a button to clear filters on site settings page 2013-12-20 11:37:01 -05:00
Jeff Atwood
12f89aef95 invite new users to visit OTHER topics 2013-12-20 02:30:04 -08:00
Jeff Atwood
ac0bcceaf1 clarify reply limit is only for THIS topic 2013-12-20 02:27:51 -08:00
Sam
bac2d21382 strip out nil settings from config 2013-12-20 19:12:08 +11:00
Sam
8b33b45c2d should be commented out 2013-12-20 18:01:41 +11:00
Sam
4b04ac4c2b correct defaults 2013-12-20 16:23:01 +11:00
Sam
f5f09933df Merge branch 'master' of github.com:discourse/discourse 2013-12-20 16:17:52 +11:00
Sam
7b8d2547d0 globals now implemented and documented 2013-12-20 16:17:21 +11:00
Sam
b312b4d563 clean up config to use global settings 2013-12-20 15:12:23 +11:00
Jeff Atwood
2ac9ad6d51 edit copy on new user topic reply limit 2013-12-19 16:06:06 -08:00
Neil Lalonde
854d9c8fc6 Minimum password length is configurable with the min_password_length site setting. FIX: reset password needs to validate password length. 2013-12-19 16:15:47 -05:00
Robin Ward
1cac9fa257 New users can only post newuser_max_replies_per_topic times per topic. 2013-12-19 13:45:55 -05:00
Robin Ward
3dffa763c5 Merge pull request #1741 from abbat/master
Russian translation (actual version)
2013-12-19 08:33:56 -08:00
Robin Ward
40327c25e8 Merge pull request #1747 from alxndr/rss-tweak
tweak RSS elements for W3C compatibility
2013-12-19 08:26:04 -08:00
Robin Ward
c2f0bdcf49 Merge pull request #1746 from ofgeek/patch-1
Update client.zh_CN.yml
2013-12-19 08:24:35 -08:00
Sam
66afabcf4c stop messing with asset pipeline defaults
stripping postfixes is wasteful and uneeded. It messes up our build
2013-12-19 12:33:17 +11:00
Sam
9cecabd023 don't warn unless in production 2013-12-19 09:59:44 +11:00
Régis Hanol
380f60d17c shorter text is better text 2013-12-18 22:10:45 +01:00
Neil Lalonde
beef3008b6 Shorter instructions for the name field in the signup form. 2013-12-18 15:37:59 -05:00
Alexander
8294dced6c tweak RSS elements for W3C compatibility
installation needs to have contact_email set in the admin settings in
order for that installation to have truly valid feeds
2013-12-18 11:06:36 -05:00
ofGEEK
51f92fd87b Update client.zh_CN.yml 2013-12-18 20:55:09 +08:00
Sam
14d21ec865 improve config so you can use it with a socket optionally 2013-12-18 19:23:58 +11:00
Sam
a85333790f attempt to bypass setting port if socket is provided 2013-12-18 17:48:54 +11:00
Sam
a7421f8612 correct parsing 2013-12-18 17:21:01 +11:00
Sam
573e3bd348 fix error message 2013-12-18 17:17:12 +11:00
Sam
5232f0efd1 default to a db called postgres 2013-12-18 16:54:47 +11:00
Sam
ffffee3ae1 IMPORTANT - removed all sample files
This is very likely to cause merge conflict, it is for the greater good
Discuss at: http://meta.discourse.org/t/enough-with-the-sample-files/10351

From now on we use ENV to customise if needed
2013-12-18 16:46:37 +11:00
Neil Lalonde
39a360f6e3 Improve tooltip on categories stats. 2013-12-17 17:43:04 -05:00
Sam
5bd595c9a6 FEATURE: default_code_lang for syntax highlighting is configurable 2013-12-17 12:08:29 +11:00
Neil Lalonde
7fb985a02e Improve spacing of registration form, and add instructions to the password field. 2013-12-16 17:31:21 -05:00
Anton Batenev
12535d645b Russian translation (actual version) 2013-12-17 01:08:37 +04:00
Neil Lalonde
341adc93a4 Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories. 2013-12-16 15:13:57 -05:00
Robin Ward
0c3a3f38e7 Merge pull request #1740 from davh/master
Updated Swedish client translations
2013-12-16 10:55:14 -08:00
Robin Ward
acf262b631 Support for "no subcategories" 2013-12-16 13:06:35 -05:00
Sam
646cca3128 Good luck getting this updated everywhere, kicking myself really hard for allowing these stupid sample files
see: http://meta.discourse.org/t/enough-with-the-sample-files/10351

Our default sample setup was not minifying css or js causing js and css to be 2.5x larger than it needed

Anyone using my docker setup, please run a new bootstrap. Anyone else, apply diff manually.
2013-12-16 18:21:24 +11:00
David Hedqvist
036eb3e5a5 Updated Swedish client translations 2013-12-15 22:13:05 +01:00
Alexander
d93e4fc65d add more info to rss feeds 2013-12-15 01:17:39 -08:00
Robin Ward
3f2907a924 Merge pull request #1735 from piac/patch-2
Update client.it.yml to have category section
2013-12-13 12:52:40 -08:00
Neil Lalonde
49c3482464 Show topic and post counts by day/week/month/year on categories page 2013-12-13 15:37:45 -05:00
Giulio Piacentino
3360d9daee Update client.it.yml to have category section
As outlined in this question:
http://meta.discourse.org/t/all-categories-on-non-english-sites/11417
2013-12-13 20:26:52 +01:00
ofGEEK
e4b2e59daa Update client.zh_CN.yml 2013-12-13 21:36:11 +08:00
voisintotoro
cb7de5d2de Updated French translation and fixed the fr_FR: to fr: 2013-12-12 23:17:43 +01:00
Neil Lalonde
6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Régis Hanol
0525cbdb11 Corrected the mention string in the user stream. (props to @sunyatasattva)
Previously the string would show *You mentioned {{Your Name}}*. Now it
correctly shows *You mentioned {{Other user name}}*
2013-12-12 11:46:36 +01:00
Régis Hanol
06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Neil Lalonde
ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Robin Ward
6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
ofGEEK
29eda817f2 Update client.zh_CN.yml 2013-12-07 08:30:21 +08:00
Neil Lalonde
9a24d2651d Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days. 2013-12-06 16:39:35 -05:00
Robin Ward
b646495798 Remove unused translations 2013-12-06 13:16:04 -05:00
Robin Ward
314a0e3fad Some style changes for omitted posts, also mobile style. 2013-12-06 12:51:00 -05:00
Robin Ward
cece283667 Merge pull request #1714 from moorchegue/locale/russian/transliteration_fix
Russian locale transliteration table tiny fix.
2013-12-06 08:38:16 -08:00
Neil Lalonde
9cef677867 Add comment in database.yml samples about port number 2013-12-06 11:01:22 -05:00
Neil Lalonde
082f131b27 Add a site setting for when progress bar should only show post number. Default is 1000. 2013-12-05 17:17:44 -05:00
Robin Ward
79427732b2 Show Gaps in the post stream when filters are active
Conflicts:
	app/assets/javascripts/discourse/templates/topic.js.handlebars
2013-12-05 16:46:59 -05:00
Neil Lalonde
0fe5ecbb24 When there are 2000 or more posts, only show the post number on the progress bar 2013-12-05 15:50:15 -05:00
Sander Datema
56b9d4e380 Updated (and corrected) Dutch translation 2013-12-04 10:22:02 +01:00
murchik
8eff2f0172 Russian locale transliteration table tiny fix. 2013-12-04 04:22:29 +04:00
Robin Ward
0b86067be9 Merge pull request #1705 from albandiguer/tests_performance
Test performance: define a lower post max length
2013-12-02 12:31:32 -08:00
Neil Lalonde
79f1055164 Fix autoclose form in category modal 2013-12-02 11:03:35 -05:00
Sam
051fb5bb5b cors for fonts, so firefox stays happy 2013-12-01 15:18:59 +11:00
Alban Diguer
70bd5832a9 Performance: reduce max length post model for testing purpose 2013-11-30 15:13:41 +13:00
Régis Hanol
298b54c0e7 add download link in lightbox 2013-11-29 20:03:39 +01:00
Robin Ward
781a8876d3 Show post count in digest emails. Sort by score 2013-11-29 13:00:25 -05:00
Régis Hanol
78b2c5acff use CDN_URL environement variable in production 2013-11-29 18:35:29 +01:00
Neil Lalonde
09e3767998 Add base_url to link in pending_users_reminder email 2013-11-28 14:49:11 -05:00
Robin Ward
a86d2b8f03 Merge pull request #1700 from jamiew/en-typo
Fix "remotes images" typo
2013-11-28 11:23:28 -08:00
Régis Hanol
52160179f8 add a tombstone for extra safety 2013-11-27 22:05:11 +01:00
Neil Lalonde
c91d1624cf Oops, add browser-update to config.assets.precompile 2013-11-27 14:41:35 -05:00
Jamie Wilkinson
26a726e8e4 Fix "remotes images" typo 2013-11-27 10:42:40 -05:00
Neil Lalonde
a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
jjangg96
c2e7e72b74 faq.ko.html.erb Added
Korean translate updated.
2013-11-27 12:21:59 +09:00
Régis Hanol
4e310dd75f Merge pull request #1696 from ofgeek/patch-1
Update client.zh_CN.yml
2013-11-26 05:39:07 -08:00
ofGEEK
68ee1059f3 Update client.zh_CN.yml 2013-11-26 20:58:45 +08:00
Sam
9d13c6b931 we need this eager load thing 2013-11-26 15:16:56 +11:00
Sander Datema
2d21e64367 Update client.nl.yml 2013-11-25 17:06:05 +01:00
Sander Datema
6a7e71885d Updated server.nl.yml 2013-11-25 17:03:54 +01:00
Jeff Atwood
8df30fa48e minor copyedit on summary text 2013-11-22 17:18:38 -08:00
Neil Lalonde
35bb4fc17f When flag is from system, don't show a user avatar. Say System: instead 2013-11-22 11:14:09 -05:00
Robin Ward
4c0642cbe1 Merge pull request #1684 from abbat/master
Russian translation (actual version)
2013-11-22 08:07:25 -08:00
Neil Lalonde
574a8c92c4 Change enforce_global_nicknames to false until we start giving out access keys 2013-11-21 15:44:09 -05:00
Cassius Chen
ee5f35d4e9 Update puma.rb 2013-11-21 23:00:14 +08:00
Anton Batenev
a734878930 Russian translation (actual version) 2013-11-21 13:46:19 +04:00
Régis Hanol
fb4fb50b7b Merge pull request #1683 from GManzato/fix_fr_translation
Update french translation
2013-11-21 00:36:41 -08:00
Régis Hanol
7ad21b0f90 Merge pull request #1682 from ofgeek/patch-1
Update client.zh_CN.yml
2013-11-21 00:28:31 -08:00
Gilles Manzato
e6995945ea Update french translation 2013-11-21 09:17:15 +01:00
Jeff Atwood
5bc3176ffb minor copyedits 2013-11-20 17:21:51 -08:00
ofGEEK
fe21ffdab4 Update client.zh_CN.yml 2013-11-21 09:06:33 +08:00
Sam
bcc9d749ad load up routes in master 2013-11-20 12:36:19 +11:00
Jeff Atwood
724f81258c copyedit on summarize 2013-11-19 17:27:28 -08:00
Jeff Atwood
e2458fa892 brevity for user card filter 2013-11-19 17:21:55 -08:00
Sam
7603faa20d add rbtrace for production tracing 2013-11-20 10:10:12 +11:00
Sam
325ad46c20 Merge pull request #1681 from germanviscuso/japanese_locales
Provides Japanese locales
2013-11-19 14:58:06 -08:00
Neil Lalonde
1616741836 Say something when no site settings match the filter 2013-11-19 16:46:20 -05:00
Neil Lalonde
68a69f06e3 Say All instead of All Results 2013-11-19 16:46:20 -05:00
German Viscuso
3f049f4853 Provides Japanese locales 2013-11-19 22:20:19 +01:00
Neil Lalonde
981d8f6aea Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing... 2013-11-19 14:15:28 -05:00
Robin Ward
f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Régis Hanol
291acca4fa autoload server/client locales in plugins 2013-11-19 16:42:28 +01:00
ofGEEK
2d66fd38ea Update client.zh_CN.yml 2013-11-19 22:21:20 +08:00
Gilles Manzato
231fa9c2c0 Update french translation 2013-11-19 01:00:05 +01:00
Robin Ward
a8f9ba7566 Change "Cancel Summary" -> "Show All Posts" 2013-11-18 17:00:19 -05:00
Régis Hanol
6e3de67977 fix edit reason when editing a reply 2013-11-18 19:51:30 +01:00
Robin Ward
a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Neil Lalonde
ae58a7db95 Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank. 2013-11-18 13:45:10 -05:00
Robin Ward
629fe8b426 If the topic can be summarized, expand the topic map by default 2013-11-18 13:43:35 -05:00
Robin Ward
4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward
ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Régis Hanol
dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
cassiusChen
f784a188c6 Locate the Puma config file. 2013-11-18 12:53:36 +08:00
Régis Hanol
482b752046 add edit reason when editing a post 2013-11-15 23:28:49 +01:00
Neil Lalonde
d3c84b60c8 Add an All Results tab when filtering the site settings 2013-11-15 16:43:56 -05:00
Régis Hanol
8a83f1a88f add disk space usage failsafe 2013-11-15 16:48:38 +01:00
Régis Hanol
16267e4887 add download_remote_images_to_local site setting 2013-11-15 15:22:18 +01:00
Sam
461972844e unicorn out of band GC 2013-11-15 12:15:49 +11:00
Neil Lalonde
c57232b73d Move some site settings around 2013-11-14 16:02:14 -05:00
Neil Lalonde
ca0a8a5970 Move save and resetDefault actions to the adminSiteSettingsCategory controller 2013-11-14 16:02:14 -05:00
Neil Lalonde
df213d7b23 Filter on site settings across all categories 2013-11-14 16:02:14 -05:00
Neil Lalonde
1e37abc310 Add site setting category support 2013-11-14 16:02:13 -05:00
Neil Lalonde
791f5ac94e Load site settings from config/site_settings.yml 2013-11-14 16:02:13 -05:00
Sam
ee280c5c04 correct param expansion 2013-11-14 12:54:52 +11:00
Régis Hanol
a01b423263 remove empty plugin.rb file 2013-11-13 16:14:22 +01:00
Sam
8339337cd1 strip out docker stuff, put into a plugin 2013-11-13 17:42:31 +11:00
Sam
0e8914cee6 add unicorn launcher to support live reloads
add oobgc rudimentary support
2013-11-13 15:29:36 +11:00
Sam
11428ef9d6 filter out android from mini profiler 2013-11-12 16:47:01 +11:00
Sam
932c2675a7 work in progress, admin page for upgrades (provides source lives in git) 2013-11-12 16:42:35 +11:00
Robin Ward
bfe3d1ec87 Merge pull request #1629 from dmchk/ru
Actualize ru.js.categories
2013-11-08 09:56:52 -08:00
Robin Ward
cabde46fe4 Merge pull request #1631 from velesin/fixture_jshint_fix
FIX: adds fixture test helper to JSHint config
2013-11-08 09:53:36 -08:00
Robin Ward
921ea603fa Shorten some text 2013-11-08 12:29:35 -05:00
Wojciech Zawistowski
e3e2d66ae4 FIX: adds fixture test helper to JSHint config 2013-11-08 17:28:57 +01:00
Dmitry Ustalov
548806d050 Actualize ru.js.categories 2013-11-08 21:20:12 +05:00
Régis Hanol
98a91b80aa Merge pull request #1628 from vipulnsward/server_typos-1
Fix more typos in server locale
2013-11-08 06:25:55 -08:00
Vipul A M
355459b8c7 Fix more typos in server locale 2013-11-08 18:45:11 +05:30
Neil Lalonde
dbd2332b74 Public user profile page shows if the user is suspended and why. 2013-11-07 16:34:31 -05:00
Neil Lalonde
0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Régis Hanol
005163b17b Merge pull request #1621 from ofgeek/patch-1
Update client.zh_CN.yml
2013-11-07 00:20:15 -08:00
ofGEEK
af0d712253 Update client.zh_CN.yml 2013-11-07 09:08:21 +08:00
Robin Ward
de30af9302 Support for inviting to a forum from a user's invite page. 2013-11-06 12:56:50 -05:00
Sam
e5202b19c0 fix for emoji precompile 2013-11-06 22:39:28 +11:00
ofGEEK
58f3949f7f Update client.zh_CN.yml 2013-11-06 10:21:15 +08:00
Robin Ward
25ef66c60b User invites page now has search, displays first invites_shown records 2013-11-05 17:53:26 -05:00
Neil Lalonde
adba0c2996 Avoid deprecation warning about whitelist_attributes in rails 4 2013-11-05 15:47:43 -05:00
Neil Lalonde
18bc6ecd08 Sidetiq::Clock#start is deprecated. Remove it. 2013-11-05 15:43:48 -05:00
Vipul A M
44bea4de38 Fix some locale typos 2013-11-05 16:13:49 +05:30
Régis Hanol
9f1b7f799f Merge pull request #1612 from jjangg96/Korean
Edited Korean Client yml
2013-11-05 02:27:01 -08:00
Régis Hanol
eb9c1f28ed add debug mode to autospec 2013-11-05 11:01:17 +01:00
jjangg96
cc99fe22e6 Edited Korean Client yml 2013-11-05 18:50:48 +09:00
Sam
a2efe27a58 allow compile in profile. 2013-11-05 14:12:26 +11:00
Neil Lalonde
bd9b85f076 Screened Urls page shows results for each domain instead of each url 2013-11-04 16:24:48 -05:00
Neil Lalonde
ede59a4386 FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available. 2013-11-04 12:51:09 -05:00
Robin Ward
e17a5092fe Merge pull request #1607 from sanderdatema/patch-1
Update server.nl.yml
2013-11-04 07:14:10 -08:00
Sander Datema
57c0f5ee4c Update client.nl.yml 2013-11-03 22:24:26 +01:00
Sander Datema
866a7057ad Update server.nl.yml 2013-11-03 22:22:40 +01:00
ofGEEK
a7f53847c1 Update client.zh_CN.yml 2013-11-02 22:53:46 +08:00
Sam
8ff35d4b10 automatically make developers admins on account creation, this solves the user #1 problem
you can simply set the DEVELOPER_EMAILS to a comma delimited list and the users will be auto admined
2013-11-02 10:26:02 +11:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Neil Lalonde
92a0729937 When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs. 2013-11-01 10:47:26 -04:00
ofGEEK
ddf47e54af Update client.zh_CN.yml 2013-11-01 14:48:34 +08:00
Robin Ward
b93ca1089e List subcategories on categories page 2013-10-31 18:02:24 -04:00
Robin Ward
5a78c1cb34 Changed confusing 'all categories' text 2013-10-31 16:41:13 -04:00
Robin Ward
7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward
3d6d7c8abe SiteSetting to hide regular names from users 2013-10-30 15:45:34 -04:00
Sam
ab6efe8323 I tire of sample files, make number of workers configurable 2013-10-30 16:34:25 +11:00
Sam
ef2b8cbe5d configurable worker process count for unicorn 2013-10-30 16:33:08 +11:00
Robin Ward
bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Régis Hanol
caeb91a55f Merge pull request #1588 from GManzato/fix_fr_translation
Update french locale
2013-10-29 13:55:25 -07:00
Gilles Manzato
b3e65c937b Update french locale 2013-10-29 21:14:48 +01:00
Robin Ward
6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Raul Murciano
bd5fe86c87 require X-Frame-Options: SAMEORIGIN for clickjack prevention 2013-10-28 15:14:08 -07:00
Robin Ward
8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Robin Ward
9dfdc31527 Merge pull request #1576 from ofgeek/patch-1
Update client.zh_CN.yml
2013-10-28 07:27:31 -07:00
Robin Ward
5134f54c40 Merge pull request #1579 from abbat/master
Russian translation (actual version)
2013-10-28 07:27:16 -07:00
lionel
3a1fe9701a fix fr localization 2013-10-28 13:29:26 +01:00
Anton Batenev
de3afe514a Russian translation (actual version) 2013-10-28 14:09:34 +04:00
Sam
bdbc2f590f Merge pull request #1574 from pkallberg/master
Cloud 66 EasyDeploy
2013-10-27 22:35:24 -07:00
Sam
da62a10b77 work around regression in ruby head 2013-10-28 15:13:10 +11:00
Sam
2fa911f133 use DISCOURSE_HOSTNAME instead 2013-10-28 10:35:53 +11:00
Sam
273643adfc allow passing in of hostname in sample file 2013-10-28 10:31:23 +11:00
ofGEEK
4974567365 Update client.zh_CN.yml 2013-10-26 19:39:34 +08:00
Robin Ward
e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Gilles Manzato
524bd5ec70 Add missing translation in FR 2013-10-25 14:03:06 +02:00
Neil Lalonde
d149066ac6 Show a warning on admin dashboard if running on an older patch level of ruby 2.0 2013-10-24 18:22:47 -04:00
Neil Lalonde
017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward
61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward
9adcd1579d Renamed components to lib in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Philip Kallberg
dfd2d36089 cloud66 easydeploy 2013-10-24 16:30:44 +01:00
Sam
b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam
666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
Robin Ward
541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Sam
08c08a3bc6 Merge pull request #1568 from ofgeek/patch-1
Update client.zh_CN.yml
2013-10-22 23:12:03 -07:00
ofGEEK
d078f0f775 Update client.zh_CN.yml 2013-10-23 08:47:24 +08:00
Robin Ward
348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Neil Lalonde
7d582fbee3 Screened ip address can be edited, deleted, and changed to allow or block. 2013-10-22 16:30:46 -04:00
Neil Lalonde
648b11a0eb Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address. 2013-10-21 14:50:18 -04:00
Sam
e7a037709f allow ordering categories in the edit category ui 2013-10-21 17:21:34 +11:00
Sam
f0862a5c2e Merge pull request #1551 from ofgeek/patch-1
Update client.zh_CN.yml
2013-10-20 22:21:44 -07:00
Sam
1d71a2c722 Merge pull request #1553 from lucasts/master
Up-to-date pt_BR translations
2013-10-20 22:21:22 -07:00
Sam
6067795780 categories can now be re-ordered 2013-10-21 15:25:20 +11:00
Lucas
6729b46cff Up-to-date pt_BR translations
- some fixes to more approprieted language
- mimic source(en) files to easy future translations
- added missing texts
2013-10-20 23:58:13 -02:00
ofGEEK
a6a7677fa9 Update client.zh_CN.yml 2013-10-21 08:43:53 +08:00
Sam
9f1edd4c7a Merge pull request #1537 from fny/master
Remove best standards support for Rails 4 (Removed from ActionDispatch)
2013-10-20 15:22:39 -07:00
Régis Hanol
a2b27d0700 Merge pull request #1546 from lucasts/patch-1
Update client.pt_BR.yml
2013-10-20 07:00:02 -07:00
Cassius Chen
84ca31506f Update server.zh_CN.yml
Chinese Translation for `this_year`
2013-10-20 13:16:52 +08:00
Lucas Stephanou
98d9348e45 Update client.pt_BR.yml
add pt_BR translation for 'this_year'
2013-10-19 13:29:16 -03:00
Sam
e82d975279 work in progress new category list page 2013-10-18 11:10:10 +11:00
Sam
1ee49798b2 work in progress wide category list 2013-10-18 11:10:10 +11:00
Sam
8f0e3de675 work in progress, wide categories page 2013-10-18 11:10:10 +11:00
Jeff Atwood
e26cbe79ad add "this" to category year stats for clarity 2013-10-17 15:54:48 -07:00
Faraz Yashar
69460b8f9b Remove best standards support for Rails 4 since it's been removed from ActionDispatch 2013-10-17 15:36:18 -04:00
Neil Lalonde
0eaf32db45 Add a message to flags created because of the newuser_spam_host_threshold site setting 2013-10-17 15:08:11 -04:00
Robin Ward
ae5b95514b Merge pull request #1535 from ofgeek/patch-1
Update client.zh_CN.yml
2013-10-17 06:56:52 -07:00
ofGEEK
010bfd3c94 Update client.zh_CN.yml 2013-10-17 20:51:52 +08:00
Jeff Atwood
85387b8f72 preformatted text help 2013-10-16 15:07:09 -07:00
Jeff Atwood
052aa65a2d code sample is actually preformatted text 2013-10-16 15:06:35 -07:00
Régis Hanol
a0316f2392 Merge pull request #1534 from voisintotoro/master
New update of the french translation
2013-10-16 13:38:23 -07:00
voisintotoro
b997cc2486 New update of the french translation
I hope i didn't missed some of the previous remarks.
2013-10-16 22:10:29 +02:00
Robin Ward
c2a66a1b3b Post Expansion enhancements 2013-10-16 14:10:18 -04:00
Neil Lalonde
c7aaee907b When system flags users as sockpuppets, show a reason in the admin flags ui 2013-10-16 11:47:16 -04:00
Régis Hanol
debd9bfb25 add a sitesetting to enable the CleanUpUploads job 2013-10-16 17:09:36 +02:00
Sam
3d647a4b41 remove rack cache, it has been causing trouble
instead implement an aggressive anonymous cache that is stored in redis
this cache is sitting in the front of the middleware stack enabled only in production
TODO: expire it more intelligently when stuff is created
2013-10-16 16:39:18 +11:00
Sam Saffron
20039860eb Moved cloud66 config out of .cloud66 into config/cloud/cloud66 it is way too prominent as the first folder in github
Amended documentation to point to it from the install guide in the alternative section
Removed callout from the ubuntu guide, as it is unrelated
2013-10-15 22:31:57 +11:00
Régis Hanol
4536b5fe04 added a job to clean up orphan uploads 2013-10-15 11:15:48 +02:00
Sam
c954807a63 added upstart script for Discourse 2013-10-13 10:16:53 +11:00
Neil Lalonde
3c2c6ab24b Add sockpuppet spammer detection. Automatically flag posts if they are from new users (registered less than 24 hours ago) at the same IP address and one of them started the topic. 2013-10-11 13:34:05 -04:00
Régis Hanol
c1ba41195e Merge pull request #1520 from ofgeek/patch-1
Update client.zh_CN.yml
2013-10-11 09:53:34 -07:00
Régis Hanol
c38ba8acdd add rss links to anonymous homepages 2013-10-11 18:43:29 +02:00
ofGEEK
5b4b794aa2 Update client.zh_CN.yml 2013-10-11 22:38:02 +08:00
Jeff Atwood
6ab740aa1c clarify spam domain blocks 2013-10-10 13:48:16 -07:00
Régis Hanol
ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
David Guijarro
2e97677136 Changed the client Spanish translation
As per my previous pull request.
2013-10-10 07:36:25 +02:00
Sam
90bc3323e1 Merge pull request #1505 from crohr/debian-packaging-with-pkgr
Debian packaging with pkgr
2013-10-09 21:14:58 -07:00
Sam
97dfe97d5b work around startup issue 2013-10-10 14:23:24 +11:00
Sam
28a0cb494a rails 4 upgrade
rack lock is trouble, nuke it out of orbit
more aggressive suicide for forked sidekiq
2013-10-10 14:23:24 +11:00
Sam
c4bab8915c fix initialization issues with unicorn
amend unicorn script to demonize sidekiq
create a sidekiq demon that unicorn consumes
correct bug in exec_sql with empty params
2013-10-10 14:23:24 +11:00
Sam
ad2ed5fe51 rate limits for topics and posts on first day
max_topics_in_first_day and max_replies_in_first_day
2013-10-10 10:32:03 +11:00
Neil Lalonde
ecc7ba4be6 Improve the wording of the spam_post_blocked notification 2013-10-09 16:17:26 -04:00
Anton Batenev
75df60c600 Russian translation (actual version)
Fix YML numeric keys
2013-10-09 20:07:50 +04:00
Anton Batenev
7d6b93b660 Russian translation (actual version)
* Migrating from crowdin to transifex translation service (free & less bugs)
 * Reformats YML as transifex service do
2013-10-09 18:30:38 +04:00
Robin Ward
8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04:00
Neil Lalonde
bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Régis Hanol
2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Cyril Rohr
a7b8481c8f Allow to set SMTP settings via environment variable. 2013-10-08 15:48:57 +01:00
Robin Ward
f9517f7240 Merge pull request #1503 from ofgeek/patch-2
Update client.zh_CN.yml
2013-10-08 07:31:05 -07:00
ofGEEK
b6545de423 Update client.zh_CN.yml 2013-10-08 11:26:26 +08:00
Jeff Atwood
4613006ae3 minor copyedit to reduce repetition on dialog 2013-10-04 15:36:35 -07:00
Robin Ward
7da01e2389 Changes to user expansion 2013-10-04 16:55:54 -04:00
Jeff Atwood
2b69f70775 suggested BBS copy change for inappropriate flag 2013-10-04 03:26:25 -07:00
Robin Ward
fc00269b7f Pop up with user information when clicking avatar on topic page 2013-10-03 13:06:30 -04:00
Robin Ward
578ef2098b Merge pull request #1488 from cfstras/removeAllowedUser
Allow removing users from private conversations
2013-10-03 08:02:41 -07:00
Claus Strasburger
15a973fd45 Improved private message user removal, locale edit
replaced array iteration with findProperty (will be renamed and aliased to findBy with Ember 1.1)
added modal dialog to verify
catched nil-error on topic.rb
2013-10-02 19:16:43 +02:00
Régis Hanol
125c848ee3 Update nginx.config.sample to allow custom CSS
cf. http://meta.discourse.org/t/changing-css-in-customize-section-has-no-effect/10036
2013-10-01 17:52:04 +02:00
Robin Ward
be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Sam
f0a122a66c move job files so they live underneath app/ and not in lib/
introduce new setting email_always, that will force emails to send to users regardless of presence on site
2013-10-01 17:04:02 +10:00
Kevin P. Fleming
3777d9f653 Address @Supermathie's concerns in PR1430 2013-09-30 16:28:22 -04:00
Michael Brown
6f25549668 Add process checks to kill/restart too large thins 2013-09-30 15:17:59 -04:00
Anton Batenev
9241d3b789 Russian translation (actual version) 2013-09-30 14:12:49 +04:00
Régis Hanol
3f3551f1e2 Merge pull request #1475 from elegos/master
Italian localization (pt. 1)
2013-09-27 09:20:29 -07:00
elegos
ca15527d3e Italian localization (pt. 1)
First ~600 lines of italian translation revisited including missing
strings.

TODO: lines 581+
2013-09-27 17:16:34 +02:00
Jakob Hilden
53731e23a2 German typo fix 2013-09-27 11:55:30 +02:00
Jeff Atwood
bbfcec8d18 add edit and quote admonitions to seq reply warn 2013-09-26 00:45:14 -07:00
ofGEEK
b7c0b3a3ca 增加移动版Header和样式表 2013-09-26 10:59:51 +08:00
Aleksandr Kruglov
d8027d1196 Fixed russsian localization 2013-09-21 10:43:57 +04:00
Robin Ward
99b6a62fcb New composer message for people dominating a topic 2013-09-17 14:38:39 -04:00
Neil Lalonde
0fafe124db Add enable_mobile_theme site setting. Uncheck it to disable the mobile theme. 2013-09-17 11:25:37 -04:00
Sam
6af1e12cc1 after_initialize callback for plugins 2013-09-17 10:24:15 +10:00
Neil Lalonde
ba2c4139fe Use absolute urls in notifications for automatic spammer handling. 2013-09-16 15:07:58 -04:00
Neil Lalonde
13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Sam
6ca6853392 disable XML params, they are just used by malicious bots to determine if we have XML vuls. 2013-09-16 12:58:26 +10:00
Sam
1eb1756dcf Merge pull request #1419 from mguillemot/non_editable_username_and_email
Enable/disable the possibility of editing user's nickname or email
2013-09-15 19:24:35 -07:00
Matthieu Guillemot
3ba1f20674 New site settings to enable/disable the possibility of editing user's nickname or email address 2013-09-14 21:34:21 +09:00
Anton Batenev
567121c436 Russian translation (actual version)
Plus crowdin service reformats some strings
2013-09-14 15:19:43 +04:00
Robin Ward
cca09e1436 Merge pull request #1433 from mguillemot/bluepill_env
Bluepill load content of .env file
2013-09-13 11:11:52 -07:00
Robin Ward
c365bd0070 Notify users posting sequential replies that there's a better way to do it. 2013-09-13 13:49:34 -04:00
Robin Ward
7d9a84b496 New User Education goes through a server side ComposerMessages check. Composer message for users
who don't have avatars.
2013-09-13 12:23:53 -04:00
Matthieu Guillemot
c8b20277cc Bluepill load content of .env file 2013-09-13 14:24:08 +09:00
Jeff Atwood
731fd6a4ff improve copy on auto-blocking new users 2013-09-12 15:24:50 -07:00
Neil Lalonde
827680766e Show which domains were used in the spam_post_blocked notification 2013-09-12 17:33:30 -04:00
Neil Lalonde
bded4b26fa Ask admins to fill in site_description on the dashboard, and send it to the hub 2013-09-11 16:32:49 -04:00
Neil Lalonde
4fa11f159f Add site setting site_description. If filled, it will be used in meta description tag for teh white hat SEO 2013-09-11 15:33:27 -04:00
Robin Ward
06ea8140aa New job (default off) to detect whether users have uploaded custom avatars by contacting Gravatar. 2013-09-11 15:14:18 -04:00
Robin Ward
95bfebefa4 Merge pull request #1425 from cfstras/locale-de
Updated German locale
2013-09-11 07:42:43 -07:00
Sam
9c6c0f2a3d enable eager loading in profile mode
correct bench script
2013-09-10 16:22:58 +10:00
Sam
3d9496f5d3 disable compilation in profile mode, you must precompile 2013-09-10 16:02:16 +10:00
Claus Strasburger
286780249b Updated German locale: direct replies, mobile/desktop view and private message labels 2013-09-09 20:57:48 +02:00
Robin Ward
d00e0cb96a Merge pull request #1420 from ZogStriP/rake-task-to-regenerate-avatars
rake task to regenerate avatars
2013-09-09 08:49:47 -07:00
Robin Ward
0523e8cda1 Merge pull request #1421 from ofgeek/patch-2
Update client.zh_CN.yml
2013-09-09 08:48:39 -07:00
Sam
98267d439a fixed ruby 2.0 p0 bug in fast_stack so re-pushing 2013-09-09 21:19:23 +10:00
Jeff Atwood
c59c2a4bb3 fix minor copy error on ImageMagick warning 2013-09-09 00:45:03 -07:00
ofGEEK
379007de6c Update client.zh_CN.yml 2013-09-09 09:54:03 +08:00
Régis Hanol
3e80e885ae rake task to regenerate avatars 2013-09-08 12:22:50 +02:00
Jeff Atwood
78b1036db7 fix unsubscribe link in digest emails 2013-09-08 02:25:40 -07:00
Sam
3fb0f52574 disable flamegraph while I figure out why fast stack is not working for some people on x32 2013-09-07 08:50:16 +10:00
Neil Lalonde
2ea6a61a17 Show post number in the share dialog 2013-09-06 17:34:31 -04:00
Jeff Atwood
c996378fc0 improve approval copy 2013-09-06 13:38:23 -07:00
Régis Hanol
45b838009c proper content-disposition header when downloading attachments 2013-09-06 19:23:56 +02:00
Sam
b0573c5f8f missed a few renames 2013-09-06 18:20:02 +10:00
Jeff Atwood
2b9838620d shorter user deletion text 2013-09-06 01:14:38 -07:00
Sam
2ce4468aa5 rename system_username to site_contact_username , system_user is a special user with -1 id that is only used for certain admin tasks
for example system_user will autoclose stuff if needed, it will delete stubs and be the target for flag pms
2013-09-06 17:28:37 +10:00
Neil Lalonde
eb0442159c Precompile the new css files 2013-09-05 17:31:19 -04:00
Neil Lalonde
45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward
71c1b8b9b9 When deleting a post as staff, ask if you want to delete direct replies too 2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Sam
5b08f73561 give god rights of impersonation to developers, must be edited into the production.rb config file 2013-09-05 10:27:34 +10:00
Neil Lalonde
117fc8db58 Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream. 2013-09-04 15:42:21 -04:00
Sam
22f2a0c1f4 update rails 4, use log level info in profile for better accuracy 2013-09-04 09:39:16 +10:00
Neil Lalonde
b47eedba00 Add min_trust_to_create_topic setting to require a certain trust level before users can start new topics 2013-09-03 19:12:22 -04:00
Robin Ward
0aee25616c Merge pull request #1409 from ofgeek/patch-2
Update client.zh_CN.yml
2013-09-03 07:21:52 -07:00
Robin Ward
0a1a5e2e4a Merge pull request #1410 from abbat/master
Russian translation (actual version)
2013-09-03 07:21:41 -07:00
Sam
51eb764345 mini profiler update to use latest flame graph engine 2013-09-03 17:58:56 +10:00
Jeff Atwood
f13a408c2a Omit Needless Words on new user JIT popups 2013-09-02 22:41:54 -07:00
Anton Batenev
529fe32453 Russian translation (actual version) 2013-09-02 18:48:47 +04:00
Sam
6e72eb5042 Merge branch 'master' of github.com:discourse/discourse 2013-09-02 17:19:17 +10:00
Sam
d3c5afbb80 reduce sidetiq frequency
remove minutely() schedule that was very inefficient
2013-09-02 17:14:41 +10:00
ofGEEK
ee79a28569 Update client.zh_CN.yml 2013-09-02 10:09:11 +08:00
Jeff Atwood
0089b10e25 remove footer newline from digest emails, is ugly 2013-08-30 23:08:29 -07:00
Jeff Atwood
96313ce742 better copy for repeated URL blocking 2013-08-30 21:09:35 -07:00
Robin Ward
46efbac40e Add "Unread" filter to messages tab. Rename the other two views. 2013-08-30 12:32:05 -04:00
Sam
cd3f2a5973 Merge pull request #1401 from netzpirat/update-german-translations
Update german translations
2013-08-30 00:09:16 -07:00
Sam
b730b27c4f some soample counter methods 2013-08-30 16:44:34 +10:00
Neil Lalonde
82bc6b677f Add link in hamburger menu to switch between mobile and desktop views 2013-08-29 15:19:28 -04:00
Michael Kessler
53cc1a4730 Update German server-side translations. 2013-08-29 18:10:20 +02:00
Michael Kessler
f74e68eece Update German client-side translations. 2013-08-29 16:24:27 +02:00
Sam
b41fa4988a update rails 4
ensure you clear the tmp/cache folder on each bench (so results are correct, there is an incompat upgrade)
add facter gem which will be used to collect hardware data from the bencher
2013-08-29 21:23:00 +10:00
Sam
aaf41d227f fix secret_token init to always allow an override even if its too short 2013-08-29 15:27:59 +10:00
Jeff Atwood
eec77e7bea "moved" makes more sense in the notify 2013-08-28 16:31:57 -07:00
Sam
61281a3c81 invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users 2013-08-28 17:18:31 +10:00
Robin Ward
0f6c2060b8 Merge pull request #1388 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-27 06:56:20 -07:00
ofGEEK
79ddb162b6 Update client.zh_CN.yml 2013-08-27 15:33:26 +08:00
ofGEEK
85a948d5b4 Update client.zh_CN.yml 2013-08-27 15:21:20 +08:00
Sam
89ce39c902 Merge pull request #1386 from Andersos/patch-1
added quotes
2013-08-26 18:45:06 -07:00
Neil Lalonde
3708d47c87 Check daily if there are new users who need to be approved and send a pm to moderators 2013-08-26 16:16:27 -04:00
Anders Sandvik
7dc71a616b added quotes 2013-08-26 22:00:55 +02:00
Sam
818bf1355d PluginStore for plugin specific bits of storage
Amended plugin interfaces so they work with the vk sample
2013-08-26 12:59:17 +10:00
Sam
213ce33af2 Fixed all broken specs
Moved middleware config into authenticators
2013-08-26 12:59:17 +10:00
Sam
912d4b853b slowly going about ordering our middleware 2013-08-26 12:59:17 +10:00
Sam
075002a6d5 refactoring the plugin interfaces to allow for better extensible 2013-08-26 12:59:17 +10:00
Régis Hanol
32f717420d add max_image_height site setting 2013-08-26 00:24:24 +02:00
Robin Ward
b32e87c929 Merge pull request #1377 from ZogStriP/avatar-work
Improved specs for avatar + added a warning whenever the uploaded image is not a square
2013-08-25 07:30:34 -07:00
Robin Ward
89421088e5 Merge pull request #1379 from abbat/master
Russian translation (actual version)
2013-08-25 07:28:38 -07:00
Robin Ward
9e32baa357 Merge pull request #1375 from versvs/master
Added strings
2013-08-25 07:28:10 -07:00
Anton Batenev
bad2f7bb24 Russian translation (actual version) 2013-08-25 17:19:03 +04:00
Régis Hanol
4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Robin Ward
c0b051c9f6 Show Private Messages pill as a topic list rather than individual messages. 2013-08-24 16:58:16 -04:00
Régis Hanol
3b9e62e6b9 improved specs for avatar 2013-08-24 22:45:05 +02:00
versvs
50a49138a5 Added strings
Added some strings not yet existing in the "es" locale but already in use in the application.
2013-08-24 18:10:54 +02:00
Robin Ward
acf1124c0a Merge pull request #1370 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-24 08:31:19 -07:00
Jeff Atwood
fb037290ac clarify on invite friends 2013-08-23 23:12:24 -07:00
Neil Lalonde
6e79197519 Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency. 2013-08-23 17:36:25 -04:00
Régis Hanol
43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Jeff Atwood
c409d91203 add "temporarily" to flagged content hidden 2013-08-23 00:07:08 -07:00
ofGEEK
1a58bfbdc9 Update client.zh_CN.yml 2013-08-23 09:52:10 +08:00
Neil Lalonde
25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04:00
Jeff Atwood
32655e9dad digest email footer should say "unsubscribe" 2013-08-22 12:53:28 -07:00
Neil Lalonde
10bc24b514 Add a note to allow_uncategorized_topics description 2013-08-22 12:14:41 -04:00
John Paul Ashenfelter
cc2b0f1a5f took a stab at other translations with help from google 2013-08-21 16:29:05 -04:00
John Paul Ashenfelter
bd2006b270 updated english translation 2013-08-21 16:28:51 -04:00
Neil Lalonde
47add6da70 Log when a site customization is deleted 2013-08-21 12:33:24 -04:00
Neil Lalonde
a95303fcd8 Log site customization changes. Use a modal to show staff action log details for site customizations. 2013-08-21 12:33:24 -04:00
Régis Hanol
dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Sam
b5b22f0f36 move secret token into redis to ease install 2013-08-20 17:17:19 +10:00
Neil Lalonde
1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Neil Lalonde
7eaedb84e1 Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked 2013-08-19 12:00:48 -04:00
Robin Ward
103f204e36 Merge pull request #1354 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-19 07:35:36 -07:00
Anton Batenev
35442a0c79 Russian translation (actual version) 2013-08-19 12:26:02 +04:00
ofGEEK
59a252f535 Update client.zh_CN.yml 2013-08-19 10:53:05 +08:00
Sam
1d74cc60a1 don't try sending emails out in profile mode 2013-08-19 11:33:38 +10:00
Sam
b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Michael Kirk
4af8a9102e Authenticate with Discourse via OAuth2
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
2013-08-17 21:45:20 -07:00
Régis Hanol
ea6e73076b change your avatar in a modal 2013-08-17 00:35:29 +02:00
Neil Lalonde
baff59d752 Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting. 2013-08-16 17:28:36 -04:00
Michael Brown
95c246e257 Add section for additional MIME in nginx 2013-08-16 11:49:50 -04:00
Neil Lalonde
b6285b85d2 Add reject option to pending users page 2013-08-16 11:42:43 -04:00
Jeff Atwood
946b02533b better copy for password change button 2013-08-15 22:25:26 -07:00
Sam
b52761c522 Merge pull request #1338 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-15 21:52:02 -07:00
ofGEEK
b2acf33a74 Update client.zh_CN.yml 2013-08-16 11:16:17 +08:00
ofGEEK
3a8fbdb9a8 Update client.zh_CN.yml 2013-08-16 11:13:50 +08:00
ofGEEK
490b057922 Update client.zh_CN.yml 2013-08-16 11:07:25 +08:00
Robin Ward
27fbd232d4 Merge pull request #1334 from ofgeek/patch-2
Completely update the zh_CN locale.
2013-08-15 08:33:38 -07:00
Robin Ward
9740d70c67 Merge pull request #1335 from meglio/links
Fix site settings link in Twitter config warning
2013-08-15 08:32:19 -07:00
Neil Lalonde
293361dcd3 Screened URLs list in admin 2013-08-15 10:52:26 -04:00
Anton Andriyevskyy
f74587bb84 Fix site settings link in Twitter config warning 2013-08-15 11:51:18 +03:00
ofGEEK
a6085125c5 Totally update zh_CN locale.
投诉 → 报告
登陆 → 登录
2013-08-15 11:53:00 +08:00
ofGEEK
fe85e9f739 Update client.zh_CN.yml 2013-08-15 11:42:20 +08:00
ofGEEK
22d26b471b Keep up with the en locale. 2013-08-15 11:38:54 +08:00
Sam
c2653b2915 Merge pull request #1309 from stephankaag/sidetiq
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
Neil Lalonde
9170166e93 Finish renaming blocked emails to screen emails 2013-08-14 16:45:30 -04:00
Neil Lalonde
86647f0a54 Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail. 2013-08-14 16:08:23 -04:00
Stephan Kaag
a6b4b5dbf2 Replace Clockwork with Sidetiq 2013-08-14 21:39:40 +02:00
Neil Lalonde
bc0d4f1bfc Add a confirm modal to Delete All Posts button 2013-08-14 11:48:18 -04:00
Robin Ward
b71ffe9160 Merge pull request #1326 from sanderdatema/dutch_translation
Updated Dutch translation
2013-08-14 06:56:52 -07:00
Sander Datema
e0636fa914 Updated Dutch translation 2013-08-14 15:47:48 +02:00
Régis Hanol
3524b90d6a FIX: avatars in quotes/oneboxes
Avatars in quotes/oneboxes are still pointing to the old
`/users/:username/avatar(/:size)` route.
So, this adds back the old avatar route for the transition period.
2013-08-14 12:20:05 +02:00
Sam
019d52f4ac Merge pull request #1319 from adrianlang/patch-1
Fix typo in german translation
2013-08-14 01:11:10 -07:00
Adrian Lang
701090bf3e Fix typo in german translation 2013-08-13 21:36:57 +02:00
Robin Ward
9782d3777e Merge pull request #1314 from quickwango/patch-1
missing german translations
2013-08-13 07:39:33 -07:00
Phillip Schichtel
8a0e253b6f oops, that should not be there 2013-08-13 16:29:49 +02:00
Jeff Atwood
ce92d21d22 copyedit pass on admin descriptions 2013-08-13 02:00:01 -07:00
Jeff Atwood
6722a1fe22 some minor user deletion tweaks 2013-08-13 00:41:23 -07:00
Phillip Schichtel
18c304bda6 more translations 2013-08-12 21:32:04 +02:00
Phillip Schichtel
306a6eeb3c fixed indention 2013-08-12 21:23:35 +02:00
Neil Lalonde
b36c6d7b78 Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days. 2013-08-12 14:55:09 -04:00
Neil Lalonde
879652f055 Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits. 2013-08-12 11:12:20 -04:00
Anton Batenev
8e8167b41e Russian translation (actual version) 2013-08-12 09:58:45 +04:00
Phillip Schichtel
7029261318 added the missing de.user.change translation 2013-08-12 00:20:29 +02:00
charlieshum
199d6a3fcc Update client.zh_TW.yml
update the translation by comparing with client.en.yml
2013-08-10 19:43:47 +08:00
Neil Lalonde
bb492eb8bf Add filtering to staff logs page 2013-08-09 16:59:05 -04:00
Robin Ward
652169daf6 Include a list of more new topics in the digest emails at the bottom 2013-08-09 14:43:02 -04:00
Neil Lalonde
90a3bcf6ff Add filter by action to staff logs page 2013-08-09 10:06:59 -04:00
Neil Lalonde
ce05b43c1d Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful 2013-08-08 12:54:38 -04:00
Adrian Lang
b6a133c6b1 Fix various errors in german translation 2013-08-08 11:26:01 +02:00
Neil Lalonde
b097d780d0 Tweaks to staff action logs page 2013-08-07 18:29:13 -04:00
Neil Lalonde
b0848db6de Oops, forgot to use i18n in some places 2013-08-07 16:46:23 -04:00
Neil Lalonde
5c8c52482a Add a way to view staff action logs in admin 2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f Blocked Emails list in admin 2013-08-07 16:27:34 -04:00
Robin Ward
fe3a69c271 Private message emails now include the history 2013-08-07 13:03:45 -04:00
Michael Brown
08e41a707d Update documentation
* Change recommendation for install path to /var/www/discourse
* Fix instructions for redis-server installation
* Set yourself as system user during install
* Clarify some instructions
2013-08-07 00:06:40 -04:00
Robin Ward
1c3804934e Show the entire history of replies above a post when you expend "in reply to" 2013-08-06 17:43:10 -04:00
Anton Batenev
5f4bcfaafa Russian translation (actual version) 2013-08-05 10:17:18 +04:00
Sam
5f46dfedf1 Merge pull request #1320 from ZogStriP/local-avatars
Local avatars
2013-08-14 00:36:42 -07:00
Régis Hanol
71c33086b4 updated NGINX sample configuration 2013-08-13 22:09:44 +02:00
Régis Hanol
e397c14702 updated locales 2013-08-13 22:09:36 +02:00
Régis Hanol
92b0cfe3d3 cleaned up non-used code 2013-08-13 22:09:10 +02:00
Régis Hanol
c867b67a0b custom avatar support 2013-08-13 22:08:29 +02:00
Régis Hanol
e5e3164ea1 added the "allow uploaded avatars" site setting 2013-08-13 22:06:22 +02:00
Sam
10b02b1288 Create profile db generator for use when benchmarking a local install http://meta.discourse.org/t/benchmarking-discourse-locally/9070 2013-08-05 07:22:13 +10:00
Jeff Atwood
fadb6afde8 missed an image upload extension removal 2013-08-04 01:20:52 -07:00
Jeff Atwood
2fe70819d5 don't show image extensions
BECAUSE SERIOUSLY IMAGES JESUS DUH
2013-08-04 01:19:15 -07:00
Jeff Atwood
c2acdaad9d add better copy for username changes 2013-08-04 01:11:35 -07:00
Neil Lalonde
98b58150bb Dashboard calculations are done with an async job now 2013-08-02 18:32:33 -04:00
Jeff Atwood
f996a8757a add "post last edited at" to edit tooltip 2013-08-02 13:15:50 -07:00
Robin Ward
d5dd70c503 Merge pull request #1287 from charlieshum/master
Update client.zh_TW.yml
2013-08-02 13:14:34 -07:00
Neil Lalonde
9db0ac16a9 Add site setting delete_removed_posts_after to configure after how many hour posts that were deleted by their authors will be deleted 2013-08-02 13:35:52 -04:00
charlieshum
7b4a236c3f Update client.zh_TW.yml 2013-08-02 19:41:33 +08:00
Sam
d25dfb85ce Merge pull request #1280 from kubabrecka/cs_update50
cs translation update
2013-08-01 18:13:32 -07:00
Sam
857e2e6a19 correct scope, it should user:email to get read access to email 2013-08-02 10:03:29 +10:00
Sam
2162e3bbb5 we need email scope (also as I edit files I like to keep quoting consistent) 2013-08-02 09:59:25 +10:00
Régis Hanol
faeb4a9ebd enhance upload selector
- Change the icon on the button to a file when attachments are enabled
- Display the list of allowed extensions in the upload selector
- FIX : regexps for validating uploads weren't escaping the dots
2013-08-02 01:30:18 +02:00
Jeff Atwood
c063580275 slightly shorter copy for first post JIT education 2013-08-01 15:58:46 -07:00
Jeff Atwood
0f067a2ad3 we need that <hr> in notification emails, I think 2013-08-01 15:15:32 -07:00
Régis Hanol
1e2f151860 warns sysadmin to rebake all the posts
when changing the hostname
2013-08-01 22:24:55 +02:00
Kuba Brecka
74979b17d4 cs translation update 2013-08-01 18:27:15 +02:00
Robin Ward
4a0ea7f776 Upgrade jQuery to 2.0.3 2013-08-01 11:58:22 -04:00
Sam
160107a712 working plugin interface for custom openid auth, custom css and custom js 2013-08-01 16:02:43 +10:00
Jeff Atwood
0480c55d9f minor activation copy improvement 2013-07-31 11:44:42 -07:00
Robin Ward
491c93c3d1 Merge branch 'makeheadspace-fix_spelling_on_settings'
Conflicts:
	config/locales/server.en.yml
2013-07-31 10:24:37 -04:00
Robin Ward
6f81b9b9af Merge branch 'fix_spelling_on_settings' of git://github.com/makeheadspace/discourse into makeheadspace-fix_spelling_on_settings 2013-07-31 10:23:04 -04:00
Uģis Ozols
0fc5d53e5a Remove redundant 'are'. 2013-07-31 13:05:14 +03:00
Jeff Atwood
4e59f2d122 update copy for self-deleted posts
still needs variable replacement for the 24 hours part
2013-07-30 13:16:13 -07:00
Zee Spencer
1caa301712 Fix spelling of noscript in the settings page. 2013-07-30 10:22:31 -04:00
Neil Lalonde
4fd5087f91 Add button to delete a spammer in the flag modal
Add SiteSettings: delete_user_max_age, delete_all_posts_max. Add delete spammer button to admin flags UI
Moderators can delete users too
2013-07-29 15:29:44 -04:00
Neil Lalonde
5f3e9131ed Deleting a user from admin user page has the option to also block signups from the same email address 2013-07-29 15:29:43 -04:00
Neil Lalonde
5f8a130277 Add BlockedEmail, to block signups based on email. Track stats of how many times each email address is blocked, and last time it was blocked. Move email validation out of User model and into EmailValidator. Signup form remembers which email addresses have failed and shows validation error on email field. 2013-07-29 15:29:43 -04:00
Sam
77494e201a Merge pull request #1258 from elo7/pt_BR
Added pt_BR user.change key value
2013-07-28 22:18:37 -07:00
Sam
aa6c92922d SECURITY: correct our CSRF implementation to be much more aggressive 2013-07-29 15:13:13 +10:00
Daniel Cukier
c73f22b515 added pt_BR key 2013-07-26 11:17:20 -03:00
Anton Batenev
ce8d69ccf1 Russian translation (actual version) 2013-07-26 14:35:59 +04:00
Robin Ward
e94cab090a Merge pull request #1251 from johand/updating_es_locale
updating the spanish translation in client.es.yml
2013-07-25 13:05:08 -07:00
Robin Ward
0317cf9608 Show topics as a list of topics on the User Stream. 2013-07-25 15:56:20 -04:00
Johan
cca9473c55 updating the spanish translation in client.es.yml 2013-07-24 04:43:53 -04:30
Sam
366cb13140 restyle all user notification emails to use a custom html template 2013-07-24 17:24:55 +10:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Sam
7c5e15966f Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments
uploads selector texts is now different when attachments are enabled
2013-07-23 00:44:17 -07:00
Sam
9ac6c6e2e9 Merge pull request #1233 from sir-pinecone/improve-group-deletion
Add confirmation modal to admin group deletion
2013-07-23 00:43:06 -07:00
Doug Alcorn
35a2bb7919 Parameterize the PBKDF2 algorithm in application config
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
2013-07-22 21:36:01 -04:00
Régis Hanol
6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Robin Ward
43ceacabab Link to edit "About Me" links directly to the field. 2013-07-22 16:53:21 -04:00
Neil Lalonde
b0ca3a34ca Neil have fixed his grammar 2013-07-22 15:45:46 -04:00
Robin Ward
3e7b418ea8 First Try: Include Post History (context) in Notification Emails 2013-07-22 15:06:37 -04:00
Robin Ward
ed745c3fdd Merge pull request #1222 from ZogStriP/fix-s3-related-issues
Fix s3 related issues
2013-07-22 07:30:41 -07:00
Robin Ward
c879c58481 Merge pull request #1227 from abbat/master
Russian translation (actual version)
2013-07-22 07:23:18 -07:00
Robin Ward
8b181e0803 Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting
add newuser-max-attachments setting
2013-07-22 07:22:23 -07:00
Sam
1f3c5cb656 allow end user to recover a post they delete
automatically delete stubs after 1 day
2013-07-22 17:48:47 +10:00
Michael Campagnaro
9616767bff Add confirmation modal to admin group deletion 2013-07-22 02:48:23 -04:00
Sam
9e4b0df7ff 69 specs fail in rails 4 now ...not too bad 2013-07-22 15:07:20 +10:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Anton Batenev
ad31eefb27 Russian translation (actual version) 2013-07-22 01:49:46 +04:00
Michael Brown
ddabc476bf Awesome documentation updates 2013-07-21 03:43:54 -04:00
Régis Hanol
613e31d3ef added a warning regarding the case of the s3_upload_bucket setting
until we get proper setting validation.
2013-07-20 11:54:21 +02:00
Sam
58eec31351 sample ubuntu upstart config file 2013-07-19 15:23:55 +10:00
Prem Prakash
713735f4c8 updating pt_BR translations 2013-07-18 00:09:54 -03:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
Robin Ward
e2ff064aa3 Merge pull request #1198 from prem-prakash/master
Adding Portuguese Brazilian translations
2013-07-17 06:59:31 -07:00
Robin Ward
6839869170 Merge pull request #1211 from zsj950618/master
Add some  translation of Simplified Chinese
2013-07-17 06:53:07 -07:00
Robin Ward
75e636f5a5 FIX: Invalid YAML 2013-07-17 09:51:03 -04:00
Junki Cho
b4cae0f5d3 Korean language pack 2013-07-17 09:36:50 -04:00
Sam
c2be81a76e Merge pull request #1199 from ZogStriP/uploads
adds the `max_attachment_size_kb` setting
2013-07-16 23:03:42 -07:00
Sam
2573935155 improve security UI 2013-07-17 15:10:49 +10:00
Sam
625204c8bd work in progress category UI
refactor hack from earlier
2013-07-17 14:54:21 +10:00
SJ Zhu
0956c60c99 add some missing Simplified Chinese translation 2013-07-17 09:47:07 +08:00
Régis Hanol
46ff98f2d3 fix composer toolbar upload title 2013-07-17 01:21:27 +02:00
Robin Ward
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04:00
Robin Ward
86d0255d5a Merge pull request #1197 from kubabrecka/cs_update49
cs translation update
2013-07-16 07:33:33 -07:00
Sam
06bd9e3234 allow login required screen to be customized 2013-07-16 20:49:04 +10:00
Sam
ff7d9cac38 fix non localized said: in quotes 2013-07-16 17:22:54 +10:00
Jeff Atwood
957d7a31dd clarify queue_jobs is developer only 2013-07-15 23:12:27 -07:00
Sam
ecf17cfebb work in progress, add fidelity to category group permissions (full, create posts, readonly) 2013-07-16 15:46:11 +10:00
Régis Hanol
5ce05ff5cb adds the max_attachment_size_kb setting
so that we can specify a different max upload size for attachments and images.
2013-07-16 02:01:36 +02:00
premprakash
8c5e0e7550 Adding Portuguese-Brazil language 2013-07-15 14:45:16 -03:00
Kuba Brecka
e2a2bddd60 cs translation update 2013-07-15 16:40:39 +02:00
Robin Ward
ed60f24502 Merge pull request #1194 from ZogStriP/uploads
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
Robin Ward
2bba939d9f Merge pull request #1196 from abbat/master
Russian translation (actual version)
2013-07-15 07:04:27 -07:00
Anton Batenev
fb00418f7a Russian translation (actual version) 2013-07-15 15:45:51 +04:00
Sam
25bcd6007c Update client.nb_NO.yml
broken yaml
2013-07-15 21:26:28 +10:00
Sam
bf06be3260 Merge pull request #1189 from erlend-sh/patch-4
Update client.nb_NO.yml
2013-07-15 03:14:22 -07:00
Sam
16976a2092 Merge pull request #1192 from cfstras/locale
Locales: updated German locale, mainly the admin section
2013-07-15 03:08:33 -07:00
Sam
86e5c9afc2 Merge pull request #1193 from jbruni/master
Tiny typo fix (comment at nginx.sample.conf)
2013-07-15 00:58:09 -07:00
Jeff Atwood
906d1bc7c8 improve copy on daily action limit 2013-07-14 23:11:10 -07:00
Jeff Atwood
f46b619547 simplify copy around merge and split 2013-07-14 22:24:59 -07:00
Régis Hanol
36e6345eee change the icon in the composer toolbar with a more generic upload icon
also changed all references to "images uploads" to a "uploads"
2013-07-14 23:44:50 +02:00
Claus Strasburger
f92075f360 Locale german: got another one 2013-07-14 20:37:40 +02:00
Claus Strasburger
1d4abbe1fd Locales: updated German locale, admin content like the admin section and flagging 2013-07-14 20:11:07 +02:00
Erlend Sogge Heggen
542408550c v1 Complete translation for client.nb_NO.yml
All strings now have a first-take translation. Might have missed some due to the inconsistent use of double quotes, single quotes and no quotes (we're still good!).

I'm not entirely sure what happens when I apply edits to a still pending-for-pull patch; sorry if I goofed.
2013-07-14 14:16:17 +02:00
Régis Hanol
3397c2235f display the size of the attachment in the preview
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
J Bruni
a42ed5d831 Fixed typo at nginx.sample.conf 2013-07-14 01:06:59 -03:00
Erlend Sogge Heggen
ac9cfe32f9 Update client.nb_NO.yml
Moar translations. Also jumped back and fixed what I could find of the ones with missing double quotes.
2013-07-13 20:47:11 +02:00
Robin Ward
6ca5df0a09 Can recover deleted topics. Deleted topics show the first post as deleted in the UI. 2013-07-12 12:09:17 -04:00
Sam
f05bc44fbe Merge pull request #1182 from sanderdatema/dutch_translation
Dutch translation updated
2013-07-11 19:59:08 -07:00
Sam
00c6bffc61 Merge pull request #1183 from erlend-sh/patch-3
Update client.nb_NO.yml
2013-07-11 19:58:29 -07:00
Robin Ward
19c169540c Staff can enter and view deleted topics 2013-07-11 16:39:35 -04:00
Erlend Sogge Heggen
1976c622dc Update client.nb_NO.yml 2013-07-11 16:54:51 +02:00
Sander Datema
d4bc6f977b Dutch translation updated 2013-07-11 16:54:46 +02:00
Robin Ward
7fd8bb75d9 Merge pull request #1177 from ZogStriP/attachments
Attachments
2013-07-11 06:49:20 -07:00
Roy Guo
994f3d4ad5 Update client.zh_CN.yml
banned: "禁止参与讨论" # can't create or reply topics
blocked: "禁止登陆"   # can't login
2013-07-11 11:47:17 +08:00
Régis Hanol
6beb12e778 update nginx.sample.conf to take attachmetns into account 2013-07-10 22:59:54 +02:00
Robin Ward
8ffe9e28d6 Shows who deleted a post 2013-07-10 16:22:49 -04:00
Neil Lalonde
0e3e5bf533 Add relative_date_duration site setting 2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb Merge pull request #1157 from abbat/email-custom-headers
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
Robin Ward
68c86931e4 Merge pull request #1169 from phanimahesh/patch-1
Prevent errors in case #{rails_root}/tmp does not exist
2013-07-10 07:11:59 -07:00
Robin Ward
4eb5f99103 Merge pull request #1173 from nterray/translate_reply_subject
French translation of user_replied/posted subject
2013-07-10 07:11:16 -07:00
Sam
7ccfc40389 TODO comment 2013-07-10 16:35:18 +10:00
Sam
8367326e76 glyphs on the user stream, rename responses to replies 2013-07-10 16:35:06 +10:00
Nicolas Terray
19c5894874 French translation of user_replied/posted subject
This is a follow-up of the commit 013ad0fdd
2013-07-10 00:30:53 +02:00
Neil Lalonde
4c0fe3bc12 Add a BIG WARNING to queue_jobs site setting 2013-07-09 15:34:51 -04:00
Neil Lalonde
3c38062802 Check for updates: edge cases when the message on the dashboard doesn't make sense. 2013-07-09 14:01:08 -04:00
J Phani Mahesh
b1fcd523c6 Use FuleUtils.mkdir_p for cleaner code 2013-07-09 22:26:27 +05:30
Anton Batenev
ed1fb847ed Russian translation (actual version) 2013-07-09 18:26:59 +04:00
Robin Ward
5cda0e556c Merge pull request #1111 from jamesaanderson/flash-video-onebox
Add flash video onebox support
2013-07-09 06:55:56 -07:00
J Phani Mahesh
4fe6bee83c Prevent errors in case #{rails_root}/tmp does not exist
Dir.mkdir is not recursive. i.e - It doesn't do the equivalent of `mkdir -p` but just plain `mkdir`.
And that is a problem if #{rails_root}/tmp is missing. More here.
http://meta.discourse.org/t/keep-getting-the-same-error-every-start/8214
2013-07-09 17:46:54 +05:30
Jeff Atwood
2c314e275e improve new category copy a bit 2013-07-09 00:49:38 -07:00
Jeff Atwood
853fcb9b88 improve best of copy slightly 2013-07-08 23:39:22 -07:00
Sam
21bfb64a28 added EMBED_CLOCKWORK so users can embed clockwork scheduling inside another process 2013-07-09 11:01:51 +10:00
Neil Lalonde
ad096ac2b7 More nav links on admin users list page 2013-07-08 12:44:14 -04:00
Neil Lalonde
9b0f63627b Add blocked users count to dashboard 2013-07-08 12:44:13 -04:00
Robin Ward
013ad0fdda Added In-Reply-To and References email headers. Additionally removed username from
email replies and new posts to keep the subjects collapsable.
2013-07-08 11:48:40 -04:00
James A. Anderson & Jalil Mohammed
d51a3cf50f Add flash video onebox as disabled setting by default 2013-07-08 06:37:44 -07:00
Jeff Atwood
4ddd50fe17 add "new" to PM title there for clarity 2013-07-08 00:01:24 -07:00
Jeff Atwood
7bf798891b better new user block PM copy 2013-07-07 23:58:07 -07:00
Sam
f42fc3be37 Merge pull request #1150 from mcwumbly/topic-likes
little tweaks to like counts in topic list view
2013-07-07 23:39:38 -07:00
Sam
3dbb4ff9bc Reorder filters on user page and name them better (All, Topics, Posts, Responses) 2013-07-08 12:12:06 +10:00
Sam
5086f48784 reloading classes is just trouble in test, lets not do that so spork is squeaky clean and happy. 2013-07-08 12:10:47 +10:00
Sam
d79aa917f1 add option suppress_reply_directly_above to stop suppressing the reply directly above
added a bunch of debugging information to help diagnose weird positioning issues
2013-07-08 11:13:45 +10:00
Sam
c6c8246399 added sample unicorn config
added utility to measure real memory usage
don't require thin by default
2013-07-07 14:31:07 +10:00
Anton Batenev
4e04c4dddd Add custom headers for email messages
See http://meta.discourse.org/t/custom-headers-in-emails-site-settings/7480
2013-07-07 04:37:44 +04:00
Robin Ward
337f393af5 Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting
removed auto_link_images_wider_than setting
2013-07-06 17:12:11 -07:00
Robin Ward
63f4519268 Merge pull request #1152 from abbat/patch-1
Fix Cyrillic transliteration map
2013-07-06 17:10:09 -07:00
Régis Hanol
45c227c81c fix column name in admin email logs 2013-07-06 22:29:16 +02:00
Régis Hanol
6251935b1e removed auto_link_images_wider_than setting 2013-07-06 22:19:16 +02:00
Anton Batenev
9999561b86 Fix Cyrillic transliteration map
Fix Cyrillic transliteration map for letters which hasn't ASCII equivalent
2013-07-06 18:38:01 +04:00
David McClure
a3eb175683 - like counts use number formatting (so 1100 is 1.1K like other counts)
- made 'likes' column wide enough to hold 3 digit and > 999 likes
2013-07-06 00:07:10 -07:00
Neil Lalonde
25d2cbc33f Merge branch 'master' of github.com:discourse/discourse 2013-07-05 16:52:27 -04:00
Neil Lalonde
1c0e0da683 Add rss feed for latest and hot 2013-07-05 16:49:06 -04:00
Robin Ward
6cd6484b5e New mode for Wordpress: Filter ONLY posts liked by moderators 2013-07-05 16:07:24 -04:00
Robin Ward
7335f5fb7f Merge pull request #1145 from abbat/yandex-workaround
Workaround solution to help Yandex crawler index discourse.
2013-07-05 10:04:40 -07:00
Neil Lalonde
84ce04dfa5 Use POST for send_activation_email action 2013-07-05 12:26:46 -04:00
Neil Lalonde
a0f07f8914 Show the error message when send activation email fails from admin 2013-07-05 11:50:43 -04:00
Neil Lalonde
ceee8ed63b Put back mailcatcher config in development.rb 2013-07-05 11:32:54 -04:00
Anton Batenev
694a6f4970 Fix recommendations from #1145 2013-07-05 15:59:39 +04:00
Régis Hanol
7c82d6d4d0 FIX: new users are allowed to upload images to your servers 2013-07-05 00:44:18 +02:00
Régis Hanol
c42cb6ef48 add a comment in database.yml template files indicating that Sidekiq must be restarted after changes 2013-07-04 23:31:36 +02:00