Commit Graph

1261 Commits

Author SHA1 Message Date
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
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 6364fc74ef Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls
Conflicts:
	app/services/spam_rules_enforcer.rb
2013-07-03 11:13:56 -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
Robin Ward 5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -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
Sam 12f866a727 Merge pull request #1120 from abbat/master
Russian translation (actual version)
2013-07-01 22:44:30 -07:00
Sam c3f64f99b3 fix up messed up routes 2013-07-02 15:21:26 +10:00
Sam 46c6949b6e Merge pull request #1123 from stephankaag/rails4-new
Refactor routes in order to be compatible with Rails 4
2013-07-01 16:07:22 -07:00
Stephan Kaag e39cc464b1 Refactor routes in order to be compatible with Rails 4 2013-07-01 20:00:06 +02: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
Robin Ward 2deaf8ef98 Custom Wordpress Serializer and Path, with Specs 2013-06-28 13:56:13 -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