Commit Graph

1063 Commits

Author SHA1 Message Date
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
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
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
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 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 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
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
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
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 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
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 1c0e0da683 Add rss feed for latest and hot 2013-07-05 16:49:06 -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 a0f07f8914 Show the error message when send activation email fails from admin 2013-07-05 11:50:43 -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
Anton Batenev af36d32f7f Workaround solution to help Yandex crawler index discource.
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
2013-07-04 22:08:23 +04:00
Robin Ward ea11286ab6 Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels
Feature: Admin can modify user trust levels
2013-07-04 06:57:59 -07:00
Sam b83e3a3ffd Merge pull request #1137 from kubabrecka/cs_update47
cs translation update
2013-07-03 23:29:05 -07:00
Sam 33a49607d6 Merge pull request #1138 from kubabrecka/en_yml_action_type_fix
remove localization duplicate - seems like a typo
2013-07-03 23:15:26 -07:00
Anton Batenev 89dcded3a7 i18n transliteration map from Russian Cyrillic to ASCII
i18n transliteration map from Russian Cyrillic to ASCII
(ISO-9:1995 / GOST 7.79-2000, table B) for pretty URLs (slug)
2013-07-04 01:17:01 +04:00
Kuba Brecka f7e2b3be7f remove localization duplicate - seems like a typo 2013-07-03 21:27:46 +02:00
Kuba Brecka e58f9ef843 cs translation update 2013-07-03 21:22:41 +02:00
Robin Ward f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions
Conflicts:
	app/models/site_setting.rb
2013-07-03 11:18:42 -04:00
Robin Ward c12e87650d Merge pull request #1130 from adrianlang/patch-1
Fix German translation of user_automatically blocked template
2013-07-03 08:06:15 -07:00
ThomasHarper 7ef5f0ac9b Update server.fr.yml 2013-07-03 14:47:38 +02:00
ThomasHarper 4f10ea9880 Update server.fr.yml
Added few POPS3 translations and few things
2013-07-03 14:22:31 +02:00
ThomasHarper 67502d0c8e Update server.fr.yml
added cas_domainname
2013-07-03 14:07:26 +02:00
ThomasHarper 64a00e284e Update client.fr.yml
Missing capital on homepage
2013-07-03 11:43:52 +02:00
Navin 3da37506da Back end - temporary boosting of trust levels 2013-07-03 10:30:40 +02:00
Adrian Lang 5ea2bce646 Fix German translation of user_automatically blocked template
Right now this bug prevents blocking with German locale.
2013-07-03 09:38:21 +02:00
Robin Ward 22e6b3f466 FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message. 2013-07-02 15:47:15 -04:00
Neil Lalonde 075ed1ab53 Refactor user blocking code; hide the Block button in admin 2013-07-02 14:42:53 -04:00
merugear f47effa154 Changed grammar on powered_by_html 2013-07-02 12:11:28 +02:00
Jeff Atwood 8057851cf5 "there are no more" is sufficient, drop "to read" 2013-07-01 23:29:49 -07:00
Anton Batenev 5281ba5af3 Russian translation (actual version) 2013-07-01 11:14:19 +04:00
Régis Hanol 6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Neil Lalonde c1a39b5a30 Show date with year in message to banned users who try to log in 2013-06-30 12:49:34 -04:00
Neil Lalonde dca216ed54 Be a bit more clear in the forgot password message 2013-06-28 18:14:16 -04:00
Neil Lalonde 2d6118297d Changes to tiny date format to remove mon and show short format dates instead 2013-06-28 13:10:04 -04:00
Neil Lalonde 3c9cdead49 Update title on bookmark button of the last post you read 2013-06-28 13:10:04 -04:00
ThomasHarper 0382ec319e Update client.fr.yml 2013-06-28 16:38:10 +02:00
Robin Ward 4711c75e53 Merge pull request #1103 from royguo/patch-1
Update server.zh_CN.yml
2013-06-28 07:21:50 -07:00
Robin Ward 251d169c0d Merge pull request #1104 from ThomasHarper/patch-5
Update client.fr.yml
2013-06-28 07:21:10 -07:00
ThomasHarper 71464c0c31 Update client.fr.yml
dynamic_favion added
2013-06-28 16:04:20 +02:00
ThomasHarper 80e886bfde Update client.fr.yml
Adding few translations again
2013-06-28 15:58:19 +02:00
ThomasHarper a94947f5b0 Update client.fr.yml
Adding missing fr translation
2013-06-28 15:25:05 +02:00
Roy Guo 4034cde6aa Update server.zh_CN.yml
num_clicks : "点击数"
2013-06-28 09:54:37 +08:00
Jeff Atwood 40c9014634 make flag reply reply-ier 2013-06-27 16:01:48 -07:00
Neil Lalonde 5d6ad8f39c Show a useful message when a banned user tries to log in 2013-06-27 15:14:42 -04:00
Robin Ward bf96c8ad01 Support for Custom FAQ content 2013-06-27 12:50:24 -04:00
Robin Ward d13166fa17 Merge pull request #1095 from Mikulas/typo-translation-czech
Minor typo fix in czech translation
2013-06-27 07:08:57 -07:00
Sam 9fd00cac65 work in progress, add custom faq link, ember router needs to know about this or the redirect trick will not work 2013-06-27 17:15:59 +10:00
Jeff Atwood 5d1f5505af "private topics" doesn't need to say "count" 2013-06-26 21:26:51 -07:00
Régis Hanol 72745d257d provide a way to give a default filename to pasted images in the lightbox overlay 2013-06-26 21:54:08 +02:00
Mikulas 6819cd2886 minor typo fix in czech translation
grammar source: http://www.proofreading.cz/\?p\=377
2013-06-26 20:10:50 +02:00
Robin Ward 89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Neil Lalonde 196a8f4ba5 Add dashboard warnings for system_username and notification_email site settings 2013-06-26 10:57:04 -04:00
Jeff Atwood e4f1255cde copy improvement on account approval 2013-06-26 01:17:27 -07:00
Jeff Atwood 1ec411c811 we're so excited, and we just can't hide it
we're about to lose control and we think we like it
2013-06-25 23:57:28 -07:00
Neil Lalonde b2d300fe0b Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer. 2013-06-25 18:39:20 -04:00
Neil Lalonde a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Jeff Atwood 87db582297 minor copyedit on "20 to go.." 2013-06-25 10:36:46 -07:00
Jeff Atwood a9f4fa4927 copyedits on reply via email 2013-06-25 10:07:27 -07:00
Robin Ward 3067c2ed3b Private messages have instructions for reply by email. We also strip X-Discourse headers
before sending the message as they are no longer needed.
2013-06-25 11:35:26 -04:00
Robin Ward 3fc69337d3 Enable reply by email for all users, display a message in the footer indicating so. 2013-06-25 11:27:17 -04:00
Neil Lalonde c79ab3fc2e Change modal that asks which topic you want to reply in; upgrade bootbox.js 2013-06-24 15:01:07 -04:00
ThomasHarper 7e9d942060 Update server.fr.yml
Adding quotes and few things missing
2013-06-24 15:41:24 +02:00
Robin Ward bad7707cf3 Merge pull request #1082 from ThomasHarper/patch-2
Update client.fr.yml
2013-06-24 06:28:51 -07:00
Robin Ward 4b638a0fea Merge pull request #1083 from ThomasHarper/patch-3
Update client.fr.yml
2013-06-24 06:27:59 -07:00
Anton Batenev fe51fd87cc Russian translation (actual version) 2013-06-24 15:55:44 +04:00
ThomasHarper b8960f26c9 Update client.fr.yml
Dates were missing and few stuff on back end
2013-06-24 12:43:02 +03:00
ThomasHarper fadab25609 Update client.fr.yml
Missing quote
2013-06-24 12:01:42 +03:00
Erlend Sogge Heggen 6db64124fd Updated NO translation - Some questions in dscr.
Did X more lines.

I'm afraid to change stuff that's not in quotes, so I'm unsure whether or not I should be changing line like these:

      browse_all_categories: Browse all categories

      view_latest_topics: view latest topics
      suggest_create_topic: Why not create a topic?
      jump_reply_up: jump to earlier reply
      jump_reply_down: jump to later reply

or these:

      progress:
        title: topic progress
        jump_top: jump to first post
        jump_bottom: jump to last post
        total: total posts
        current: current post
2013-06-21 21:37:35 +03:00
Robin Ward 601c35fc58 Merge pull request #1067 from adkron/feature/supress_to_suppress
Correct spelling of suppress
2013-06-21 07:08:12 -07:00
Jeff Atwood a9c251e71a restructure /admin/flags rows a bit 2013-06-21 00:29:54 -07:00
Amos L King 777e8c2012 Correct spelling of suppress
supress => suppress

Amos King @adkron <amos.l.king@gmail.com>
2013-06-20 23:44:27 -05:00
Jeff Atwood 3775a9c11d shorter copy to fit on /admin better 2013-06-20 11:51:24 -07:00
Robin Ward 2e7c5a674c Merge pull request #1049 from ZogStriP/admin-alerts
Admin alerts
2013-06-20 07:51:40 -07:00
Sam 14db3869ba Merge pull request #1050 from abbat/master
Russian translation (actual version)
2013-06-20 01:17:53 -07:00
Sam 08df4c41cc Merge branch 'master' of github.com:discourse/discourse 2013-06-20 17:42:29 +10:00
Sam 4a8a663a67 flagging workflow changes per http://meta.discourse.org/t/we-need-an-archive-flag-notification-button/7450 2013-06-20 17:42:15 +10:00
Anton Batenev f1a1b8ca11 Russian translation (actual version) 2013-06-20 03:44:07 +04:00
Jeff Atwood f1fd29003d switch medium time format to "mins" vs "minutes" 2013-06-19 16:09:57 -07:00
Régis Hanol 8a26b86739 added image magick alert 2013-06-19 22:36:56 +02:00
Régis Hanol 9036738ba2 added s3 file uploads alert 2013-06-19 22:11:11 +02:00
Robin Ward 5ef6714d48 New site setting: `minimum_topics_similar`, allows you to specify a minimum amount
of topics that need to be in the database before it will suggest similar topics as
a user creates a post.
2013-06-19 13:14:24 -04:00
Neil Lalonde c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Jeff Atwood 34daa34bc1 Merge pull request #1042 from Supermathie/sysadmin-docs
Sysadmin docs
2013-06-18 00:49:12 -07:00
Sam 2eb1cc220c posts should be post 2013-06-18 11:24:36 +10:00
Sam 7abb20928b Merge pull request #1033 from chrishunt/move-dynamic-favicon-to-user
Move 'dynamic favicon' setting to User preference
2013-06-17 17:31:02 -07:00
Robin Ward 8acdc18bc8 First stab at polling support for POP3S / reply by email 2013-06-17 16:49:02 -04:00
Sam a15ab2a0a6 flag type summary 2013-06-17 17:15:56 +10:00
Sam 8c7519df86 missing pluralization 2013-06-17 15:37:46 +10:00
Sam dd5cd1df4f Merge pull request #1037 from ZogStriP/imagineering
Imagineering
2013-06-16 22:01:10 -07:00
Sam 0052e78bfe render error when people attempt to save an invalid group name
hide controls when we showing an automatic group
2013-06-17 13:43:06 +10:00
Sam b97d186cb5 automatic groups should not allow you to muck with the listed users in the group 2013-06-17 12:54:25 +10:00
Régis Hanol d4c3fe4e6a added `create_thumbnails?` site setting
defaults to `false`
2013-06-17 02:49:34 +02:00
Robin Ward 5703e3923c FIX: Wrong key for translation file. 2013-06-16 16:08:36 -04:00
Robin Ward 08b64faa7f Merge pull request #1031 from kubabrecka/cs_update46
cs translation update
2013-06-16 12:46:20 -07:00
Robin Ward ee9af728e3 Merge pull request #1035 from erlend-sh/master
WIP: Added Norwegian Bokmål translation, 50%
2013-06-16 12:45:42 -07:00
Erlend Sogge Heggen 286e6f49bf Update client.nb_NO.yml
down to line 509. Gotta read up on /js_local_helper_spec.rb before continuing.
2013-06-16 18:42:08 +03:00
Chris Hunt 09d3800701 Move 'dynamic favicon' from Server to User pref 2013-06-14 23:58:24 -07:00
Michael Brown a908f00771 Documentation update: work in progress 2013-06-15 01:25:41 -04:00
Kuba Brecka c002acc387 cs translation update 2013-06-14 21:21:33 +02:00
Neil Lalonde f198c814a8 Add explanations for deactivate user and block user buttons in admin 2013-06-14 11:34:03 -04:00
Robin Ward e29f4a3496 Work in Progress: Reply By Email:
- Add support classes and settings to enable reply by email
- Split out Email builder to be more OO, add many specs
2013-06-13 12:39:56 -04:00
Jeff Atwood e338e97fa3 remove line from JIT new user topic/reply help 2013-06-13 09:37:16 -07:00
Robin Ward 66f5a3f6f6 FIX: Emoji sizes in emails should be done by the EmailStyler 2013-06-13 12:15:05 -04:00
Sam f7de9f17d5 refactor validators
add a new setting for min pm body length
use that setting for flags
scale entropy check down for pms
2013-06-13 18:18:43 +10:00
Sam e6e81efe85 correct information leak in page not found 2013-06-13 10:27:17 +10:00
Anton Batenev f6060d5ff6 Russian translation (draft) 2013-06-12 06:58:16 +04:00
Sam eb91a0c9df Merge pull request #1012 from ZogStriP/extract-imgur-support-to-a-gem
Extract imgur support to a gem
2013-06-11 16:59:53 -07:00
Jeff Atwood acb2126220 Omit Needless Words 2013-06-11 14:31:04 -07:00
Jeff Atwood 85fcfe5ede copyedits on digest email titles 2013-06-11 14:29:21 -07:00
Jeff Atwood e78c04b88b extra space in email was causing sub-list :( 2013-06-11 13:52:54 -07:00
Régis Hanol 8a2d635e62 removed imgur support 2013-06-11 21:51:41 +02:00
Neil Lalonde 811a0df68b Make s3 region site setting a drop down 2013-06-11 14:24:04 -04:00
Robin Ward 8b4e3402c2 Small improvements to digest emails and preview mechanism. 2013-06-11 12:27:11 -04:00
Robin Ward daeaf090c8 Merge pull request #1008 from Naiqus/patch-5
Update server.zh_CN.yml
2013-06-11 08:59:18 -07:00
Robin Ward 59ede7c51f Merge pull request #1007 from Naiqus/patch-4
Update client.zh_CN.yml
2013-06-11 08:58:59 -07:00
Sam c2cfbce9ce automatically updating times for posts on topic
moved moment.js into localization file (we need to localize it)
added helpers for date formatting use, moment().shortDate() moment().longDate() moment().shortDateNoYear()
2013-06-11 17:25:50 +10:00
Naiqus 34eb36c88e Update server.zh_CN.yml 2013-06-11 02:18:12 +03:00
Naiqus 46b6a0a533 Update client.zh_CN.yml 2013-06-11 02:17:04 +03:00
Neil Lalonde 9b1d0baf45 Send a message to moderators when a newuser_spam_host_threshold is exceeded. Send it no more than once per day per user. 2013-06-10 13:17:32 -04:00
Robin Ward 7907f5066e Merge pull request #999 from netzpirat/update-german-translations
Update German translations
2013-06-10 07:00:55 -07:00
Naiqus 82168d2067 A few zh_CN translation updates for version 0.9.2.5
It is valid now.
2013-06-10 16:37:13 +03:00
Michael Kessler 561418304d Update German client-side translations. 2013-06-10 10:58:42 +02:00
Michael Kessler 080938660c Update German server-side translations. 2013-06-10 10:24:26 +02:00
Jeff Atwood 64fb6dbf79 add Mandrill note to email deliverability test 2013-06-10 00:14:47 -07:00
Jeff Atwood b4a4774165 extend consumer email warning to yahoo & outlook 2013-06-10 00:08:06 -07:00
Sam 2d14b54096 Merge pull request #988 from chrishunt/add-dynamic-favicon
Add 'dynamic favicon' setting
2013-06-09 16:13:54 -07:00
Sander Datema 27d0b120fd Updated Dutch translation 2013-06-08 18:12:20 +02:00
Chris Hunt af1c14939e Add 'dynamic favicon' setting 2013-06-07 17:15:49 -07:00
Robin Ward b2a6755a48 Merge pull request #984 from Supermathie/moreentropy
More entropy for foreign titles
2013-06-07 14:23:26 -07:00
Neil Lalonde 34e1f376f6 Add [PM] to subject of email notifications for private messages 2013-06-07 15:50:11 -04:00
Michael Brown f3fb10de03 settings: Update english description of entropy 2013-06-07 15:07:43 -04:00
Sam 5fa20ce357 more progress towards full migration to moment.js 2013-06-07 18:27:42 +10:00
Chris Hunt d50a598e62 Notify admin of successful user approval 2013-06-06 18:37:25 -07:00
Chris Hunt f6ce985121 Send activation email after user approved 2013-06-06 18:37:25 -07:00
Sam 1eed1e240b Merge pull request #977 from chrishunt/add-apple-touch-icon
Add 'apple touch icon url' site setting
2013-06-06 17:40:12 -07:00
Neil Lalonde 564d242832 Notify moderators when someone is automatically blocked because of spam flags 2013-06-06 18:49:19 -04:00
Chris Hunt 268a5debbf Add 'apple touch icon url' site setting 2013-06-06 14:43:05 -07:00
Juan de Dios Herrero 90c46ab62a Little review on client.es.yml and added a lot of translation that were missing and made the page looks ugly 2013-06-06 11:35:10 +02:00
Juan de Dios Herrero a2ee43b511 Finished server.es translation, ready for review (still a few sentences left because no good translation has been found) 2013-06-06 10:53:29 +02:00
Sam 2ca734c118 Merge pull request #964 from chrishunt/exclusive-club
Add 'invite only' site setting
2013-06-05 16:38:47 -07:00
Jeff Atwood 6f57564c54 add edit hint to "no topic definition" 2013-06-05 15:36:26 -07:00
Robin Ward 0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
Robin Ward a3d52a41c6 Merge pull request #962 from sanderdatema/dutch_translation
Updated Dutch translation
2013-06-05 11:58:46 -07:00
Chris Hunt 24da1ab07e Add 'invite only' site setting 2013-06-05 11:06:05 -07:00
Neil Lalonde f0d4a38433 Admin flags UI shows when it's loading and when there are no results 2013-06-05 10:24:50 -04:00
Sander Datema a9dcbe498d Updated Dutch translation 2013-06-05 14:24:32 +02:00
Sam 2509d0f4fa Merge pull request #959 from chrishunt/chrishunt/login-required-fixes
'login required' site setting improvements
2013-06-04 19:09:40 -07:00
Sam 93be638d93 message format is awesome, remove 0 unread and 0 new links. 2013-06-05 12:04:54 +10:00
Chris Hunt 3074300f76 Allow customization of 'login required' message 2013-06-04 18:53:36 -07:00
Sam 1dd59ca0a7 es translation is bust, rename for now 2013-06-05 10:25:32 +10:00
Sam 21b3359ea4 Merge pull request #957 from chrishunt/chrishunt/lock-down-the-base
Add 'login required' site setting
2013-06-04 17:22:08 -07:00
Juan de Dios Herrero fb4cb143e9 Started spanish translation 2013-06-05 09:46:00 +10:00
Sam 5f85aaee1d correct message bus regression
implement automatically updating dates in list
2013-06-05 09:32:44 +10:00
Chris Hunt 85ceb5efa7 Add 'login required' site setting 2013-06-04 16:10:10 -07:00
Jeff Atwood 93aa0a9f39 some copyedits on account blocking 2013-06-04 16:02:03 -07:00
Neil Lalonde 2465c9c724 Add min_private_message_title_length site setting so private messages can have short titles 2013-06-04 17:59:23 -04:00
Erlend Sogge Heggen 5879d3dffd Update client.nb_NO.yml
First post, Mute, Unmute, Last post, are they meant to be translated?

finished down to composer
2013-06-04 19:21:57 +03:00
Neil Lalonde 2259e97d42 Add a count of blocked users on the dashboard 2013-06-04 11:53:19 -04:00
Neil Lalonde e3861893a2 Remove talk of spam in the private messages when an account has been blocked and unblocked 2013-06-04 11:28:40 -04:00
Neil Lalonde c4904aacc0 Automatically flag someone as a spammer if their posts get at least X spam flags from N users while their trust level is 'new user'. Staff can clear and set this status from the user record in admin. 2013-06-03 16:37:40 -04:00
Erlend Sogge Heggen fbeff410f5 Update client.nb_NO.yml
Started work on "invited" translations.
2013-06-03 20:39:33 +03:00
Erlend Sogge Heggen 21e45d9fa1 Create client.nb_NO.yml
Norwegian translation first take.
2013-06-03 19:36:23 +02:00
Robin Ward 545dbfc07e New Feature: Staff can choose to "Take Action" when flagging to immediately reach hiding
thresholds.
2013-05-31 17:39:32 -04:00
Robin Ward f7c0fa0434 Merge pull request #932 from sanderdatema/dutch_translation
Updated Dutch translation
2013-05-31 08:30:13 -07:00
Sander Datema 00f16b15c5 Updated Dutch translation 2013-05-31 10:03:07 +02:00
Sam 41187a5de1 Merge pull request #931 from ZogStriP/more-file-upload-test-coverage
added more file uploads test for better coverage
2013-05-30 21:36:33 -07:00
Sam 9ecf61d77d Merge pull request #922 from ZogStriP/keep-french-l10n-up-to-date-2013-05-29
[ci-skip] keep French localization up to date
2013-05-30 21:35:19 -07:00
Régis Hanol 6cc0f8f2d4 added more file uploads test for better coverage 2013-05-31 03:13:37 +02:00
Michael Kessler 571e62a27a Keep German translations in sync. 2013-05-30 13:13:53 +02:00
Sam 8874c9ea75 Add message format support that can be used on complex localization strings
Add message about new and unread topics at the bottom of topics
move localization helper into lib
2013-05-30 16:49:57 +10:00
Sam 73834370a5 work in progress, live unread and new counts 2013-05-30 16:49:57 +10:00
Jeff Atwood 52eeecd460 add strong warnings on force_hostname and port 2013-05-29 16:27:46 -07:00
Régis Hanol 2daf3ba8ca keep French localization up to date
🇫🇷
2013-05-30 00:18:29 +02:00
Neil Lalonde 6abd9ddd2d Add warning on admin dashboard if production env is configured to send email through gmail 2013-05-29 14:00:35 -04:00
Robin Ward 4cf1d9c266 Display details about the search context in the placeholder 2013-05-29 12:19:31 -04:00
Michael Kessler 10f8a9a97d Improve German translations.
This tries to improve the German translations in its context, making
them fit better in the layout, unifying different terms, fixing typos,
try to improve the readability and add some missing translations.
2013-05-29 11:45:27 +02:00
Michael Kessler d44fa5c1f7 Add email to German share link description help. 2013-05-29 09:59:46 +02:00
Sam 46389754d6 Merge pull request #892 from eriko/cas_support
Cas support
2013-05-28 16:13:29 -07:00
Jeff Atwood 5107f485aa add email to share link description help 2013-05-28 15:05:02 -07:00
Michael Kessler 5f591ae0ab Remove last occurrence of `liken`, which isn't a German word at all. 2013-05-28 21:52:37 +02:00
Michael Kessler fcc1716e07 More German translations for the admin dashboard. 2013-05-28 21:41:00 +02:00
Michael Kessler 5fd5cb5fe4 Fix typo in the German missing logo warning. 2013-05-28 20:42:59 +02:00
Michael Kessler a2f21f4d33 Add missing German server translation for `autoclosed_disabled`. 2013-05-28 20:17:56 +02:00
Michael Kessler 9812acc5d2 Rename `move_selected` to `split_topic` in German client translations. 2013-05-28 20:17:21 +02:00
Erik Ordway 9a409d9440 fix comment and remove url setting as it is not used. 2013-05-28 08:06:18 -07:00
Michael Kessler 95c4d4edbc Add missing API translations. 2013-05-28 13:15:05 +02:00
Michael Kessler 2ddb2f76c8 Update German translations. 2013-05-28 13:00:33 +02:00
Régis Hanol 402af452c2 keep French localization up to date
🇫🇷
2013-05-27 21:29:26 +02:00
Robin Ward 197909246c Weigh staff likes higher when calculating scores. New site setting: `staff_like_weight`
can set the factor (default is 3)
2013-05-27 12:46:08 -04:00
Michael Brown 17a09b5b70 Add hint on how to rebake posts 2013-05-25 00:16:43 -04:00
Neil Lalonde ada79260b3 Change composer error message when title is too long or too short, and make sure the submit button is 'disabled' when title is too long 2013-05-24 17:10:07 -04:00
Neil Lalonde d26b87bd3c Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics. 2013-05-24 16:56:43 -04:00
Neil Lalonde e600b45155 Composer uses bouncing popup messages beside fields with invalid values when you click the submit button 2013-05-24 12:26:17 -04:00
Kuba Brecka 0b09a52b31 cs translation update 2013-05-24 10:04:27 +02:00
Erik Ordway 0bdee973a0 allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional 2013-05-23 13:44:14 -07:00
Erik Ordway 1575ce7b10 add cas support with a few tests 2013-05-23 13:40:50 -07:00
Robin Ward a08d4e4512 Merge pull request #883 from tangramor/master
update the zh_CN & zh_TW locales
2013-05-23 07:28:59 -07:00
Robin Ward 0bd61df34c Merge pull request #884 from mattvanhorn/refactor_topic
Refactor topic
2013-05-23 07:26:22 -07:00
Matt Van Horn c4b5821ef8 Revert annotation and non-English I18n changes 2013-05-23 06:44:47 -07:00
Matt Van Horn 806255b3c4 refactor Topic validation
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
2013-05-22 22:31:52 -07:00
tangramor 9df4ad794e update the locale of zh_CN & zh_TW 2013-05-23 10:56:49 +08:00
Jeff Atwood cdbe6f64c7 minor copy changes 2013-05-22 16:30:41 -07:00
Sam cb2068e448 Merge pull request #872 from joebew42/client_it
Updated Italian translation
2013-05-21 23:03:50 -07:00
Tower He 795de0c2d0 Updated zh locales 2013-05-22 13:45:32 +08:00
Joe Bew 088b5483f9 Updated Italian translation 2013-05-21 19:46:24 +02:00
Robin Ward 6f3629d65b Merge pull request #866 from ZogStriP/keep-french-l10n-up-to-date-2013-05-20
keep French l10n up to date
2013-05-21 06:30:53 -07:00
Robin Ward c9dc23dfb0 Merge pull request #863 from joebew42/it
Server side Italian translation updated
2013-05-21 06:29:54 -07:00
Jeff Atwood 0b4fc7ebed improve flag threshold reached message slightly 2013-05-20 17:16:35 -07:00
Régis Hanol 7594aef906 keep French l10n up to date
🇫🇷
2013-05-21 00:46:24 +02:00
Jeff Atwood 9f96a4fc58 get the select copy to fit on 1 line 2013-05-20 13:55:08 -07:00
Joe Bew 30fed99d0a Server side Italian translation updated 2013-05-20 19:15:29 +02:00
Jeff Atwood c5b2fd8067 simplify spam flag reason text 2013-05-18 00:47:58 -07:00
Jeff Atwood 7cf3f16d62 add YAML lint hint to the top of lang YAML files 2013-05-17 16:54:07 -07:00
Sam 6f2e74b31e Merge pull request #855 from sanderdatema/dutch_translation
Dutch translation updated
2013-05-17 15:58:20 -07:00
Neil Lalonde f3282e33a3 Add tabs to category create/edit modal. Categories can have a default auto-close setting that applies to all new topics created in the category. Add rspec-given and write some integration tests. Tests for topic auto-close with category default 2013-05-17 11:05:35 -04:00
Sander Datema 2f976365a5 Dutch translation updated
Up til commit dd400bb
2013-05-17 10:20:52 +02:00
Jeff Atwood 737e16f7e0 remove "Logs" from Email Logs title on admin 2013-05-16 17:20:12 -07:00
Sam be391e18fd Merge pull request #853 from joebew42/joe
Updated client side Italian translation
2013-05-16 16:33:34 -07:00
Régis Hanol 64ba7c75f4 keep French l10n up to date
🇫🇷
2013-05-17 00:20:23 +02:00
Robin Ward 7daca77443 Remove modal state to choose move type. Instead use two buttons on the multi select popup, one
for split and one for merge.
2013-05-16 14:22:41 -04:00
Giuseppe Leone e7b7c89554 Updated client side Italian translation 2013-05-16 20:19:05 +02:00
Robin Ward d554a59102 Support for a new site setting: `newuser_spam_host_threshold`. If a new user posts a link
to the same host enough tiles, they will not be able to post the same link again.

Additionally, the site will flag all their previous posts with links as spam and they will
be instantly hidden via the auto hide workflow.
2013-05-16 12:19:50 -04:00
Régis Hanol fe18527989 keep French l10n up to date
🇫🇷
2013-05-15 02:01:31 +02:00
Robin Ward f1b4ecfdc9 Change help text to indicate you can search by id or url 2013-05-14 16:12:48 -04:00
Jeff Atwood 077df288db drop 'site' from top title for settings/content 2013-05-14 13:09:05 -07:00
Jeff Atwood c69eccab90 better multi-select help text 2013-05-14 13:04:38 -07:00
Neil Lalonde 674818a26a Add a link to sidekiq in the dashboard message warning about failed email jobs 2013-05-14 11:21:52 -04:00
Neil Lalonde 957d95c1cc Fix rerender of topic close message when you navigate away from a closing topic 2013-05-13 16:25:17 -04:00
Neil Lalonde b7cdee4d5c Add title tag to the admin options button in the composer 2013-05-13 16:25:17 -04:00
Neil Lalonde d3f19817aa Add 'automatically' to the auto-close notification 2013-05-13 13:32:37 -04:00
Neil Lalonde 9828c87525 Topic Auto-Close: admins and mods can set a topic to automatically close after a number of days 2013-05-13 12:53:52 -04:00
Robin Ward 87469fa4b7 Fix broken YML 2013-05-13 10:29:52 -04:00
Sander Datema 0a20538f75 Updated Dutch translation
Updated til commit e661871aea
2013-05-13 12:57:06 +02:00
Zach Latta 23d208bb96 Changed failing_emails_warning to reflect the real location of production.rb. 2013-05-10 20:59:51 -06:00
Robin Ward adb76ad49b Merge pull request #840 from ZogStriP/keep-french-l10n-up-to-date
keep French l10n up to date
2013-05-10 15:53:17 -07:00
Robin Ward cf01c98d81 Experimental: Interface to Move Posts to an Existing Topic 2013-05-10 14:55:51 -04:00
Régis Hanol af773ab4ea keep French l10n up to date 2013-05-10 15:48:47 +02:00
Kuba Brecka b029417644 cs translation update 2013-05-10 09:02:51 +02:00
Sam 942f168ab6 UI still a tad rough, but we have a first pass of secure categories 2013-05-10 16:47:47 +10:00
Régis Hanol 16c8836977 keep French l10n up to date 2013-05-10 00:22:02 +02:00
Sam 5280b3a01b more group progress, UI getting there, controller mostly done
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
2013-05-09 17:37:34 +10:00
Robin Ward 2ba08d23cb Merge pull request #831 from kubabrecka/cs_update43
cs translation update
2013-05-08 07:40:58 -07:00
Robin Ward d458e00197 Merge pull request #832 from kubabrecka/kb_fix
max_upload_size_kb is in "kB" not "kb"
2013-05-08 07:39:51 -07:00
Robin Ward 4e16badeae Merge pull request #833 from kubabrecka/admin_api_l10n
Localize admin API section
2013-05-08 07:39:02 -07:00
Neil Lalonde f35a44aeae Add ability for admins and mods to send another activation email to a user, to activate an account, and deactivate an account 2013-05-08 10:10:47 -04:00
Kuba Brecka 05bc63b102 Localize admin API section 2013-05-08 09:13:10 +02:00
Kuba Brecka 09221bb72e max_upload_size_kb is in "kB" not "kb" 2013-05-08 08:43:47 +02:00
Kuba Brecka 0f4b443317 cs translation update 2013-05-08 08:37:34 +02:00
Sam 6b536dcde5 work in progress ... groups 2013-05-08 15:20:38 +10:00
Sander Datema 1b1cd0973d Dutch translation updated
Updated til commit e70526d851
2013-05-06 19:44:44 +02:00
Neil Lalonde 69be7d0ad1 Change the title Visits to Clicks in referral tables on admin dashboard 2013-05-06 11:56:35 -04:00
Sam bb7a2da224 update psuedo locale 2013-05-06 10:48:30 +10:00
Sam 63435d9bdd Merge pull request #819 from kubabrecka/cs_update42
cs translation update
2013-05-05 16:51:52 -07:00
Régis Hanol 82450ac67e keep French l10n up to date 2013-05-05 01:34:57 +02:00
Kuba Brecka 62ef89dfc9 cs translation update 2013-05-04 21:57:41 +02:00
Neil Lalonde 52942d2de6 Merge pull request #813 from slainer68/ga_domain_name
Google Analytics Domain name site setting
2013-05-03 14:57:01 -07:00
Neil Lalonde c6370a3479 Add ability to edit the uncategorized category name, color, and text_color in a modal 2013-05-03 17:55:04 -04:00
slainer68 ac66f25043 Google Analytics Domain name site setting 2013-05-03 21:58:10 +02:00
Neil Lalonde c790d653c9 Merge pull request #811 from emberjs-cn/update-zh-locales
Updated the zh locales
2013-05-03 07:43:47 -07:00
Tower He fec26c1d29 Updated the zh locales 2013-05-03 20:21:50 +08:00
Sam dcfa9db84b Merge pull request #805 from kubabrecka/cs_update41
cs translation update
2013-05-03 03:39:31 -07:00
Sam 92cf36b42d Merge pull request #808 from 9034725985/patch-1
In client.en.yml, add a comma after a leading sorry
2013-05-03 03:38:53 -07:00
Kushal 2648039a99 In client.en.yml, add a comma after a leading sorry
Add a comma after the leading sorry to keep things consistent.
2013-05-02 20:10:00 -05:00