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
21b3359ea4
Merge pull request #957 from chrishunt/chrishunt/lock-down-the-base
...
Add 'login required' site setting
2013-06-04 17:22:08 -07:00
542c3cc546
allow onecase switch
2013-06-05 10:16:05 +10:00
fb4cb143e9
Started spanish translation
2013-06-05 09:46:00 +10:00
5f85aaee1d
correct message bus regression
...
implement automatically updating dates in list
2013-06-05 09:32:44 +10:00
122f9188c9
Redirect Ember routes to login if login required
2013-06-04 16:10:10 -07:00
85ceb5efa7
Add 'login required' site setting
2013-06-04 16:10:10 -07:00
93aa0a9f39
some copyedits on account blocking
2013-06-04 16:02:03 -07:00
2465c9c724
Add min_private_message_title_length site setting so private messages can have short titles
2013-06-04 17:59:23 -04:00
5879d3dffd
Update client.nb_NO.yml
...
First post, Mute, Unmute, Last post, are they meant to be translated?
finished down to composer
2013-06-04 19:21:57 +03:00
2259e97d42
Add a count of blocked users on the dashboard
2013-06-04 11:53:19 -04:00
e3861893a2
Remove talk of spam in the private messages when an account has been blocked and unblocked
2013-06-04 11:28:40 -04:00
c4904aacc0
Automatically flag someone as a spammer if their posts get at least X spam flags from N users while their trust level is 'new user'. Staff can clear and set this status from the user record in admin.
2013-06-03 16:37:40 -04:00
fbeff410f5
Update client.nb_NO.yml
...
Started work on "invited" translations.
2013-06-03 20:39:33 +03:00
21e45d9fa1
Create client.nb_NO.yml
...
Norwegian translation first take.
2013-06-03 19:36:23 +02:00
8b69ee26ff
forking in passenger was bust, message bus subscriptions would stop working after fork
2013-06-03 16:50:30 +10:00
545dbfc07e
New Feature: Staff can choose to "Take Action" when flagging to immediately reach hiding
...
thresholds.
2013-05-31 17:39:32 -04:00
cceac14baf
I broke infinite scrolling in a topic
2013-05-31 11:55:51 -04:00
f7c0fa0434
Merge pull request #932 from sanderdatema/dutch_translation
...
Updated Dutch translation
2013-05-31 08:30:13 -07:00
00f16b15c5
Updated Dutch translation
2013-05-31 10:03:07 +02:00
41187a5de1
Merge pull request #931 from ZogStriP/more-file-upload-test-coverage
...
added more file uploads test for better coverage
2013-05-30 21:36:33 -07:00
9ecf61d77d
Merge pull request #922 from ZogStriP/keep-french-l10n-up-to-date-2013-05-29
...
[ci-skip] keep French localization up to date
2013-05-30 21:35:19 -07:00
6cc0f8f2d4
added more file uploads test for better coverage
2013-05-31 03:13:37 +02:00
5d444be72b
Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number
2013-05-30 10:39:15 -04:00
571e62a27a
Keep German translations in sync.
2013-05-30 13:13:53 +02:00
8874c9ea75
Add message format support that can be used on complex localization strings
...
Add message about new and unread topics at the bottom of topics
move localization helper into lib
2013-05-30 16:49:57 +10:00
73834370a5
work in progress, live unread and new counts
2013-05-30 16:49:57 +10:00
52eeecd460
add strong warnings on force_hostname and port
2013-05-29 16:27:46 -07:00
2daf3ba8ca
keep French localization up to date
...
🇫🇷
2013-05-30 00:18:29 +02:00
8182a9d10c
Merge pull request #918 from chrishunt/chrishunt/quiet-tests-please
...
Clean up test output
2013-05-29 12:17:04 -07:00
6abd9ddd2d
Add warning on admin dashboard if production env is configured to send email through gmail
2013-05-29 14:00:35 -04:00
dbf4d9b0dc
Set Sidekiq log level to WARN
2013-05-29 09:36:15 -07:00
4cf1d9c266
Display details about the search context in the placeholder
2013-05-29 12:19:31 -04:00
10f8a9a97d
Improve German translations.
...
This tries to improve the German translations in its context, making
them fit better in the layout, unifying different terms, fixing typos,
try to improve the readability and add some missing translations.
2013-05-29 11:45:27 +02:00
d44fa5c1f7
Add email to German share link description help.
2013-05-29 09:59:46 +02:00
73d6014d10
documentation: merge & adapt suggestions from baus
2013-05-29 00:07:26 -04:00
46389754d6
Merge pull request #892 from eriko/cas_support
...
Cas support
2013-05-28 16:13:29 -07:00
5107f485aa
add email to share link description help
2013-05-28 15:05:02 -07:00
e7c739f337
Merge pull request #911 from netzpirat/update-german-translations
...
Update german translations
2013-05-28 13:27:57 -07:00
5f591ae0ab
Remove last occurrence of `liken`, which isn't a German word at all.
2013-05-28 21:52:37 +02:00
fcc1716e07
More German translations for the admin dashboard.
2013-05-28 21:41:00 +02:00
5fd5cb5fe4
Fix typo in the German missing logo warning.
2013-05-28 20:42:59 +02:00
ec223e5312
Fix unix socket paths in nginx upstream module
...
Unix socket paths only require a single forward slash according to the
HttpUpstreamModule documentation: http://wiki.nginx.org/HttpUpstreamModule
2013-05-28 11:37:03 -07:00
a2f21f4d33
Add missing German server translation for `autoclosed_disabled`.
2013-05-28 20:17:56 +02:00
9812acc5d2
Rename `move_selected` to `split_topic` in German client translations.
2013-05-28 20:17:21 +02:00
9a409d9440
fix comment and remove url setting as it is not used.
2013-05-28 08:06:18 -07:00
95c4d4edbc
Add missing API translations.
2013-05-28 13:15:05 +02:00
2ddb2f76c8
Update German translations.
2013-05-28 13:00:33 +02:00
402af452c2
keep French localization up to date
...
🇫🇷
2013-05-27 21:29:26 +02:00
197909246c
Weigh staff likes higher when calculating scores. New site setting: `staff_like_weight`
...
can set the factor (default is 3)
2013-05-27 12:46:08 -04:00
ea294f71c2
Merge pull request #845 from Supermathie/rebakedocs
...
Add hint on how to rebake posts
2013-05-26 17:48:07 -07:00
17a09b5b70
Add hint on how to rebake posts
2013-05-25 00:16:43 -04:00
6257c48613
Updated documentation
...
* added RVM option for single-user install
* clarified Web Server options
* bluepill sample config: create socket directory if it doesn't exist
* add multisite.yml.production-sample
* rename production.sample.rb (OCD)
* make two database.yml samples (one for dev, one for prod)
* fixed travis build (database.yml.sample renamed)
* fix other references to database.yml.sample
* clean up 'rvm requirements' instructions as per @mpapis
2013-05-25 00:07:45 -04:00
ada79260b3
Change composer error message when title is too long or too short, and make sure the submit button is 'disabled' when title is too long
2013-05-24 17:10:07 -04:00
d26b87bd3c
Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics.
2013-05-24 16:56:43 -04:00
e600b45155
Composer uses bouncing popup messages beside fields with invalid values when you click the submit button
2013-05-24 12:26:17 -04:00
0b09a52b31
cs translation update
2013-05-24 10:04:27 +02:00
0bdee973a0
allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional
2013-05-23 13:44:14 -07:00
1575ce7b10
add cas support with a few tests
2013-05-23 13:40:50 -07:00
a08d4e4512
Merge pull request #883 from tangramor/master
...
update the zh_CN & zh_TW locales
2013-05-23 07:28:59 -07:00
0bd61df34c
Merge pull request #884 from mattvanhorn/refactor_topic
...
Refactor topic
2013-05-23 07:26:22 -07:00
c4b5821ef8
Revert annotation and non-English I18n changes
2013-05-23 06:44:47 -07:00
806255b3c4
refactor Topic validation
...
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
2013-05-22 22:31:52 -07:00
9df4ad794e
update the locale of zh_CN & zh_TW
2013-05-23 10:56:49 +08:00
cdbe6f64c7
minor copy changes
2013-05-22 16:30:41 -07:00
cb2068e448
Merge pull request #872 from joebew42/client_it
...
Updated Italian translation
2013-05-21 23:03:50 -07:00
0a66c4db3c
Merge pull request #878 from emberjs-cn/update-zh-locales
...
Updated zh locales
2013-05-21 23:02:45 -07:00
d2b3f3d124
some helper files for vim
2013-05-22 15:48:48 +10:00
795de0c2d0
Updated zh locales
2013-05-22 13:45:32 +08:00
088b5483f9
Updated Italian translation
2013-05-21 19:46:24 +02:00
6f3629d65b
Merge pull request #866 from ZogStriP/keep-french-l10n-up-to-date-2013-05-20
...
keep French l10n up to date
2013-05-21 06:30:53 -07:00
c9dc23dfb0
Merge pull request #863 from joebew42/it
...
Server side Italian translation updated
2013-05-21 06:29:54 -07:00
7ece167159
redis configurable via ENV
...
Change heroku docs and tweak redis.yml.sample var name
to accmodate setting redis provider url via configs.
2013-05-20 20:41:33 -04:00
0b4fc7ebed
improve flag threshold reached message slightly
2013-05-20 17:16:35 -07:00
7594aef906
keep French l10n up to date
...
🇫🇷
2013-05-21 00:46:24 +02:00
9f96a4fc58
get the select copy to fit on 1 line
2013-05-20 13:55:08 -07:00
30fed99d0a
Server side Italian translation updated
2013-05-20 19:15:29 +02:00
e91ed83586
the private message stream is different to normal streams, improving the ui a bit and collapsing conversations
2013-05-20 16:44:06 +10:00
c5b2fd8067
simplify spam flag reason text
2013-05-18 00:47:58 -07:00
7cf3f16d62
add YAML lint hint to the top of lang YAML files
2013-05-17 16:54:07 -07:00
6f2e74b31e
Merge pull request #855 from sanderdatema/dutch_translation
...
Dutch translation updated
2013-05-17 15:58:20 -07:00
f3282e33a3
Add tabs to category create/edit modal. Categories can have a default auto-close setting that applies to all new topics created in the category. Add rspec-given and write some integration tests. Tests for topic auto-close with category default
2013-05-17 11:05:35 -04:00
2f976365a5
Dutch translation updated
...
Up til commit dd400bb
2013-05-17 10:20:52 +02:00
737e16f7e0
remove "Logs" from Email Logs title on admin
2013-05-16 17:20:12 -07:00
be391e18fd
Merge pull request #853 from joebew42/joe
...
Updated client side Italian translation
2013-05-16 16:33:34 -07:00
64ba7c75f4
keep French l10n up to date
...
🇫🇷
2013-05-17 00:20:23 +02:00
a80ec535a3
Support for "Select All / Deselect All" while selecting posts to merge / delete.
2013-05-16 16:50:38 -04:00
7daca77443
Remove modal state to choose move type. Instead use two buttons on the multi select popup, one
...
for split and one for merge.
2013-05-16 14:22:41 -04:00
e7b7c89554
Updated client side Italian translation
2013-05-16 20:19:05 +02:00
d554a59102
Support for a new site setting: `newuser_spam_host_threshold`. If a new user posts a link
...
to the same host enough tiles, they will not be able to post the same link again.
Additionally, the site will flag all their previous posts with links as spam and they will
be instantly hidden via the auto hide workflow.
2013-05-16 12:19:50 -04:00
19cc930cb1
Merge pull request #848 from ZogStriP/keep-french-l10n-up-to-date-2013-05-14
...
keep French l10n up to date
2013-05-15 22:16:24 -07:00
e9ebadb414
Nuke message_bus_observer move to service class and classes
...
Secure all messages triggered by post creation and all user actions so they don't leak
(meaning, if you have a browser open and secure topics are created you will only get them if you are allowed to see them)
2013-05-16 15:03:16 +10:00
fe18527989
keep French l10n up to date
...
🇫🇷
2013-05-15 02:01:31 +02:00
f1b4ecfdc9
Change help text to indicate you can search by id or url
2013-05-14 16:12:48 -04:00
077df288db
drop 'site' from top title for settings/content
2013-05-14 13:09:05 -07:00
c69eccab90
better multi-select help text
2013-05-14 13:04:38 -07:00
674818a26a
Add a link to sidekiq in the dashboard message warning about failed email jobs
2013-05-14 11:21:52 -04:00
a613347100
this warning is getting in the way of my presentation
2013-05-14 15:20:28 +10:00
957d95c1cc
Fix rerender of topic close message when you navigate away from a closing topic
2013-05-13 16:25:17 -04:00
b7cdee4d5c
Add title tag to the admin options button in the composer
2013-05-13 16:25:17 -04:00
d3f19817aa
Add 'automatically' to the auto-close notification
2013-05-13 13:32:37 -04:00
9828c87525
Topic Auto-Close: admins and mods can set a topic to automatically close after a number of days
2013-05-13 12:53:52 -04:00
87469fa4b7
Fix broken YML
2013-05-13 10:29:52 -04:00
0a20538f75
Updated Dutch translation
...
Updated til commit e661871aea
2013-05-13 12:57:06 +02:00
23d208bb96
Changed failing_emails_warning to reflect the real location of production.rb.
2013-05-10 20:59:51 -06:00
adb76ad49b
Merge pull request #840 from ZogStriP/keep-french-l10n-up-to-date
...
keep French l10n up to date
2013-05-10 15:53:17 -07:00
cf01c98d81
Experimental: Interface to Move Posts to an Existing Topic
2013-05-10 14:55:51 -04:00
af773ab4ea
keep French l10n up to date
2013-05-10 15:48:47 +02:00
b029417644
cs translation update
2013-05-10 09:02:51 +02:00
942f168ab6
UI still a tad rough, but we have a first pass of secure categories
2013-05-10 16:47:47 +10:00
16c8836977
keep French l10n up to date
2013-05-10 00:22:02 +02:00
5280b3a01b
more group progress, UI getting there, controller mostly done
...
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
2013-05-09 17:37:34 +10:00
2ba08d23cb
Merge pull request #831 from kubabrecka/cs_update43
...
cs translation update
2013-05-08 07:40:58 -07:00
d458e00197
Merge pull request #832 from kubabrecka/kb_fix
...
max_upload_size_kb is in "kB" not "kb"
2013-05-08 07:39:51 -07:00
4e16badeae
Merge pull request #833 from kubabrecka/admin_api_l10n
...
Localize admin API section
2013-05-08 07:39:02 -07:00
f35a44aeae
Add ability for admins and mods to send another activation email to a user, to activate an account, and deactivate an account
2013-05-08 10:10:47 -04:00
05bc63b102
Localize admin API section
2013-05-08 09:13:10 +02:00
09221bb72e
max_upload_size_kb is in "kB" not "kb"
2013-05-08 08:43:47 +02:00
0f4b443317
cs translation update
2013-05-08 08:37:34 +02:00
6b536dcde5
work in progress ... groups
2013-05-08 15:20:38 +10:00
b26057292e
change md route to raw
2013-05-08 10:26:55 +10:00
68e6405aca
redis rack cache was crazy, it was just storing stuff in redis FOREVER, added a PR to fix, forked to my repo, sourcing a sane version
2013-05-07 17:33:04 +10:00
1b1cd0973d
Dutch translation updated
...
Updated til commit e70526d851
2013-05-06 19:44:44 +02:00
69be7d0ad1
Change the title Visits to Clicks in referral tables on admin dashboard
2013-05-06 11:56:35 -04:00
872866744f
Merge pull request #812 from goodbrews/capistrano-samples
...
Link to helpful article on Capistrano deployment
2013-05-05 17:51:17 -07:00
bb7a2da224
update psuedo locale
2013-05-06 10:48:30 +10:00
63435d9bdd
Merge pull request #819 from kubabrecka/cs_update42
...
cs translation update
2013-05-05 16:51:52 -07:00
1ac0788cf8
Link to helpful article on Capistrano deployment
...
@SamSaffron mentioned in #809 he wouldn't mind me linking to a helpful
article on Capistrano deployment in those sample files. My totally
unbiased opinion is that the one I've committed here is the best one.
😉
Signed-off-by: David Celis <me@davidcel.is>
2013-05-05 08:38:27 -07:00
82450ac67e
keep French l10n up to date
2013-05-05 01:34:57 +02:00
62ef89dfc9
cs translation update
2013-05-04 21:57:41 +02:00
52942d2de6
Merge pull request #813 from slainer68/ga_domain_name
...
Google Analytics Domain name site setting
2013-05-03 14:57:01 -07:00
c6370a3479
Add ability to edit the uncategorized category name, color, and text_color in a modal
2013-05-03 17:55:04 -04:00
ac66f25043
Google Analytics Domain name site setting
2013-05-03 21:58:10 +02:00
cc60343d31
Update discourse.pill.sample to match the nginx.sample.conf
2013-05-03 10:59:46 -04:00
c790d653c9
Merge pull request #811 from emberjs-cn/update-zh-locales
...
Updated the zh locales
2013-05-03 07:43:47 -07:00
fec26c1d29
Updated the zh locales
2013-05-03 20:21:50 +08:00
dcfa9db84b
Merge pull request #805 from kubabrecka/cs_update41
...
cs translation update
2013-05-03 03:39:31 -07:00
92cf36b42d
Merge pull request #808 from 9034725985/patch-1
...
In client.en.yml, add a comma after a leading sorry
2013-05-03 03:38:53 -07:00
0685d3f84a
Merge pull request #807 from ZogStriP/keep-french-l10n-up-to-date
...
keep French l10n up to date
2013-05-03 03:38:03 -07:00
5d014c633b
Add sample Capistrano deployment files
...
Add the following sample Capistrano configuration files to ease
deployment to a VPS using Capistrano:
* `config/deploy.rb.sample`
* `config/thin.yml.sample`
* `Capfile.sample`
The sample Capfile will additionally load any recipes provided by
Discourse plugins.
Signed-off-by: David Celis <me@davidcel.is>
2013-05-02 19:53:37 -07:00
2648039a99
In client.en.yml, add a comma after a leading sorry
...
Add a comma after the leading sorry to keep things consistent.
2013-05-02 20:10:00 -05:00
4d2c28e8b2
added setting to flush redis if you feel like doing so in dev
2013-05-03 09:56:10 +10:00
3a0e41ab90
keep French l10n up to date
...
🇫🇷
2013-05-03 00:04:04 +02:00
9dceef3fa6
cs translation update
2013-05-02 12:27:43 +02:00
cb9a89940a
display admin/mod status on user page
2013-05-02 17:40:44 +10:00
5ec52bd2e9
:s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff
2013-05-02 17:22:27 +10:00
65cd00cf25
moderators now have teeth, more at http://meta.discourse.org/t/moderator-permission-set/6307/5
...
allow pms to be targetted at groups
2013-05-02 15:15:53 +10:00
e59ab32210
Merge pull request #800 from goodbrews/imgur-api-v3
...
Update to Imgur API v3
2013-05-01 21:52:00 -07:00
6be26f5316
Update to Imgur API v3
...
Version 2 of Imgur's API is deprecated. Their documentation for v2 is no
longer online, and applications can only be registered under version 3.
Version 3 of their API has a slightly different endpoint but, more
importantly, uses a Client ID/Secret pair instead of an API Key.
This PR updates Discourse to use the new version of Imgur's API.
Signed-off-by: David Celis <me@davidcel.is>
2013-05-01 21:39:10 -07:00
3bf3b130cc
Merge pull request #798 from kubabrecka/cs_update40
...
cs translation update
2013-05-01 16:35:04 -07:00
7b0a02c273
Merge pull request #801 from goodbrews/clockworkd-fix
...
Allow clockwork to be run using the daemons gem
2013-05-01 16:27:51 -07:00
43c767fb0d
Merge pull request #802 from ZogStriP/keep-french-l10n-up-to-date
...
keep French l10n up to date
2013-05-01 16:22:40 -07:00
38ed86d0c5
Add reports for IncomingLinks on admin dashboard
2013-05-01 18:12:02 -04:00
2c1b75fc36
keep French l10n up to date
...
🇫🇷
2013-05-02 00:07:23 +02:00
eb8cbaa91b
Allow clockwork to be run using the daemons gem
...
Clockwork ships with a helpful clockworkd executable, which uses the
daemons gem to daemonize clockwork. This provides an easy way to
start/stop/restart a deamonized clockwork process when deploying to
production servers manually. However, the daemons gem unfortunately does
funky things to the working directory that was preventing the
application from booting. Changing this `require` line to using
`require_relative` solves the issue and makes Discourse easier for Rails
devs to deploy to their own VPSes using, say, Capistrano.
Signed-off-by: David Celis <me@davidcel.is>
2013-05-01 14:10:51 -07:00
5f4dbd6ddc
Use tos_url site setting in flag modal if it's set
2013-05-01 11:49:18 -04:00
ed68a1ec81
cs translation update
2013-05-01 15:41:31 +02:00
67372a8a0d
simplify pinning message a bit
2013-04-30 22:52:35 -07:00
08ce46e7ed
:s/POST/REPLY/g
2013-05-01 10:52:31 +10:00
180c021940
normalize on "private message" vs "conversation"
2013-04-30 13:54:14 -07:00
6d19db23bb
too many pleases
2013-04-30 13:29:03 -07:00
cef9a74053
route for markdown /md/topic_id/post_number
2013-04-30 16:30:41 +10:00
50349e84fe
incorrect copy on Markdown linebreak setting
2013-04-29 15:12:12 -07:00
442be64d5e
Show an excerpt of a pinned topic's body in the topic list
2013-04-29 16:37:19 -04:00
56a6c96f38
same as previous commit, but with more force
2013-04-29 17:11:20 +10:00
f44fe3e689
dear smoke test, I love you, thanks ... the management
2013-04-29 16:52:56 +10:00
b5e01e5a87
Merge pull request #782 from sanderdatema/dutch_translation
...
Updates to Dutch translation
2013-04-28 19:05:41 -07:00
ede9d2a0a8
show diff in post history view
2013-04-29 03:20:51 +02:00
76e447ff8d
Updates to Dutch translation
...
Updated til commit 9e3b70c20e
2013-04-28 15:42:21 +02:00
dca2fbcefc
add meaningful error message on upload [ fixes #773 ]
2013-04-27 20:26:17 +02:00
bbf982984d
Add TOS and Privacy Policy site settings that can link to external sites.
2013-04-26 18:46:36 -04:00
f9e33ec6b8
store ip address and current user with incoming links
...
make links long an readable in share dialog
2013-04-26 16:18:55 +10:00
f0d3500ada
Merge pull request #735 from kubabrecka/i18n_user_actions4
...
move i18n of UserActions to JS-side and make sentences translatable (take 3)
2013-04-25 15:53:17 -07:00
f8c6a47892
Merge pull request #770 from ZogStriP/keep-french-l10n-up-to-date
...
keep French l10n up to date
2013-04-25 15:52:41 -07:00
4dbe25bfc2
very minor new user education copy tweaks
2013-04-25 15:42:03 -07:00
159c9b10d5
Add a nag to admin dashboard if you haven't changed the title site setting from the default 'Discourse'
2013-04-25 17:53:31 -04:00
14a99eca12
keep French l10n up to date
2013-04-25 22:29:51 +02:00
a62fbb1b95
Merge pull request #761 from kubabrecka/cs_update39
...
cs translation update
2013-04-24 12:03:55 -07:00
db2de1eff0
Add contact_email to site settings
2013-04-24 11:15:47 -04:00
9651bec37c
cs translation update
2013-04-24 12:59:05 +02:00
155348ca4c
Merge pull request #760 from ZogStriP/keep-french-l10n-up-to-date-2013-04-23
...
keep French l10n up to date
2013-04-24 03:19:19 -07:00
37867af1bb
track incoming links, amend share link to include user
...
fix pm styling
2013-04-24 18:05:35 +10:00
a0665105ec
spring config
2013-04-24 12:02:36 +10:00
4d6f6a8322
keep French l10n up to date
2013-04-24 02:09:36 +02:00
72508d459b
Use heat map on views column in topic lists
2013-04-23 15:06:13 -04:00
06e5083950
Dashboard links to list of admins and moderators; Move a bunch of ember routes into one file: admin_users_list_routes.js
2013-04-23 12:07:58 -04:00
fe1b979c65
Admin Dashboard: click numbers in Users per Trust Level table to see a list of the users
2013-04-23 10:41:40 -04:00
726c28d776
Merge pull request #754 from slainer68/rack-cors
...
Implements support for rack-cors for API JavaScript access in the end-user browser
2013-04-22 20:11:09 -07:00
1c41d46fa3
improve new user welcome message a bit
2013-04-22 16:42:39 -07:00
7257d65082
Add warning to dashboard if using default logo or favicon
2013-04-22 15:38:48 -04:00
439877bdb9
Show a warning if there are email jobs in the retry queue
2013-04-22 13:37:16 -04:00
ae487e740c
Add a dashboard warning when sidekiq queue has more than 100 jobs
2013-04-22 13:02:24 -04:00
467c76b2c0
Implements support for rack-cors for API JavaScript access in end-user browser
2013-04-22 11:16:58 +02:00
cfc62dadff
speed up tests
...
add the ability to find the first notify private message
2013-04-22 17:45:03 +10:00
c04013c89b
Updates to Dutch translation
2013-04-21 10:59:38 +02:00
e661871aea
Merge pull request #744 from ypxu/localized-help
...
update locales on client for zh_CN and zh_TW
2013-04-20 22:18:53 -07:00
14432e5a1a
Merge pull request #745 from kubabrecka/cs_update38
...
cs translation update
2013-04-20 22:18:18 -07:00
3743287f12
keep French l10n up to date
2013-04-20 23:14:02 +02:00
ff18d287ab
cs translation update
2013-04-20 18:28:17 +02:00
b2b9320706
update locales on client for zh_CN and zh_TW
2013-04-20 08:39:55 -07:00
1d341b8ca5
drop "Admin" from "Admin Dashboard"
2013-04-19 22:37:02 -07:00
024791a80e
simplify admin user view a tad
2013-04-19 22:34:11 -07:00
8c8784abb6
simplify user profile layout, bold labels
2013-04-19 15:06:35 -07:00
d44b73c17a
I said constructive criticism, YOU DOUBLE HITLERS
2013-04-19 12:24:22 -07:00
0739e13cb0
copyedits on new user JIT education panel
2013-04-19 12:21:51 -07:00
d3bde70677
better flag post action description
2013-04-19 11:15:56 -07:00
6ae212235c
move persona a bit, still should be yanked out further
2013-04-19 10:34:39 +10:00
4cea92c4e9
work in progress add support for groups
2013-04-19 10:34:39 +10:00
a6170db443
change text to notify when you are notifying in the flag dialog
2013-04-19 10:34:06 +10:00
002951fc31
cs translation update
2013-04-18 23:06:03 +02:00
5cd6c85e8b
Add bookmarks and favorites to dashboard stats
2013-04-18 14:27:22 -04:00
5e643b5d49
Merge pull request #733 from sanderdatema/dutch_translation
...
Updated Dutch translation
2013-04-18 09:30:04 -07:00
c07942763a
Merge pull request #734 from kubabrecka/extract_title1
...
extracting one more hardcoded title
2013-04-18 09:29:30 -07:00
4cec82f416
Merge pull request #731 from kubabrecka/extract_titles
...
extracting some hardcoded title="..." strings
2013-04-18 09:29:03 -07:00
16efcbb4f0
Merge pull request #730 from kubabrecka/cs_update35
...
cs translation update server side
2013-04-18 09:25:10 -07:00
fa6a2a110f
Merge pull request #729 from kubabrecka/cs_update34
...
cs translation update client side
2013-04-18 09:24:55 -07:00
12fe659b96
Merge pull request #728 from ypxu/localize-help
...
localize composer toggler help text for zh_CN and zh_TW
2013-04-18 09:24:29 -07:00
d355e42d73
move i18n of UserActions to JS-side and make sentences translatable (take 3)
2013-04-18 12:08:13 +02:00
38ea6cff62
extracting one more hardcoded title
2013-04-18 11:24:47 +02:00
935c478484
Updated Dutch translation
...
Both server and client side, except for TOS.
2013-04-18 10:58:20 +02:00
2901b5bbef
extracting some hardcoded title="..." strings
2013-04-18 10:42:29 +02:00
b8bbf7d3fa
cs translation update
2013-04-18 10:13:00 +02:00
bc4144c82b
cs translation update
2013-04-18 10:03:10 +02:00
c48aa487e3
localize composer toggler help text for zh_CN and zh_TW
2013-04-18 02:44:59 -04:00
8367951000
sprockets upgrade
...
stop bundling all js files in dev, replace with turbo boosted serving of assets
2013-04-18 16:33:25 +10:00
474080a414
localize composer toggler help text
2013-04-17 23:14:58 -07:00
107e774de8
simplify composer body placeholder text
2013-04-17 23:10:34 -07:00
b64a4100fa
change "visitor" trust level to "new user"
...
I blame me for this mistake.. visitor means other stuff in practice. New
User is correct meaning.
2013-04-17 16:11:24 -07:00
3325c476f8
improve flag description to reflect notifications
2013-04-17 15:50:21 -07:00
b81da5ee66
Merge pull request #722 from ZogStriP/keep-french-l10n-up-to-date
...
keep French l10n up to date
2013-04-17 01:10:28 -07:00
7c1eb16aec
keep French l10n up to date
2013-04-17 02:29:37 +02:00
e671cf906c
make one text for latest changes widget + taller
2013-04-16 16:35:28 -07:00
9a7019e44f
Add some icons to admin dashboard
2013-04-16 18:38:14 -04:00
72be25c30a
improve invite users action button
2013-04-16 14:53:06 -07:00
77461cf1f7
improve category edit button copy
2013-04-16 14:25:36 -07:00
3b6aeb14c7
Add subtype to topics to classify private messages
2013-04-16 16:56:18 -04:00
2b5a2b5fce
Add a refresh button to problems on dashboard, so you can check for problems again
2013-04-16 12:09:37 -04:00
8e9b34d6cd
remove "sent you a PM' text from the notify area
2013-04-15 17:38:39 -07:00
bb586ec1a9
indicate use_ssl not implemented, experimental
2013-04-15 13:56:16 -07:00
fb010727d1
user != person
2013-04-15 01:20:30 -07:00
420bd37268
copyedits on notify flag options
2013-04-15 01:09:38 -07:00
e98ee42473
new ignore in jshint
2013-04-15 15:21:00 +10:00
481a224ff9
Small edits to Dutch translation (client side) to make it sound more natural
2013-04-14 22:23:30 +02:00
7965dadf7a
Updated Dutch translation (client side) to latest Discourse version
2013-04-14 21:28:41 +02:00
35971506fd
Updated Dutch translation (client side) to latest Discourse version
2013-04-14 20:48:16 +02:00
2af902f4d1
Merge branch 'master' of https://github.com/discourse/discourse into dutch_translation
2013-04-14 20:46:00 +02:00
f47f880f8b
Updated Dutch translation (client side) to latest Discourse version
2013-04-14 20:44:59 +02:00
a1d7f24240
improve "override default" text in customize
2013-04-14 11:22:25 -07:00
c4a0cf6517
Merge pull request #707 from tangramor/master
...
Update the zh_CN and zh_TW translations to the latest en.yml
2013-04-13 09:35:02 -07:00
344a744f3a
Updated zh_CN & zh_TW translations to the latest en.yml
2013-04-13 10:51:54 +08:00
efa9117f21
keep French l10n up to date
2013-04-13 02:16:02 +02:00
13adbf6f72
Merge pull request #702 from ZogStriP/keep-french-l10n-up-to-date-2013-04-11
...
keep French l10n up to date
2013-04-12 16:06:18 -07:00
48d5cb02c2
Add email as a sharing option
2013-04-12 18:06:36 -04:00
651cfba93f
Add ability to destroy a user with 0 posts
2013-04-12 16:53:00 -04:00
8014d7fd25
correct rack::cache so it always punches through users with auth cookies
2013-04-12 21:59:52 +10:00
e969eb14e8
added 2 new flag types: notify user and notify moderators
...
fixed up messed up user navigation
refactored
2013-04-12 17:55:45 +10:00
ed790384b0
keep French l10n up to date
2013-04-12 00:07:14 +02:00
04ca4077a7
Merge pull request #697 from kubabrecka/quote_post_fix
...
fix title of "quote post" button
2013-04-11 10:59:42 -07:00
7b76447e5e
Change edit category modal submit button text to Save Category
2013-04-11 10:50:25 -04:00
92e15ff4ef
comment re cdn
2013-04-11 20:49:47 +10:00
850b042cab
introduce rack:cache as a default, so users don't need to configure apache or nginx
...
under rack cache we are able to serve 620reqs a second per thin (on my machine) before it 12 (on my machine)
reorganised so mini profilers can be cleanly disabled from config file
added caching for categories index
move production.rb to production.sample.rb
2013-04-11 16:24:21 +10:00
5f30ea7463
Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles
...
auto replace rules in titles
2013-04-10 21:12:20 -07:00
11886e3e33
fix title of "quote post" button
2013-04-10 20:32:28 +02:00
312c42ae98
Merge pull request #690 from kubabrecka/update_cs32
...
cs translation update
2013-04-10 11:02:26 -07:00
fec86c624b
Merge pull request #693 from ZogStriP/keep-french-l10n-up-to-date-2013-04-10
...
keep French l10n up to date
2013-04-10 09:47:02 -07:00
5d46478e38
Add UI to delete an empty category
2013-04-10 12:08:23 -04:00
a7bdbd863e
keep French l10n up to date
2013-04-10 15:48:59 +02:00
1ca1b03109
cs translation update
2013-04-10 15:02:32 +02:00
c5cf8be864
auto replace rules in titles
2013-04-10 11:00:50 +02:00
e605e52181
localization
2013-04-10 15:55:33 +10:00
249fa42fd2
better description for title_fancy_entities
2013-04-09 21:15:48 -07:00
1ce7a40084
Revert "Merge pull request #677 from kubabrecka/localization_user_actions2"
...
This reverts commit c3a426930b9f9072bd9d
2013-04-09 12:33:32 -04:00
c3a426930b
Merge pull request #677 from kubabrecka/localization_user_actions2
...
move i18n of UserActions to JS-side and make sentences translatable
2013-04-09 09:25:28 -07:00
9f9072bd9d
Merge pull request #673 from windyson2008/patch-2
...
Update server.zh_CN.yml
2013-04-09 09:22:59 -07:00
bc75663e7b
Merge pull request #680 from kubabrecka/cs_update31
...
cs translation update
2013-04-09 06:29:19 -07:00
a2967dbf6b
keep French l10n up to date
2013-04-09 14:51:40 +02:00
9e796e8acf
cs translation update
2013-04-09 11:10:28 +02:00
93f36cdf93
Show which category colors have already been used when creating/editing a category
2013-04-08 18:33:51 -04:00
1b73ab614e
Merge pull request #674 from kubabrecka/cs_update30
...
cs translation update
2013-04-08 15:17:01 -07:00
2f14ef4a68
Merge pull request #675 from kubabrecka/en_tos_typofix
...
English TOS typos
2013-04-08 15:16:02 -07:00
8d927418e8
move i18n of UserActions to JS-side and make sentences translatable
2013-04-08 22:54:08 +02:00
75aeb9550f
Convert a bunch of callbacks to promises
2013-04-08 16:51:03 -04:00
b42570b61d
English TOS typos
2013-04-08 22:31:44 +02:00
9ee01948c3
cs translation update
2013-04-08 22:28:10 +02:00
21d3c96fca
Updated swedish translations.
2013-04-08 11:03:55 +02:00
12a20f6547
Update server.zh_CN.yml
...
1.Add tag
2.Fix transtration
2013-04-08 11:22:51 +09:00
41b7f741d0
extract hard-coded strings
2013-04-07 18:14:50 +02:00
ade4dd32de
Merge pull request #665 from ZogStriP/keep-french-l10n-up-to-date-2013-04-05
...
keep French l10n up to date
2013-04-06 07:30:15 -07:00
0d26c819a0
better post quote description
...
blockquote? seriously?
2013-04-06 03:13:24 -07:00
b75454219f
improve the category definition default copy
2013-04-06 00:52:21 -07:00
1793f3e3bb
keep French l10n up to date
2013-04-05 23:17:57 +02:00
72b4f41254
Can change TOS content via site content editor
2013-04-05 15:21:55 -04:00
c41bdc8752
Merge pull request #662 from kubabrecka/en_typos
...
fix some typos in English strings
2013-04-05 08:20:52 -07:00
6dff266930
cs translation update
2013-04-05 11:31:43 +02:00
Robin Ward
Sam
Anton Batenev
Jeff Atwood
Régis Hanol
Neil Lalonde
Naiqus
Michael Kessler
Sander Datema
Chris Hunt
Michael Brown
Juan de Dios Herrero
Ian Christian Myers
Jeff Atwood
Erlend Sogge Heggen
Erik Ordway
Kuba Brecka
Matt Van Horn
tangramor
Tower He
Joe Bew
John Joseph Bachir
Zach Latta
David Celis
slainer68
Kushal
Yingpeng Xu
Jonas Stendahl
windyson2008