51eb764345
mini profiler update to use latest flame graph engine
2013-09-03 17:58:56 +10:00
f13a408c2a
Omit Needless Words on new user JIT popups
2013-09-02 22:41:54 -07:00
529fe32453
Russian translation (actual version)
2013-09-02 18:48:47 +04:00
6e72eb5042
Merge branch 'master' of github.com:discourse/discourse
2013-09-02 17:19:17 +10:00
d3c5afbb80
reduce sidetiq frequency
...
remove minutely() schedule that was very inefficient
2013-09-02 17:14:41 +10:00
ee79a28569
Update client.zh_CN.yml
2013-09-02 10:09:11 +08:00
0089b10e25
remove footer newline from digest emails, is ugly
2013-08-30 23:08:29 -07:00
96313ce742
better copy for repeated URL blocking
2013-08-30 21:09:35 -07:00
46efbac40e
Add "Unread" filter to messages tab. Rename the other two views.
2013-08-30 12:32:05 -04:00
cd3f2a5973
Merge pull request #1401 from netzpirat/update-german-translations
...
Update german translations
2013-08-30 00:09:16 -07:00
b730b27c4f
some soample counter methods
2013-08-30 16:44:34 +10:00
82bc6b677f
Add link in hamburger menu to switch between mobile and desktop views
2013-08-29 15:19:28 -04:00
53cc1a4730
Update German server-side translations.
2013-08-29 18:10:20 +02:00
f74e68eece
Update German client-side translations.
2013-08-29 16:24:27 +02:00
b41fa4988a
update rails 4
...
ensure you clear the tmp/cache folder on each bench (so results are correct, there is an incompat upgrade)
add facter gem which will be used to collect hardware data from the bencher
2013-08-29 21:23:00 +10:00
aaf41d227f
fix secret_token init to always allow an override even if its too short
2013-08-29 15:27:59 +10:00
eec77e7bea
"moved" makes more sense in the notify
2013-08-28 16:31:57 -07:00
61281a3c81
invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users
2013-08-28 17:18:31 +10:00
0f6c2060b8
Merge pull request #1388 from ofgeek/patch-2
...
Update client.zh_CN.yml
2013-08-27 06:56:20 -07:00
79ddb162b6
Update client.zh_CN.yml
2013-08-27 15:33:26 +08:00
85a948d5b4
Update client.zh_CN.yml
2013-08-27 15:21:20 +08:00
89ce39c902
Merge pull request #1386 from Andersos/patch-1
...
added quotes
2013-08-26 18:45:06 -07:00
3708d47c87
Check daily if there are new users who need to be approved and send a pm to moderators
2013-08-26 16:16:27 -04:00
7dc71a616b
added quotes
2013-08-26 22:00:55 +02:00
818bf1355d
PluginStore for plugin specific bits of storage
...
Amended plugin interfaces so they work with the vk sample
2013-08-26 12:59:17 +10:00
213ce33af2
Fixed all broken specs
...
Moved middleware config into authenticators
2013-08-26 12:59:17 +10:00
912d4b853b
slowly going about ordering our middleware
2013-08-26 12:59:17 +10:00
075002a6d5
refactoring the plugin interfaces to allow for better extensible
2013-08-26 12:59:17 +10:00
32f717420d
add max_image_height site setting
2013-08-26 00:24:24 +02:00
b32e87c929
Merge pull request #1377 from ZogStriP/avatar-work
...
Improved specs for avatar + added a warning whenever the uploaded image is not a square
2013-08-25 07:30:34 -07:00
89421088e5
Merge pull request #1379 from abbat/master
...
Russian translation (actual version)
2013-08-25 07:28:38 -07:00
9e32baa357
Merge pull request #1375 from versvs/master
...
Added strings
2013-08-25 07:28:10 -07:00
bad2f7bb24
Russian translation (actual version)
2013-08-25 17:19:03 +04:00
4c788e75f0
add a warning whenever the uploaded image is not a square
2013-08-25 00:25:47 +02:00
c0b051c9f6
Show Private Messages pill as a topic list rather than individual messages.
2013-08-24 16:58:16 -04:00
3b9e62e6b9
improved specs for avatar
2013-08-24 22:45:05 +02:00
50a49138a5
Added strings
...
Added some strings not yet existing in the "es" locale but already in use in the application.
2013-08-24 18:10:54 +02:00
acf1124c0a
Merge pull request #1370 from ofgeek/patch-2
...
Update client.zh_CN.yml
2013-08-24 08:31:19 -07:00
fb037290ac
clarify on invite friends
2013-08-23 23:12:24 -07:00
6e79197519
Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency.
2013-08-23 17:36:25 -04:00
43a8bff652
add a site setting for allowing animated avatars
2013-08-23 18:55:02 +02:00
c409d91203
add "temporarily" to flagged content hidden
2013-08-23 00:07:08 -07:00
1a58bfbdc9
Update client.zh_CN.yml
2013-08-23 09:52:10 +08:00
25e0c3eac1
Log IP addresses with screened emails and urls
2013-08-22 19:04:35 -04:00
32655e9dad
digest email footer should say "unsubscribe"
2013-08-22 12:53:28 -07:00
10bc24b514
Add a note to allow_uncategorized_topics description
2013-08-22 12:14:41 -04:00
cc2b0f1a5f
took a stab at other translations with help from google
2013-08-21 16:29:05 -04:00
bd2006b270
updated english translation
2013-08-21 16:28:51 -04:00
47add6da70
Log when a site customization is deleted
2013-08-21 12:33:24 -04:00
a95303fcd8
Log site customization changes. Use a modal to show staff action log details for site customizations.
2013-08-21 12:33:24 -04:00
dcfe4f2061
remove useless text beneath avatar
2013-08-20 21:53:17 +02:00
b5b22f0f36
move secret token into redis to ease install
2013-08-20 17:17:19 +10:00
1d030666d8
Log site setting changes and show in admin
2013-08-19 16:58:38 -04:00
7eaedb84e1
Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked
2013-08-19 12:00:48 -04:00
103f204e36
Merge pull request #1354 from ofgeek/patch-2
...
Update client.zh_CN.yml
2013-08-19 07:35:36 -07:00
35442a0c79
Russian translation (actual version)
2013-08-19 12:26:02 +04:00
59a252f535
Update client.zh_CN.yml
2013-08-19 10:53:05 +08:00
1d74cc60a1
don't try sending emails out in profile mode
2013-08-19 11:33:38 +10:00
b69d089d06
we need to decalre favcount to keep tests happy
2013-08-18 21:52:13 +10:00
4af8a9102e
Authenticate with Discourse via OAuth2
...
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
2013-08-17 21:45:20 -07:00
ea6e73076b
change your avatar in a modal
2013-08-17 00:35:29 +02:00
baff59d752
Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting.
2013-08-16 17:28:36 -04:00
95c246e257
Add section for additional MIME in nginx
2013-08-16 11:49:50 -04:00
b6285b85d2
Add reject option to pending users page
2013-08-16 11:42:43 -04:00
946b02533b
better copy for password change button
2013-08-15 22:25:26 -07:00
b52761c522
Merge pull request #1338 from ofgeek/patch-2
...
Update client.zh_CN.yml
2013-08-15 21:52:02 -07:00
b2acf33a74
Update client.zh_CN.yml
2013-08-16 11:16:17 +08:00
3a8fbdb9a8
Update client.zh_CN.yml
2013-08-16 11:13:50 +08:00
490b057922
Update client.zh_CN.yml
2013-08-16 11:07:25 +08:00
27fbd232d4
Merge pull request #1334 from ofgeek/patch-2
...
Completely update the zh_CN locale.
2013-08-15 08:33:38 -07:00
9740d70c67
Merge pull request #1335 from meglio/links
...
Fix site settings link in Twitter config warning
2013-08-15 08:32:19 -07:00
293361dcd3
Screened URLs list in admin
2013-08-15 10:52:26 -04:00
f74587bb84
Fix site settings link in Twitter config warning
2013-08-15 11:51:18 +03:00
a6085125c5
Totally update zh_CN locale.
...
投诉 → 报告
登陆 → 登录
2013-08-15 11:53:00 +08:00
fe85e9f739
Update client.zh_CN.yml
2013-08-15 11:42:20 +08:00
22d26b471b
Keep up with the en locale.
2013-08-15 11:38:54 +08:00
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
Sam
Jeff Atwood
Anton Batenev
ofGEEK
Robin Ward
Neil Lalonde
Michael Kessler
Anders Sandvik
Régis Hanol
versvs
John Paul Ashenfelter
Michael Kirk
Michael Brown
Anton Andriyevskyy
Stephan Kaag
Sander Datema
Adrian Lang
Phillip Schichtel
charlieshum
Kuba Brecka
Uģis Ozols
Zee Spencer
Daniel Cukier
Johan
Doug Alcorn
Michael Campagnaro
Prem Prakash
Junki Cho
SJ Zhu