c2653b2915
Merge pull request #1309 from stephankaag/sidetiq
...
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
9170166e93
Finish renaming blocked emails to screen emails
2013-08-14 16:45:30 -04:00
86647f0a54
Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail.
2013-08-14 16:08:23 -04:00
a6b4b5dbf2
Replace Clockwork with Sidetiq
2013-08-14 21:39:40 +02:00
bc0d4f1bfc
Add a confirm modal to Delete All Posts button
2013-08-14 11:48:18 -04:00
b71ffe9160
Merge pull request #1326 from sanderdatema/dutch_translation
...
Updated Dutch translation
2013-08-14 06:56:52 -07:00
e0636fa914
Updated Dutch translation
2013-08-14 15:47:48 +02:00
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
019d52f4ac
Merge pull request #1319 from adrianlang/patch-1
...
Fix typo in german translation
2013-08-14 01:11:10 -07:00
701090bf3e
Fix typo in german translation
2013-08-13 21:36:57 +02:00
9782d3777e
Merge pull request #1314 from quickwango/patch-1
...
missing german translations
2013-08-13 07:39:33 -07:00
8a0e253b6f
oops, that should not be there
2013-08-13 16:29:49 +02:00
ce92d21d22
copyedit pass on admin descriptions
2013-08-13 02:00:01 -07:00
6722a1fe22
some minor user deletion tweaks
2013-08-13 00:41:23 -07:00
18c304bda6
more translations
2013-08-12 21:32:04 +02:00
306a6eeb3c
fixed indention
2013-08-12 21:23:35 +02:00
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
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
8e8167b41e
Russian translation (actual version)
2013-08-12 09:58:45 +04:00
7029261318
added the missing de.user.change translation
2013-08-12 00:20:29 +02:00
199d6a3fcc
Update client.zh_TW.yml
...
update the translation by comparing with client.en.yml
2013-08-10 19:43:47 +08:00
bb492eb8bf
Add filtering to staff logs page
2013-08-09 16:59:05 -04:00
652169daf6
Include a list of more new topics in the digest emails at the bottom
2013-08-09 14:43:02 -04:00
90a3bcf6ff
Add filter by action to staff logs page
2013-08-09 10:06:59 -04:00
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
b6a133c6b1
Fix various errors in german translation
2013-08-08 11:26:01 +02:00
b097d780d0
Tweaks to staff action logs page
2013-08-07 18:29:13 -04:00
b0848db6de
Oops, forgot to use i18n in some places
2013-08-07 16:46:23 -04:00
5c8c52482a
Add a way to view staff action logs in admin
2013-08-07 16:27:34 -04:00
d2fb6ec53f
Blocked Emails list in admin
2013-08-07 16:27:34 -04:00
fe3a69c271
Private message emails now include the history
2013-08-07 13:03:45 -04:00
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
1c3804934e
Show the entire history of replies above a post when you expend "in reply to"
2013-08-06 17:43:10 -04:00
5f4bcfaafa
Russian translation (actual version)
2013-08-05 10:17:18 +04:00
5f46dfedf1
Merge pull request #1320 from ZogStriP/local-avatars
...
Local avatars
2013-08-14 00:36:42 -07:00
71c33086b4
updated NGINX sample configuration
2013-08-13 22:09:44 +02:00
e397c14702
updated locales
2013-08-13 22:09:36 +02:00
92b0cfe3d3
cleaned up non-used code
2013-08-13 22:09:10 +02:00
c867b67a0b
custom avatar support
2013-08-13 22:08:29 +02:00
e5e3164ea1
added the "allow uploaded avatars" site setting
2013-08-13 22:06:22 +02:00
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
fadb6afde8
missed an image upload extension removal
2013-08-04 01:20:52 -07:00
2fe70819d5
don't show image extensions
...
BECAUSE SERIOUSLY IMAGES JESUS DUH
2013-08-04 01:19:15 -07:00
c2acdaad9d
add better copy for username changes
2013-08-04 01:11:35 -07:00
98b58150bb
Dashboard calculations are done with an async job now
2013-08-02 18:32:33 -04:00
f996a8757a
add "post last edited at" to edit tooltip
2013-08-02 13:15:50 -07:00
d5dd70c503
Merge pull request #1287 from charlieshum/master
...
Update client.zh_TW.yml
2013-08-02 13:14:34 -07:00
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
7b4a236c3f
Update client.zh_TW.yml
2013-08-02 19:41:33 +08:00
d25dfb85ce
Merge pull request #1280 from kubabrecka/cs_update50
...
cs translation update
2013-08-01 18:13:32 -07:00
857e2e6a19
correct scope, it should user:email to get read access to email
2013-08-02 10:03:29 +10:00
2162e3bbb5
we need email scope (also as I edit files I like to keep quoting consistent)
2013-08-02 09:59:25 +10:00
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
c063580275
slightly shorter copy for first post JIT education
2013-08-01 15:58:46 -07:00
0f067a2ad3
we need that <hr> in notification emails, I think
2013-08-01 15:15:32 -07:00
1e2f151860
warns sysadmin to rebake all the posts
...
when changing the hostname
2013-08-01 22:24:55 +02:00
74979b17d4
cs translation update
2013-08-01 18:27:15 +02:00
4a0ea7f776
Upgrade jQuery to 2.0.3
2013-08-01 11:58:22 -04:00
160107a712
working plugin interface for custom openid auth, custom css and custom js
2013-08-01 16:02:43 +10:00
0480c55d9f
minor activation copy improvement
2013-07-31 11:44:42 -07:00
491c93c3d1
Merge branch 'makeheadspace-fix_spelling_on_settings'
...
Conflicts:
config/locales/server.en.yml
2013-07-31 10:24:37 -04:00
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
0fc5d53e5a
Remove redundant 'are'.
2013-07-31 13:05:14 +03:00
4e59f2d122
update copy for self-deleted posts
...
still needs variable replacement for the 24 hours part
2013-07-30 13:16:13 -07:00
1caa301712
Fix spelling of noscript in the settings page.
2013-07-30 10:22:31 -04:00
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
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
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
77494e201a
Merge pull request #1258 from elo7/pt_BR
...
Added pt_BR user.change key value
2013-07-28 22:18:37 -07:00
aa6c92922d
SECURITY: correct our CSRF implementation to be much more aggressive
2013-07-29 15:13:13 +10:00
c73f22b515
added pt_BR key
2013-07-26 11:17:20 -03:00
ce8d69ccf1
Russian translation (actual version)
2013-07-26 14:35:59 +04:00
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
0317cf9608
Show topics as a list of topics on the User Stream.
2013-07-25 15:56:20 -04:00
cca9473c55
updating the spanish translation in client.es.yml
2013-07-24 04:43:53 -04:30
366cb13140
restyle all user notification emails to use a custom html template
2013-07-24 17:24:55 +10:00
be9217d4c8
add server-side filesize check on uploads
2013-07-24 00:54:41 +02:00
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
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
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
6474e7df97
uploads selector texts is now different when attachments are enabled
2013-07-22 23:15:23 +02:00
43ceacabab
Link to edit "About Me" links directly to the field.
2013-07-22 16:53:21 -04:00
b0ca3a34ca
Neil have fixed his grammar
2013-07-22 15:45:46 -04:00
3e7b418ea8
First Try: Include Post History (context) in Notification Emails
2013-07-22 15:06:37 -04:00
ed745c3fdd
Merge pull request #1222 from ZogStriP/fix-s3-related-issues
...
Fix s3 related issues
2013-07-22 07:30:41 -07:00
c879c58481
Merge pull request #1227 from abbat/master
...
Russian translation (actual version)
2013-07-22 07:23:18 -07:00
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
1f3c5cb656
allow end user to recover a post they delete
...
automatically delete stubs after 1 day
2013-07-22 17:48:47 +10:00
9616767bff
Add confirmation modal to admin group deletion
2013-07-22 02:48:23 -04:00
9e4b0df7ff
69 specs fail in rails 4 now ...not too bad
2013-07-22 15:07:20 +10:00
2986798ba7
add newuser-max-attachments setting
2013-07-22 02:39:17 +02:00
ad31eefb27
Russian translation (actual version)
2013-07-22 01:49:46 +04:00
ddabc476bf
Awesome documentation updates
2013-07-21 03:43:54 -04:00
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
58eec31351
sample ubuntu upstart config file
2013-07-19 15:23:55 +10:00
713735f4c8
updating pt_BR translations
2013-07-18 00:09:54 -03:00
19f3a8d640
Each user activity filter has its own URL now.
2013-07-17 15:42:31 -04:00
e2ff064aa3
Merge pull request #1198 from prem-prakash/master
...
Adding Portuguese Brazilian translations
2013-07-17 06:59:31 -07:00
6839869170
Merge pull request #1211 from zsj950618/master
...
Add some translation of Simplified Chinese
2013-07-17 06:53:07 -07:00
75e636f5a5
FIX: Invalid YAML
2013-07-17 09:51:03 -04:00
b4cae0f5d3
Korean language pack
2013-07-17 09:36:50 -04:00
c2be81a76e
Merge pull request #1199 from ZogStriP/uploads
...
adds the `max_attachment_size_kb` setting
2013-07-16 23:03:42 -07:00
2573935155
improve security UI
2013-07-17 15:10:49 +10:00
625204c8bd
work in progress category UI
...
refactor hack from earlier
2013-07-17 14:54:21 +10:00
0956c60c99
add some missing Simplified Chinese translation
2013-07-17 09:47:07 +08:00
46ff98f2d3
fix composer toolbar upload title
2013-07-17 01:21:27 +02:00
d466d11e71
Ember RC6 update
2013-07-16 10:35:18 -04:00
86d0255d5a
Merge pull request #1197 from kubabrecka/cs_update49
...
cs translation update
2013-07-16 07:33:33 -07:00
06bd9e3234
allow login required screen to be customized
2013-07-16 20:49:04 +10:00
ff7d9cac38
fix non localized said: in quotes
2013-07-16 17:22:54 +10:00
957d7a31dd
clarify queue_jobs is developer only
2013-07-15 23:12:27 -07:00
ecf17cfebb
work in progress, add fidelity to category group permissions (full, create posts, readonly)
2013-07-16 15:46:11 +10:00
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
8c5e0e7550
Adding Portuguese-Brazil language
2013-07-15 14:45:16 -03:00
e2a2bddd60
cs translation update
2013-07-15 16:40:39 +02:00
ed60f24502
Merge pull request #1194 from ZogStriP/uploads
...
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
2bba939d9f
Merge pull request #1196 from abbat/master
...
Russian translation (actual version)
2013-07-15 07:04:27 -07:00
fb00418f7a
Russian translation (actual version)
2013-07-15 15:45:51 +04:00
25bcd6007c
Update client.nb_NO.yml
...
broken yaml
2013-07-15 21:26:28 +10:00
bf06be3260
Merge pull request #1189 from erlend-sh/patch-4
...
Update client.nb_NO.yml
2013-07-15 03:14:22 -07:00
16976a2092
Merge pull request #1192 from cfstras/locale
...
Locales: updated German locale, mainly the admin section
2013-07-15 03:08:33 -07:00
86e5c9afc2
Merge pull request #1193 from jbruni/master
...
Tiny typo fix (comment at nginx.sample.conf)
2013-07-15 00:58:09 -07:00
906d1bc7c8
improve copy on daily action limit
2013-07-14 23:11:10 -07:00
f46b619547
simplify copy around merge and split
2013-07-14 22:24:59 -07:00
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
f92075f360
Locale german: got another one
2013-07-14 20:37:40 +02:00
1d4abbe1fd
Locales: updated German locale, admin content like the admin section and flagging
2013-07-14 20:11:07 +02:00
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
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
a42ed5d831
Fixed typo at nginx.sample.conf
2013-07-14 01:06:59 -03:00
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
6ca5df0a09
Can recover deleted topics. Deleted topics show the first post as deleted in the UI.
2013-07-12 12:09:17 -04:00
f05bc44fbe
Merge pull request #1182 from sanderdatema/dutch_translation
...
Dutch translation updated
2013-07-11 19:59:08 -07:00
00c6bffc61
Merge pull request #1183 from erlend-sh/patch-3
...
Update client.nb_NO.yml
2013-07-11 19:58:29 -07:00
19c169540c
Staff can enter and view deleted topics
2013-07-11 16:39:35 -04:00
1976c622dc
Update client.nb_NO.yml
2013-07-11 16:54:51 +02:00
d4bc6f977b
Dutch translation updated
2013-07-11 16:54:46 +02:00
7fd8bb75d9
Merge pull request #1177 from ZogStriP/attachments
...
Attachments
2013-07-11 06:49:20 -07:00
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
6beb12e778
update nginx.sample.conf to take attachmetns into account
2013-07-10 22:59:54 +02:00
8ffe9e28d6
Shows who deleted a post
2013-07-10 16:22:49 -04:00
0e3e5bf533
Add relative_date_duration site setting
2013-07-10 12:38:43 -04:00
cc47616cdb
Merge pull request #1157 from abbat/email-custom-headers
...
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
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
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
7ccfc40389
TODO comment
2013-07-10 16:35:18 +10:00
8367326e76
glyphs on the user stream, rename responses to replies
2013-07-10 16:35:06 +10:00
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
4c0fe3bc12
Add a BIG WARNING to queue_jobs site setting
2013-07-09 15:34:51 -04:00
3c38062802
Check for updates: edge cases when the message on the dashboard doesn't make sense.
2013-07-09 14:01:08 -04:00
b1fcd523c6
Use FuleUtils.mkdir_p for cleaner code
2013-07-09 22:26:27 +05:30
ed1fb847ed
Russian translation (actual version)
2013-07-09 18:26:59 +04:00
5cda0e556c
Merge pull request #1111 from jamesaanderson/flash-video-onebox
...
Add flash video onebox support
2013-07-09 06:55:56 -07:00
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
2c314e275e
improve new category copy a bit
2013-07-09 00:49:38 -07:00
853fcb9b88
improve best of copy slightly
2013-07-08 23:39:22 -07:00
21bfb64a28
added EMBED_CLOCKWORK so users can embed clockwork scheduling inside another process
2013-07-09 11:01:51 +10:00
ad096ac2b7
More nav links on admin users list page
2013-07-08 12:44:14 -04:00
9b0f63627b
Add blocked users count to dashboard
2013-07-08 12:44:13 -04:00
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
d51a3cf50f
Add flash video onebox as disabled setting by default
2013-07-08 06:37:44 -07:00
4ddd50fe17
add "new" to PM title there for clarity
2013-07-08 00:01:24 -07:00
7bf798891b
better new user block PM copy
2013-07-07 23:58:07 -07:00
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
3dbb4ff9bc
Reorder filters on user page and name them better (All, Topics, Posts, Responses)
2013-07-08 12:12:06 +10:00
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
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
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
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
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
63f4519268
Merge pull request #1152 from abbat/patch-1
...
Fix Cyrillic transliteration map
2013-07-06 17:10:09 -07:00
45c227c81c
fix column name in admin email logs
2013-07-06 22:29:16 +02:00
6251935b1e
removed auto_link_images_wider_than setting
2013-07-06 22:19:16 +02:00
9999561b86
Fix Cyrillic transliteration map
...
Fix Cyrillic transliteration map for letters which hasn't ASCII equivalent
2013-07-06 18:38:01 +04:00
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
25d2cbc33f
Merge branch 'master' of github.com:discourse/discourse
2013-07-05 16:52:27 -04:00
1c0e0da683
Add rss feed for latest and hot
2013-07-05 16:49:06 -04:00
6cd6484b5e
New mode for Wordpress: Filter ONLY posts liked by moderators
2013-07-05 16:07:24 -04:00
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
84ce04dfa5
Use POST for send_activation_email action
2013-07-05 12:26:46 -04:00
a0f07f8914
Show the error message when send activation email fails from admin
2013-07-05 11:50:43 -04:00
ceee8ed63b
Put back mailcatcher config in development.rb
2013-07-05 11:32:54 -04:00
694a6f4970
Fix recommendations from #1145
2013-07-05 15:59:39 +04:00
7c82d6d4d0
FIX: new users are allowed to upload images to your servers
2013-07-05 00:44:18 +02:00
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
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
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
b83e3a3ffd
Merge pull request #1137 from kubabrecka/cs_update47
...
cs translation update
2013-07-03 23:29:05 -07:00
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
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
f7e2b3be7f
remove localization duplicate - seems like a typo
2013-07-03 21:27:46 +02:00
e58f9ef843
cs translation update
2013-07-03 21:22:41 +02:00
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
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
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
7ef5f0ac9b
Update server.fr.yml
2013-07-03 14:47:38 +02:00
4f10ea9880
Update server.fr.yml
...
Added few POPS3 translations and few things
2013-07-03 14:22:31 +02:00
67502d0c8e
Update server.fr.yml
...
added cas_domainname
2013-07-03 14:07:26 +02:00
64a00e284e
Update client.fr.yml
...
Missing capital on homepage
2013-07-03 11:43:52 +02:00
3da37506da
Back end - temporary boosting of trust levels
2013-07-03 10:30:40 +02:00
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
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
075ed1ab53
Refactor user blocking code; hide the Block button in admin
2013-07-02 14:42:53 -04:00
5770879472
Refactor: Move Topic Details into better objects, identity map, tests, query string filters
2013-07-02 10:36:46 -04:00
f47effa154
Changed grammar on powered_by_html
2013-07-02 12:11:28 +02:00
8057851cf5
"there are no more" is sufficient, drop "to read"
2013-07-01 23:29:49 -07:00
12f866a727
Merge pull request #1120 from abbat/master
...
Russian translation (actual version)
2013-07-01 22:44:30 -07:00
c3f64f99b3
fix up messed up routes
2013-07-02 15:21:26 +10:00
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
e39cc464b1
Refactor routes in order to be compatible with Rails 4
2013-07-01 20:00:06 +02:00
5281ba5af3
Russian translation (actual version)
2013-07-01 11:14:19 +04:00
6723ba6014
Add a list of for file uploads
2013-07-01 02:19:03 +02:00
c1a39b5a30
Show date with year in message to banned users who try to log in
2013-06-30 12:49:34 -04:00
dca216ed54
Be a bit more clear in the forgot password message
2013-06-28 18:14:16 -04:00
2deaf8ef98
Custom Wordpress Serializer and Path, with Specs
2013-06-28 13:56:13 -04:00
2d6118297d
Changes to tiny date format to remove mon and show short format dates instead
2013-06-28 13:10:04 -04:00
3c9cdead49
Update title on bookmark button of the last post you read
2013-06-28 13:10:04 -04:00
0382ec319e
Update client.fr.yml
2013-06-28 16:38:10 +02:00
4711c75e53
Merge pull request #1103 from royguo/patch-1
...
Update server.zh_CN.yml
2013-06-28 07:21:50 -07:00
251d169c0d
Merge pull request #1104 from ThomasHarper/patch-5
...
Update client.fr.yml
2013-06-28 07:21:10 -07:00
71464c0c31
Update client.fr.yml
...
dynamic_favion added
2013-06-28 16:04:20 +02:00
80e886bfde
Update client.fr.yml
...
Adding few translations again
2013-06-28 15:58:19 +02:00
a94947f5b0
Update client.fr.yml
...
Adding missing fr translation
2013-06-28 15:25:05 +02:00
4034cde6aa
Update server.zh_CN.yml
...
num_clicks : "点击数"
2013-06-28 09:54:37 +08:00
40c9014634
make flag reply reply-ier
2013-06-27 16:01:48 -07:00
5d6ad8f39c
Show a useful message when a banned user tries to log in
2013-06-27 15:14:42 -04:00
bf96c8ad01
Support for Custom FAQ content
2013-06-27 12:50:24 -04:00
d13166fa17
Merge pull request #1095 from Mikulas/typo-translation-czech
...
Minor typo fix in czech translation
2013-06-27 07:08:57 -07:00
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
5d1f5505af
"private topics" doesn't need to say "count"
2013-06-26 21:26:51 -07:00
72745d257d
provide a way to give a default filename to pasted images in the lightbox overlay
2013-06-26 21:54:08 +02:00
6819cd2886
minor typo fix in czech translation
...
grammar source: http://www.proofreading.cz/\?p\=377
2013-06-26 20:10:50 +02:00
89f182899f
Support for custom Privacy Policies
2013-06-26 10:59:36 -04:00
196a8f4ba5
Add dashboard warnings for system_username and notification_email site settings
2013-06-26 10:57:04 -04:00
e4f1255cde
copy improvement on account approval
2013-06-26 01:17:27 -07:00
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
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
a86b35c873
Remove the access_password site setting
2013-06-25 15:05:25 -04:00
87db582297
minor copyedit on "20 to go.."
2013-06-25 10:36:46 -07:00
a9f4fa4927
copyedits on reply via email
2013-06-25 10:07:27 -07:00
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
3fc69337d3
Enable reply by email for all users, display a message in the footer indicating so.
2013-06-25 11:27:17 -04:00
c79ab3fc2e
Change modal that asks which topic you want to reply in; upgrade bootbox.js
2013-06-24 15:01:07 -04:00
7e9d942060
Update server.fr.yml
...
Adding quotes and few things missing
2013-06-24 15:41:24 +02:00
bad7707cf3
Merge pull request #1082 from ThomasHarper/patch-2
...
Update client.fr.yml
2013-06-24 06:28:51 -07:00
4b638a0fea
Merge pull request #1083 from ThomasHarper/patch-3
...
Update client.fr.yml
2013-06-24 06:27:59 -07:00
fe51fd87cc
Russian translation (actual version)
2013-06-24 15:55:44 +04:00
b8960f26c9
Update client.fr.yml
...
Dates were missing and few stuff on back end
2013-06-24 12:43:02 +03:00
fadab25609
Update client.fr.yml
...
Missing quote
2013-06-24 12:01:42 +03:00
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
601c35fc58
Merge pull request #1067 from adkron/feature/supress_to_suppress
...
Correct spelling of suppress
2013-06-21 07:08:12 -07:00
a9c251e71a
restructure /admin/flags rows a bit
2013-06-21 00:29:54 -07:00
777e8c2012
Correct spelling of suppress
...
supress => suppress
Amos King @adkron <amos.l.king@gmail.com>
2013-06-20 23:44:27 -05:00
836ebbaa8e
Comment out example anti-hotlinking rules
2013-06-20 22:49:04 -04:00
3775a9c11d
shorter copy to fit on /admin better
2013-06-20 11:51:24 -07:00
4cd71972be
Cleaned up QUnit test structure
2013-06-20 13:58:54 -04:00
2e7c5a674c
Merge pull request #1049 from ZogStriP/admin-alerts
...
Admin alerts
2013-06-20 07:51:40 -07:00
14db3869ba
Merge pull request #1050 from abbat/master
...
Russian translation (actual version)
2013-06-20 01:17:53 -07:00
08df4c41cc
Merge branch 'master' of github.com:discourse/discourse
2013-06-20 17:42:29 +10:00
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
f1a1b8ca11
Russian translation (actual version)
2013-06-20 03:44:07 +04:00
f1fd29003d
switch medium time format to "mins" vs "minutes"
2013-06-19 16:09:57 -07:00
8c4aac7f94
Migrate all jasmine specs to Qunit. Removed Jasmine.
2013-06-19 18:18:35 -04:00
8a26b86739
added image magick alert
2013-06-19 22:36:56 +02:00
9036738ba2
added s3 file uploads alert
2013-06-19 22:11:11 +02:00
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
c9556b4bb8
Remove bookmark from top right of post; move its functionality to the post menu button
2013-06-18 17:35:37 -04:00
04998a6687
FIX: Referenced job incorrectly in clockwork
2013-06-18 10:05:15 -04:00
34daa34bc1
Merge pull request #1042 from Supermathie/sysadmin-docs
...
Sysadmin docs
2013-06-18 00:49:12 -07:00
80c42753e1
fix up find as you type for the invite into PM function
...
allow mods to remove users from a PM
2013-06-18 17:17:01 +10:00
b0d676f2f2
fixes in logrotate.conf
2013-06-18 03:04:01 -04:00
70be638f47
Update sample bluepill config and install docs
2013-06-18 02:28:30 -04:00
2eb1cc220c
posts should be post
2013-06-18 11:24:36 +10:00
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
4a9499c9f4
FIX: Trailing paren missing. Thanks Régis!
2013-06-17 17:15:11 -04:00
8acdc18bc8
First stab at polling support for POP3S / reply by email
2013-06-17 16:49:02 -04:00
a15ab2a0a6
flag type summary
2013-06-17 17:15:56 +10:00
8c7519df86
missing pluralization
2013-06-17 15:37:46 +10:00
dd5cd1df4f
Merge pull request #1037 from ZogStriP/imagineering
...
Imagineering
2013-06-16 22:01:10 -07:00
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
b97d186cb5
automatic groups should not allow you to muck with the listed users in the group
2013-06-17 12:54:25 +10:00
d4c3fe4e6a
added `create_thumbnails?` site setting
...
defaults to `false`
2013-06-17 02:49:34 +02:00
5703e3923c
FIX: Wrong key for translation file.
2013-06-16 16:08:36 -04:00
08b64faa7f
Merge pull request #1031 from kubabrecka/cs_update46
...
cs translation update
2013-06-16 12:46:20 -07:00
ee9af728e3
Merge pull request #1035 from erlend-sh/master
...
WIP: Added Norwegian Bokmål translation, 50%
2013-06-16 12:45:42 -07:00
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
09d3800701
Move 'dynamic favicon' from Server to User pref
2013-06-14 23:58:24 -07:00
a908f00771
Documentation update: work in progress
2013-06-15 01:25:41 -04:00
c002acc387
cs translation update
2013-06-14 21:21:33 +02:00
f198c814a8
Add explanations for deactivate user and block user buttons in admin
2013-06-14 11:34:03 -04:00
5193ddc72f
Super basic test support for listing topics
2013-06-13 15:08:42 -04:00
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
e338e97fa3
remove line from JIT new user topic/reply help
2013-06-13 09:37:16 -07:00
66f5a3f6f6
FIX: Emoji sizes in emails should be done by the EmailStyler
2013-06-13 12:15:05 -04:00
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
e6e81efe85
correct information leak in page not found
2013-06-13 10:27:17 +10:00
f6060d5ff6
Russian translation (draft)
2013-06-12 06:58:16 +04:00
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
acb2126220
Omit Needless Words
2013-06-11 14:31:04 -07:00
85fcfe5ede
copyedits on digest email titles
2013-06-11 14:29:21 -07:00
e78c04b88b
extra space in email was causing sub-list :(
2013-06-11 13:52:54 -07:00
8a2d635e62
removed imgur support
2013-06-11 21:51:41 +02:00
811a0df68b
Make s3 region site setting a drop down
2013-06-11 14:24:04 -04:00
8b4e3402c2
Small improvements to digest emails and preview mechanism.
2013-06-11 12:27:11 -04:00
daeaf090c8
Merge pull request #1008 from Naiqus/patch-5
...
Update server.zh_CN.yml
2013-06-11 08:59:18 -07:00
59ede7c51f
Merge pull request #1007 from Naiqus/patch-4
...
Update client.zh_CN.yml
2013-06-11 08:58:59 -07:00
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
fa8a84f20c
removed sugar.js, port functionality to moment and underscore.js
...
bring in latest ace from local so we don't mess up with https
2013-06-11 15:27:26 +10:00
34eb36c88e
Update server.zh_CN.yml
2013-06-11 02:18:12 +03:00
46b6a0a533
Update client.zh_CN.yml
2013-06-11 02:17:04 +03:00
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
ad6705cca7
Update Ember to latest master (RC5)
2013-06-10 10:14:42 -04:00
7907f5066e
Merge pull request #999 from netzpirat/update-german-translations
...
Update German translations
2013-06-10 07:00:55 -07:00
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
561418304d
Update German client-side translations.
2013-06-10 10:58:42 +02:00
080938660c
Update German server-side translations.
2013-06-10 10:24:26 +02:00
64fb6dbf79
add Mandrill note to email deliverability test
2013-06-10 00:14:47 -07:00
b4a4774165
extend consumer email warning to yahoo & outlook
2013-06-10 00:08:06 -07:00
2d14b54096
Merge pull request #988 from chrishunt/add-dynamic-favicon
...
Add 'dynamic favicon' setting
2013-06-09 16:13:54 -07:00
27d0b120fd
Updated Dutch translation
2013-06-08 18:12:20 +02:00
af1c14939e
Add 'dynamic favicon' setting
2013-06-07 17:15:49 -07:00
b2a6755a48
Merge pull request #984 from Supermathie/moreentropy
...
More entropy for foreign titles
2013-06-07 14:23:26 -07:00
34e1f376f6
Add [PM] to subject of email notifications for private messages
2013-06-07 15:50:11 -04:00
f3fb10de03
settings: Update english description of entropy
2013-06-07 15:07:43 -04:00
5fa20ce357
more progress towards full migration to moment.js
2013-06-07 18:27:42 +10:00
d50a598e62
Notify admin of successful user approval
2013-06-06 18:37:25 -07:00
f6ce985121
Send activation email after user approved
2013-06-06 18:37:25 -07:00
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
564d242832
Notify moderators when someone is automatically blocked because of spam flags
2013-06-06 18:49:19 -04:00
11afa0c11b
work in progress migrate to moment
2013-06-07 08:49:22 +10:00
268a5debbf
Add 'apple touch icon url' site setting
2013-06-06 14:43:05 -07:00
207ad9049a
Merge pull request #973 from jd-erreape/spanish_server_translation
...
Spanish server and client translation
2013-06-06 08:13:08 -07:00
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
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
0d01c33482
Enabled strong_parameters across all models/controllers.
...
All models are now using ActiveModel::ForbiddenAttributesProtection, which shifts the responsibility for parameter whitelisting for mass-assignments from the model to the controller. attr_accessible has been disabled and removed as this functionality replaces that.
The require_parameters method in the ApplicationController has been removed in favor of strong_parameters' #require method.
It is important to note that there is still some refactoring required to get all parameters to pass through #require and #permit so that we can guarantee that parameter values are scalar. Currently strong_parameters, in most cases, is only being utilized to require parameters and to whitelist the few places that do mass-assignments.
2013-06-06 00:30:59 -07:00
a3d62fdf69
Temporarily roll back ember rc5. We identified some things we need to fix.
2013-06-06 01:25:43 -04:00
2ca734c118
Merge pull request #964 from chrishunt/exclusive-club
...
Add 'invite only' site setting
2013-06-05 16:38:47 -07:00
6f57564c54
add edit hint to "no topic definition"
2013-06-05 15:36:26 -07:00
0b97ea6345
Better HTML emails, smarter email digests, new email section in admin with digest preview
2013-06-05 17:47:25 -04:00
93cdb97b46
OOPS: Left a testing setting of precompile in development on. Turned it back off.
2013-06-05 15:33:50 -04:00
a3d52a41c6
Merge pull request #962 from sanderdatema/dutch_translation
...
Updated Dutch translation
2013-06-05 11:58:46 -07:00
24da1ab07e
Add 'invite only' site setting
2013-06-05 11:06:05 -07:00
7d089fdfb5
FIX: Compile templates properly with the latest handlebars
2013-06-05 14:00:02 -04:00
a0bd51862e
Upgrade Ember to RC5. Disabled a deprecation warning that I believe is in error.
2013-06-05 12:07:18 -04:00
f0d4a38433
Admin flags UI shows when it's loading and when there are no results
2013-06-05 10:24:50 -04:00
a9dcbe498d
Updated Dutch translation
2013-06-05 14:24:32 +02:00
2509d0f4fa
Merge pull request #959 from chrishunt/chrishunt/login-required-fixes
...
'login required' site setting improvements
2013-06-04 19:09:40 -07:00
93be638d93
message format is awesome, remove 0 unread and 0 new links.
2013-06-05 12:04:54 +10:00
3074300f76
Allow customization of 'login required' message
2013-06-04 18:53:36 -07:00
1dd59ca0a7
es translation is bust, rename for now
2013-06-05 10:25:32 +10:00
Sam
Neil Lalonde
Stephan Kaag
Robin Ward
Sander Datema
Régis Hanol
Adrian Lang
Phillip Schichtel
Jeff Atwood
Anton Batenev
charlieshum
Michael Brown
Kuba Brecka
Uģis Ozols
Zee Spencer
Daniel Cukier
Johan
Doug Alcorn
Michael Campagnaro
Prem Prakash
Junki Cho
SJ Zhu
Claus Strasburger
Erlend Sogge Heggen
J Bruni
Roy Guo
Nicolas Terray
J Phani Mahesh
James A. Anderson & Jalil Mohammed
David McClure
ThomasHarper
Navin
merugear
Mikulas
Amos L King
Jeff Atwood
Chris Hunt
Naiqus
Michael Kessler
Juan de Dios Herrero
Ian Christian Myers