Robin Ward
27fbd232d4
Merge pull request #1334 from ofgeek/patch-2
...
Completely update the zh_CN locale.
2013-08-15 08:33:38 -07:00
Robin Ward
9740d70c67
Merge pull request #1335 from meglio/links
...
Fix site settings link in Twitter config warning
2013-08-15 08:32:19 -07:00
Neil Lalonde
293361dcd3
Screened URLs list in admin
2013-08-15 10:52:26 -04:00
Anton Andriyevskyy
f74587bb84
Fix site settings link in Twitter config warning
2013-08-15 11:51:18 +03:00
ofGEEK
a6085125c5
Totally update zh_CN locale.
...
投诉 → 报告
登陆 → 登录
2013-08-15 11:53:00 +08:00
ofGEEK
fe85e9f739
Update client.zh_CN.yml
2013-08-15 11:42:20 +08:00
ofGEEK
22d26b471b
Keep up with the en locale.
2013-08-15 11:38:54 +08:00
Sam
c2653b2915
Merge pull request #1309 from stephankaag/sidetiq
...
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
Neil Lalonde
9170166e93
Finish renaming blocked emails to screen emails
2013-08-14 16:45:30 -04:00
Neil Lalonde
86647f0a54
Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail.
2013-08-14 16:08:23 -04:00
Stephan Kaag
a6b4b5dbf2
Replace Clockwork with Sidetiq
2013-08-14 21:39:40 +02:00
Neil Lalonde
bc0d4f1bfc
Add a confirm modal to Delete All Posts button
2013-08-14 11:48:18 -04:00
Robin Ward
b71ffe9160
Merge pull request #1326 from sanderdatema/dutch_translation
...
Updated Dutch translation
2013-08-14 06:56:52 -07:00
Sander Datema
e0636fa914
Updated Dutch translation
2013-08-14 15:47:48 +02:00
Régis Hanol
3524b90d6a
FIX: avatars in quotes/oneboxes
...
Avatars in quotes/oneboxes are still pointing to the old
`/users/:username/avatar(/:size)` route.
So, this adds back the old avatar route for the transition period.
2013-08-14 12:20:05 +02:00
Sam
019d52f4ac
Merge pull request #1319 from adrianlang/patch-1
...
Fix typo in german translation
2013-08-14 01:11:10 -07:00
Adrian Lang
701090bf3e
Fix typo in german translation
2013-08-13 21:36:57 +02:00
Robin Ward
9782d3777e
Merge pull request #1314 from quickwango/patch-1
...
missing german translations
2013-08-13 07:39:33 -07:00
Phillip Schichtel
8a0e253b6f
oops, that should not be there
2013-08-13 16:29:49 +02:00
Jeff Atwood
ce92d21d22
copyedit pass on admin descriptions
2013-08-13 02:00:01 -07:00
Jeff Atwood
6722a1fe22
some minor user deletion tweaks
2013-08-13 00:41:23 -07:00
Phillip Schichtel
18c304bda6
more translations
2013-08-12 21:32:04 +02:00
Phillip Schichtel
306a6eeb3c
fixed indention
2013-08-12 21:23:35 +02:00
Neil Lalonde
b36c6d7b78
Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days.
2013-08-12 14:55:09 -04:00
Neil Lalonde
879652f055
Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits.
2013-08-12 11:12:20 -04:00
Anton Batenev
8e8167b41e
Russian translation (actual version)
2013-08-12 09:58:45 +04:00
Phillip Schichtel
7029261318
added the missing de.user.change translation
2013-08-12 00:20:29 +02:00
charlieshum
199d6a3fcc
Update client.zh_TW.yml
...
update the translation by comparing with client.en.yml
2013-08-10 19:43:47 +08:00
Neil Lalonde
bb492eb8bf
Add filtering to staff logs page
2013-08-09 16:59:05 -04:00
Robin Ward
652169daf6
Include a list of more new topics in the digest emails at the bottom
2013-08-09 14:43:02 -04:00
Neil Lalonde
90a3bcf6ff
Add filter by action to staff logs page
2013-08-09 10:06:59 -04:00
Neil Lalonde
ce05b43c1d
Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful
2013-08-08 12:54:38 -04:00
Adrian Lang
b6a133c6b1
Fix various errors in german translation
2013-08-08 11:26:01 +02:00
Neil Lalonde
b097d780d0
Tweaks to staff action logs page
2013-08-07 18:29:13 -04:00
Neil Lalonde
b0848db6de
Oops, forgot to use i18n in some places
2013-08-07 16:46:23 -04:00
Neil Lalonde
5c8c52482a
Add a way to view staff action logs in admin
2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f
Blocked Emails list in admin
2013-08-07 16:27:34 -04:00
Robin Ward
fe3a69c271
Private message emails now include the history
2013-08-07 13:03:45 -04:00
Michael Brown
08e41a707d
Update documentation
...
* Change recommendation for install path to /var/www/discourse
* Fix instructions for redis-server installation
* Set yourself as system user during install
* Clarify some instructions
2013-08-07 00:06:40 -04:00
Robin Ward
1c3804934e
Show the entire history of replies above a post when you expend "in reply to"
2013-08-06 17:43:10 -04:00
Anton Batenev
5f4bcfaafa
Russian translation (actual version)
2013-08-05 10:17:18 +04:00
Sam
5f46dfedf1
Merge pull request #1320 from ZogStriP/local-avatars
...
Local avatars
2013-08-14 00:36:42 -07:00
Régis Hanol
71c33086b4
updated NGINX sample configuration
2013-08-13 22:09:44 +02:00
Régis Hanol
e397c14702
updated locales
2013-08-13 22:09:36 +02:00
Régis Hanol
92b0cfe3d3
cleaned up non-used code
2013-08-13 22:09:10 +02:00
Régis Hanol
c867b67a0b
custom avatar support
2013-08-13 22:08:29 +02:00
Régis Hanol
e5e3164ea1
added the "allow uploaded avatars" site setting
2013-08-13 22:06:22 +02:00
Sam
10b02b1288
Create profile db generator for use when benchmarking a local install http://meta.discourse.org/t/benchmarking-discourse-locally/9070
2013-08-05 07:22:13 +10:00
Jeff Atwood
fadb6afde8
missed an image upload extension removal
2013-08-04 01:20:52 -07:00
Jeff Atwood
2fe70819d5
don't show image extensions
...
BECAUSE SERIOUSLY IMAGES JESUS DUH
2013-08-04 01:19:15 -07:00
Jeff Atwood
c2acdaad9d
add better copy for username changes
2013-08-04 01:11:35 -07:00
Neil Lalonde
98b58150bb
Dashboard calculations are done with an async job now
2013-08-02 18:32:33 -04:00
Jeff Atwood
f996a8757a
add "post last edited at" to edit tooltip
2013-08-02 13:15:50 -07:00
Robin Ward
d5dd70c503
Merge pull request #1287 from charlieshum/master
...
Update client.zh_TW.yml
2013-08-02 13:14:34 -07:00
Neil Lalonde
9db0ac16a9
Add site setting delete_removed_posts_after to configure after how many hour posts that were deleted by their authors will be deleted
2013-08-02 13:35:52 -04:00
charlieshum
7b4a236c3f
Update client.zh_TW.yml
2013-08-02 19:41:33 +08:00
Sam
d25dfb85ce
Merge pull request #1280 from kubabrecka/cs_update50
...
cs translation update
2013-08-01 18:13:32 -07:00
Sam
857e2e6a19
correct scope, it should user:email to get read access to email
2013-08-02 10:03:29 +10:00
Sam
2162e3bbb5
we need email scope (also as I edit files I like to keep quoting consistent)
2013-08-02 09:59:25 +10:00
Régis Hanol
faeb4a9ebd
enhance upload selector
...
- Change the icon on the button to a file when attachments are enabled
- Display the list of allowed extensions in the upload selector
- FIX : regexps for validating uploads weren't escaping the dots
2013-08-02 01:30:18 +02:00
Jeff Atwood
c063580275
slightly shorter copy for first post JIT education
2013-08-01 15:58:46 -07:00
Jeff Atwood
0f067a2ad3
we need that <hr> in notification emails, I think
2013-08-01 15:15:32 -07:00
Régis Hanol
1e2f151860
warns sysadmin to rebake all the posts
...
when changing the hostname
2013-08-01 22:24:55 +02:00
Kuba Brecka
74979b17d4
cs translation update
2013-08-01 18:27:15 +02:00
Robin Ward
4a0ea7f776
Upgrade jQuery to 2.0.3
2013-08-01 11:58:22 -04:00
Sam
160107a712
working plugin interface for custom openid auth, custom css and custom js
2013-08-01 16:02:43 +10:00
Jeff Atwood
0480c55d9f
minor activation copy improvement
2013-07-31 11:44:42 -07:00
Robin Ward
491c93c3d1
Merge branch 'makeheadspace-fix_spelling_on_settings'
...
Conflicts:
config/locales/server.en.yml
2013-07-31 10:24:37 -04:00
Robin Ward
6f81b9b9af
Merge branch 'fix_spelling_on_settings' of git://github.com/makeheadspace/discourse into makeheadspace-fix_spelling_on_settings
2013-07-31 10:23:04 -04:00
Uģis Ozols
0fc5d53e5a
Remove redundant 'are'.
2013-07-31 13:05:14 +03:00
Jeff Atwood
4e59f2d122
update copy for self-deleted posts
...
still needs variable replacement for the 24 hours part
2013-07-30 13:16:13 -07:00
Zee Spencer
1caa301712
Fix spelling of noscript in the settings page.
2013-07-30 10:22:31 -04:00
Neil Lalonde
4fd5087f91
Add button to delete a spammer in the flag modal
...
Add SiteSettings: delete_user_max_age, delete_all_posts_max. Add delete spammer button to admin flags UI
Moderators can delete users too
2013-07-29 15:29:44 -04:00
Neil Lalonde
5f3e9131ed
Deleting a user from admin user page has the option to also block signups from the same email address
2013-07-29 15:29:43 -04:00
Neil Lalonde
5f8a130277
Add BlockedEmail, to block signups based on email. Track stats of how many times each email address is blocked, and last time it was blocked. Move email validation out of User model and into EmailValidator. Signup form remembers which email addresses have failed and shows validation error on email field.
2013-07-29 15:29:43 -04:00
Sam
77494e201a
Merge pull request #1258 from elo7/pt_BR
...
Added pt_BR user.change key value
2013-07-28 22:18:37 -07:00
Sam
aa6c92922d
SECURITY: correct our CSRF implementation to be much more aggressive
2013-07-29 15:13:13 +10:00
Daniel Cukier
c73f22b515
added pt_BR key
2013-07-26 11:17:20 -03:00
Anton Batenev
ce8d69ccf1
Russian translation (actual version)
2013-07-26 14:35:59 +04:00
Robin Ward
e94cab090a
Merge pull request #1251 from johand/updating_es_locale
...
updating the spanish translation in client.es.yml
2013-07-25 13:05:08 -07:00
Robin Ward
0317cf9608
Show topics as a list of topics on the User Stream.
2013-07-25 15:56:20 -04:00
Johan
cca9473c55
updating the spanish translation in client.es.yml
2013-07-24 04:43:53 -04:30
Sam
366cb13140
restyle all user notification emails to use a custom html template
2013-07-24 17:24:55 +10:00
Régis Hanol
be9217d4c8
add server-side filesize check on uploads
2013-07-24 00:54:41 +02:00
Sam
7c5e15966f
Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments
...
uploads selector texts is now different when attachments are enabled
2013-07-23 00:44:17 -07:00
Sam
9ac6c6e2e9
Merge pull request #1233 from sir-pinecone/improve-group-deletion
...
Add confirmation modal to admin group deletion
2013-07-23 00:43:06 -07:00
Doug Alcorn
35a2bb7919
Parameterize the PBKDF2 algorithm in application config
...
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
2013-07-22 21:36:01 -04:00
Régis Hanol
6474e7df97
uploads selector texts is now different when attachments are enabled
2013-07-22 23:15:23 +02:00
Robin Ward
43ceacabab
Link to edit "About Me" links directly to the field.
2013-07-22 16:53:21 -04:00
Neil Lalonde
b0ca3a34ca
Neil have fixed his grammar
2013-07-22 15:45:46 -04:00
Robin Ward
3e7b418ea8
First Try: Include Post History (context) in Notification Emails
2013-07-22 15:06:37 -04:00
Robin Ward
ed745c3fdd
Merge pull request #1222 from ZogStriP/fix-s3-related-issues
...
Fix s3 related issues
2013-07-22 07:30:41 -07:00
Robin Ward
c879c58481
Merge pull request #1227 from abbat/master
...
Russian translation (actual version)
2013-07-22 07:23:18 -07:00
Robin Ward
8b181e0803
Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting
...
add newuser-max-attachments setting
2013-07-22 07:22:23 -07:00
Sam
1f3c5cb656
allow end user to recover a post they delete
...
automatically delete stubs after 1 day
2013-07-22 17:48:47 +10:00
Michael Campagnaro
9616767bff
Add confirmation modal to admin group deletion
2013-07-22 02:48:23 -04:00
Sam
9e4b0df7ff
69 specs fail in rails 4 now ...not too bad
2013-07-22 15:07:20 +10:00
Régis Hanol
2986798ba7
add newuser-max-attachments setting
2013-07-22 02:39:17 +02:00
Anton Batenev
ad31eefb27
Russian translation (actual version)
2013-07-22 01:49:46 +04:00
Michael Brown
ddabc476bf
Awesome documentation updates
2013-07-21 03:43:54 -04:00
Régis Hanol
613e31d3ef
added a warning regarding the case of the s3_upload_bucket setting
...
until we get proper setting validation.
2013-07-20 11:54:21 +02:00
Sam
58eec31351
sample ubuntu upstart config file
2013-07-19 15:23:55 +10:00
Prem Prakash
713735f4c8
updating pt_BR translations
2013-07-18 00:09:54 -03:00
Robin Ward
19f3a8d640
Each user activity filter has its own URL now.
2013-07-17 15:42:31 -04:00
Robin Ward
e2ff064aa3
Merge pull request #1198 from prem-prakash/master
...
Adding Portuguese Brazilian translations
2013-07-17 06:59:31 -07:00
Robin Ward
6839869170
Merge pull request #1211 from zsj950618/master
...
Add some translation of Simplified Chinese
2013-07-17 06:53:07 -07:00
Robin Ward
75e636f5a5
FIX: Invalid YAML
2013-07-17 09:51:03 -04:00
Junki Cho
b4cae0f5d3
Korean language pack
2013-07-17 09:36:50 -04:00
Sam
c2be81a76e
Merge pull request #1199 from ZogStriP/uploads
...
adds the `max_attachment_size_kb` setting
2013-07-16 23:03:42 -07:00
Sam
2573935155
improve security UI
2013-07-17 15:10:49 +10:00
Sam
625204c8bd
work in progress category UI
...
refactor hack from earlier
2013-07-17 14:54:21 +10:00
SJ Zhu
0956c60c99
add some missing Simplified Chinese translation
2013-07-17 09:47:07 +08:00
Régis Hanol
46ff98f2d3
fix composer toolbar upload title
2013-07-17 01:21:27 +02:00
Robin Ward
d466d11e71
Ember RC6 update
2013-07-16 10:35:18 -04:00
Robin Ward
86d0255d5a
Merge pull request #1197 from kubabrecka/cs_update49
...
cs translation update
2013-07-16 07:33:33 -07:00
Sam
06bd9e3234
allow login required screen to be customized
2013-07-16 20:49:04 +10:00
Sam
ff7d9cac38
fix non localized said: in quotes
2013-07-16 17:22:54 +10:00
Jeff Atwood
957d7a31dd
clarify queue_jobs is developer only
2013-07-15 23:12:27 -07:00
Sam
ecf17cfebb
work in progress, add fidelity to category group permissions (full, create posts, readonly)
2013-07-16 15:46:11 +10:00
Régis Hanol
5ce05ff5cb
adds the max_attachment_size_kb setting
...
so that we can specify a different max upload size for attachments and images.
2013-07-16 02:01:36 +02:00
premprakash
8c5e0e7550
Adding Portuguese-Brazil language
2013-07-15 14:45:16 -03:00
Kuba Brecka
e2a2bddd60
cs translation update
2013-07-15 16:40:39 +02:00
Robin Ward
ed60f24502
Merge pull request #1194 from ZogStriP/uploads
...
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
Robin Ward
2bba939d9f
Merge pull request #1196 from abbat/master
...
Russian translation (actual version)
2013-07-15 07:04:27 -07:00
Anton Batenev
fb00418f7a
Russian translation (actual version)
2013-07-15 15:45:51 +04:00
Sam
25bcd6007c
Update client.nb_NO.yml
...
broken yaml
2013-07-15 21:26:28 +10:00
Sam
bf06be3260
Merge pull request #1189 from erlend-sh/patch-4
...
Update client.nb_NO.yml
2013-07-15 03:14:22 -07:00
Sam
16976a2092
Merge pull request #1192 from cfstras/locale
...
Locales: updated German locale, mainly the admin section
2013-07-15 03:08:33 -07:00
Sam
86e5c9afc2
Merge pull request #1193 from jbruni/master
...
Tiny typo fix (comment at nginx.sample.conf)
2013-07-15 00:58:09 -07:00
Jeff Atwood
906d1bc7c8
improve copy on daily action limit
2013-07-14 23:11:10 -07:00
Jeff Atwood
f46b619547
simplify copy around merge and split
2013-07-14 22:24:59 -07:00
Régis Hanol
36e6345eee
change the icon in the composer toolbar with a more generic upload icon
...
also changed all references to "images uploads" to a "uploads"
2013-07-14 23:44:50 +02:00
Claus Strasburger
f92075f360
Locale german: got another one
2013-07-14 20:37:40 +02:00
Claus Strasburger
1d4abbe1fd
Locales: updated German locale, admin content like the admin section and flagging
2013-07-14 20:11:07 +02:00
Erlend Sogge Heggen
542408550c
v1 Complete translation for client.nb_NO.yml
...
All strings now have a first-take translation. Might have missed some due to the inconsistent use of double quotes, single quotes and no quotes (we're still good!).
I'm not entirely sure what happens when I apply edits to a still pending-for-pull patch; sorry if I goofed.
2013-07-14 14:16:17 +02:00
Régis Hanol
3397c2235f
display the size of the attachment in the preview
...
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
J Bruni
a42ed5d831
Fixed typo at nginx.sample.conf
2013-07-14 01:06:59 -03:00
Erlend Sogge Heggen
ac9cfe32f9
Update client.nb_NO.yml
...
Moar translations. Also jumped back and fixed what I could find of the ones with missing double quotes.
2013-07-13 20:47:11 +02:00
Robin Ward
6ca5df0a09
Can recover deleted topics. Deleted topics show the first post as deleted in the UI.
2013-07-12 12:09:17 -04:00
Sam
f05bc44fbe
Merge pull request #1182 from sanderdatema/dutch_translation
...
Dutch translation updated
2013-07-11 19:59:08 -07:00
Sam
00c6bffc61
Merge pull request #1183 from erlend-sh/patch-3
...
Update client.nb_NO.yml
2013-07-11 19:58:29 -07:00
Robin Ward
19c169540c
Staff can enter and view deleted topics
2013-07-11 16:39:35 -04:00
Erlend Sogge Heggen
1976c622dc
Update client.nb_NO.yml
2013-07-11 16:54:51 +02:00
Sander Datema
d4bc6f977b
Dutch translation updated
2013-07-11 16:54:46 +02:00
Robin Ward
7fd8bb75d9
Merge pull request #1177 from ZogStriP/attachments
...
Attachments
2013-07-11 06:49:20 -07:00
Roy Guo
994f3d4ad5
Update client.zh_CN.yml
...
banned: "禁止参与讨论" # can't create or reply topics
blocked: "禁止登陆" # can't login
2013-07-11 11:47:17 +08:00
Régis Hanol
6beb12e778
update nginx.sample.conf to take attachmetns into account
2013-07-10 22:59:54 +02:00
Robin Ward
8ffe9e28d6
Shows who deleted a post
2013-07-10 16:22:49 -04:00
Neil Lalonde
0e3e5bf533
Add relative_date_duration site setting
2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb
Merge pull request #1157 from abbat/email-custom-headers
...
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
