Jeff Atwood
957d7a31dd
clarify queue_jobs is developer only
2013-07-15 23:12:27 -07:00
Sam
ecf17cfebb
work in progress, add fidelity to category group permissions (full, create posts, readonly)
2013-07-16 15:46:11 +10:00
Régis Hanol
5ce05ff5cb
adds the max_attachment_size_kb setting
...
so that we can specify a different max upload size for attachments and images.
2013-07-16 02:01:36 +02:00
premprakash
8c5e0e7550
Adding Portuguese-Brazil language
2013-07-15 14:45:16 -03:00
Kuba Brecka
e2a2bddd60
cs translation update
2013-07-15 16:40:39 +02:00
Robin Ward
ed60f24502
Merge pull request #1194 from ZogStriP/uploads
...
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
Robin Ward
2bba939d9f
Merge pull request #1196 from abbat/master
...
Russian translation (actual version)
2013-07-15 07:04:27 -07:00
Anton Batenev
fb00418f7a
Russian translation (actual version)
2013-07-15 15:45:51 +04:00
Sam
25bcd6007c
Update client.nb_NO.yml
...
broken yaml
2013-07-15 21:26:28 +10:00
Sam
bf06be3260
Merge pull request #1189 from erlend-sh/patch-4
...
Update client.nb_NO.yml
2013-07-15 03:14:22 -07:00
Sam
16976a2092
Merge pull request #1192 from cfstras/locale
...
Locales: updated German locale, mainly the admin section
2013-07-15 03:08:33 -07:00
Sam
86e5c9afc2
Merge pull request #1193 from jbruni/master
...
Tiny typo fix (comment at nginx.sample.conf)
2013-07-15 00:58:09 -07:00
Jeff Atwood
906d1bc7c8
improve copy on daily action limit
2013-07-14 23:11:10 -07:00
Jeff Atwood
f46b619547
simplify copy around merge and split
2013-07-14 22:24:59 -07:00
Régis Hanol
36e6345eee
change the icon in the composer toolbar with a more generic upload icon
...
also changed all references to "images uploads" to a "uploads"
2013-07-14 23:44:50 +02:00
Claus Strasburger
f92075f360
Locale german: got another one
2013-07-14 20:37:40 +02:00
Claus Strasburger
1d4abbe1fd
Locales: updated German locale, admin content like the admin section and flagging
2013-07-14 20:11:07 +02:00
Erlend Sogge Heggen
542408550c
v1 Complete translation for client.nb_NO.yml
...
All strings now have a first-take translation. Might have missed some due to the inconsistent use of double quotes, single quotes and no quotes (we're still good!).
I'm not entirely sure what happens when I apply edits to a still pending-for-pull patch; sorry if I goofed.
2013-07-14 14:16:17 +02:00
Régis Hanol
3397c2235f
display the size of the attachment in the preview
...
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
J Bruni
a42ed5d831
Fixed typo at nginx.sample.conf
2013-07-14 01:06:59 -03:00
Erlend Sogge Heggen
ac9cfe32f9
Update client.nb_NO.yml
...
Moar translations. Also jumped back and fixed what I could find of the ones with missing double quotes.
2013-07-13 20:47:11 +02:00
Robin Ward
6ca5df0a09
Can recover deleted topics. Deleted topics show the first post as deleted in the UI.
2013-07-12 12:09:17 -04:00
Sam
f05bc44fbe
Merge pull request #1182 from sanderdatema/dutch_translation
...
Dutch translation updated
2013-07-11 19:59:08 -07:00
Sam
00c6bffc61
Merge pull request #1183 from erlend-sh/patch-3
...
Update client.nb_NO.yml
2013-07-11 19:58:29 -07:00
Robin Ward
19c169540c
Staff can enter and view deleted topics
2013-07-11 16:39:35 -04:00
Erlend Sogge Heggen
1976c622dc
Update client.nb_NO.yml
2013-07-11 16:54:51 +02:00
Sander Datema
d4bc6f977b
Dutch translation updated
2013-07-11 16:54:46 +02:00
Robin Ward
7fd8bb75d9
Merge pull request #1177 from ZogStriP/attachments
...
Attachments
2013-07-11 06:49:20 -07:00
Roy Guo
994f3d4ad5
Update client.zh_CN.yml
...
banned: "禁止参与讨论" # can't create or reply topics
blocked: "禁止登陆" # can't login
2013-07-11 11:47:17 +08:00
Régis Hanol
6beb12e778
update nginx.sample.conf to take attachmetns into account
2013-07-10 22:59:54 +02:00
Robin Ward
8ffe9e28d6
Shows who deleted a post
2013-07-10 16:22:49 -04:00
Neil Lalonde
0e3e5bf533
Add relative_date_duration site setting
2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb
Merge pull request #1157 from abbat/email-custom-headers
...
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
Robin Ward
68c86931e4
Merge pull request #1169 from phanimahesh/patch-1
...
Prevent errors in case #{rails_root}/tmp does not exist
2013-07-10 07:11:59 -07:00
Robin Ward
4eb5f99103
Merge pull request #1173 from nterray/translate_reply_subject
...
French translation of user_replied/posted subject
2013-07-10 07:11:16 -07:00
Sam
7ccfc40389
TODO comment
2013-07-10 16:35:18 +10:00
Sam
8367326e76
glyphs on the user stream, rename responses to replies
2013-07-10 16:35:06 +10:00
Nicolas Terray
19c5894874
French translation of user_replied/posted subject
...
This is a follow-up of the commit 013ad0fdd
2013-07-10 00:30:53 +02:00
Neil Lalonde
4c0fe3bc12
Add a BIG WARNING to queue_jobs site setting
2013-07-09 15:34:51 -04:00
Neil Lalonde
3c38062802
Check for updates: edge cases when the message on the dashboard doesn't make sense.
2013-07-09 14:01:08 -04:00
J Phani Mahesh
b1fcd523c6
Use FuleUtils.mkdir_p for cleaner code
2013-07-09 22:26:27 +05:30
Anton Batenev
ed1fb847ed
Russian translation (actual version)
2013-07-09 18:26:59 +04:00
Robin Ward
5cda0e556c
Merge pull request #1111 from jamesaanderson/flash-video-onebox
...
Add flash video onebox support
2013-07-09 06:55:56 -07:00
J Phani Mahesh
4fe6bee83c
Prevent errors in case #{rails_root}/tmp does not exist
...
Dir.mkdir is not recursive. i.e - It doesn't do the equivalent of `mkdir -p` but just plain `mkdir`.
And that is a problem if #{rails_root}/tmp is missing. More here.
http://meta.discourse.org/t/keep-getting-the-same-error-every-start/8214
2013-07-09 17:46:54 +05:30
Jeff Atwood
2c314e275e
improve new category copy a bit
2013-07-09 00:49:38 -07:00
Jeff Atwood
853fcb9b88
improve best of copy slightly
2013-07-08 23:39:22 -07:00
Sam
21bfb64a28
added EMBED_CLOCKWORK so users can embed clockwork scheduling inside another process
2013-07-09 11:01:51 +10:00
Neil Lalonde
ad096ac2b7
More nav links on admin users list page
2013-07-08 12:44:14 -04:00
Neil Lalonde
9b0f63627b
Add blocked users count to dashboard
2013-07-08 12:44:13 -04:00
Robin Ward
013ad0fdda
Added In-Reply-To and References email headers. Additionally removed username from
...
email replies and new posts to keep the subjects collapsable.
2013-07-08 11:48:40 -04:00
James A. Anderson & Jalil Mohammed
d51a3cf50f
Add flash video onebox as disabled setting by default
2013-07-08 06:37:44 -07:00
Jeff Atwood
4ddd50fe17
add "new" to PM title there for clarity
2013-07-08 00:01:24 -07:00
Jeff Atwood
7bf798891b
better new user block PM copy
2013-07-07 23:58:07 -07:00
Sam
f42fc3be37
Merge pull request #1150 from mcwumbly/topic-likes
...
little tweaks to like counts in topic list view
2013-07-07 23:39:38 -07:00
Sam
3dbb4ff9bc
Reorder filters on user page and name them better (All, Topics, Posts, Responses)
2013-07-08 12:12:06 +10:00
Sam
5086f48784
reloading classes is just trouble in test, lets not do that so spork is squeaky clean and happy.
2013-07-08 12:10:47 +10:00
Sam
d79aa917f1
add option suppress_reply_directly_above to stop suppressing the reply directly above
...
added a bunch of debugging information to help diagnose weird positioning issues
2013-07-08 11:13:45 +10:00
Sam
c6c8246399
added sample unicorn config
...
added utility to measure real memory usage
don't require thin by default
2013-07-07 14:31:07 +10:00
Anton Batenev
4e04c4dddd
Add custom headers for email messages
...
See http://meta.discourse.org/t/custom-headers-in-emails-site-settings/7480
2013-07-07 04:37:44 +04:00
Robin Ward
337f393af5
Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting
...
removed auto_link_images_wider_than setting
2013-07-06 17:12:11 -07:00
Robin Ward
63f4519268
Merge pull request #1152 from abbat/patch-1
...
Fix Cyrillic transliteration map
2013-07-06 17:10:09 -07:00
Régis Hanol
45c227c81c
fix column name in admin email logs
2013-07-06 22:29:16 +02:00
Régis Hanol
6251935b1e
removed auto_link_images_wider_than setting
2013-07-06 22:19:16 +02:00
Anton Batenev
9999561b86
Fix Cyrillic transliteration map
...
Fix Cyrillic transliteration map for letters which hasn't ASCII equivalent
2013-07-06 18:38:01 +04:00
David McClure
a3eb175683
- like counts use number formatting (so 1100 is 1.1K like other counts)
...
- made 'likes' column wide enough to hold 3 digit and > 999 likes
2013-07-06 00:07:10 -07:00
Neil Lalonde
25d2cbc33f
Merge branch 'master' of github.com:discourse/discourse
2013-07-05 16:52:27 -04:00
Neil Lalonde
1c0e0da683
Add rss feed for latest and hot
2013-07-05 16:49:06 -04:00
Robin Ward
6cd6484b5e
New mode for Wordpress: Filter ONLY posts liked by moderators
2013-07-05 16:07:24 -04:00
Robin Ward
7335f5fb7f
Merge pull request #1145 from abbat/yandex-workaround
...
Workaround solution to help Yandex crawler index discourse.
2013-07-05 10:04:40 -07:00
Neil Lalonde
84ce04dfa5
Use POST for send_activation_email action
2013-07-05 12:26:46 -04:00
Neil Lalonde
a0f07f8914
Show the error message when send activation email fails from admin
2013-07-05 11:50:43 -04:00
Neil Lalonde
ceee8ed63b
Put back mailcatcher config in development.rb
2013-07-05 11:32:54 -04:00
Anton Batenev
694a6f4970
Fix recommendations from #1145
2013-07-05 15:59:39 +04:00
Régis Hanol
7c82d6d4d0
FIX: new users are allowed to upload images to your servers
2013-07-05 00:44:18 +02:00
Régis Hanol
c42cb6ef48
add a comment in database.yml template files indicating that Sidekiq must be restarted after changes
2013-07-04 23:31:36 +02:00
Anton Batenev
af36d32f7f
Workaround solution to help Yandex crawler index discource.
...
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
2013-07-04 22:08:23 +04:00
Robin Ward
ea11286ab6
Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels
...
Feature: Admin can modify user trust levels
2013-07-04 06:57:59 -07:00
Sam
b83e3a3ffd
Merge pull request #1137 from kubabrecka/cs_update47
...
cs translation update
2013-07-03 23:29:05 -07:00
Sam
33a49607d6
Merge pull request #1138 from kubabrecka/en_yml_action_type_fix
...
remove localization duplicate - seems like a typo
2013-07-03 23:15:26 -07:00
Anton Batenev
89dcded3a7
i18n transliteration map from Russian Cyrillic to ASCII
...
i18n transliteration map from Russian Cyrillic to ASCII
(ISO-9:1995 / GOST 7.79-2000, table B) for pretty URLs (slug)
2013-07-04 01:17:01 +04:00
Kuba Brecka
f7e2b3be7f
remove localization duplicate - seems like a typo
2013-07-03 21:27:46 +02:00
Kuba Brecka
e58f9ef843
cs translation update
2013-07-03 21:22:41 +02:00
Robin Ward
f328804488
Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions
...
Conflicts:
app/models/site_setting.rb
2013-07-03 11:18:42 -04:00
Robin Ward
6364fc74ef
Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls
...
Conflicts:
app/services/spam_rules_enforcer.rb
2013-07-03 11:13:56 -04:00
Robin Ward
c12e87650d
Merge pull request #1130 from adrianlang/patch-1
...
Fix German translation of user_automatically blocked template
2013-07-03 08:06:15 -07:00
ThomasHarper
7ef5f0ac9b
Update server.fr.yml
2013-07-03 14:47:38 +02:00
ThomasHarper
4f10ea9880
Update server.fr.yml
...
Added few POPS3 translations and few things
2013-07-03 14:22:31 +02:00
ThomasHarper
67502d0c8e
Update server.fr.yml
...
added cas_domainname
2013-07-03 14:07:26 +02:00
ThomasHarper
64a00e284e
Update client.fr.yml
...
Missing capital on homepage
2013-07-03 11:43:52 +02:00
Navin
3da37506da
Back end - temporary boosting of trust levels
2013-07-03 10:30:40 +02:00
Adrian Lang
5ea2bce646
Fix German translation of user_automatically blocked template
...
Right now this bug prevents blocking with German locale.
2013-07-03 09:38:21 +02:00
Robin Ward
22e6b3f466
FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message.
2013-07-02 15:47:15 -04:00
Neil Lalonde
075ed1ab53
Refactor user blocking code; hide the Block button in admin
2013-07-02 14:42:53 -04:00
Robin Ward
5770879472
Refactor: Move Topic Details into better objects, identity map, tests, query string filters
2013-07-02 10:36:46 -04:00
merugear
f47effa154
Changed grammar on powered_by_html
2013-07-02 12:11:28 +02:00
Jeff Atwood
8057851cf5
"there are no more" is sufficient, drop "to read"
2013-07-01 23:29:49 -07:00
Sam
12f866a727
Merge pull request #1120 from abbat/master
...
Russian translation (actual version)
2013-07-01 22:44:30 -07:00
Sam
c3f64f99b3
fix up messed up routes
2013-07-02 15:21:26 +10:00
Sam
46c6949b6e
Merge pull request #1123 from stephankaag/rails4-new
...
Refactor routes in order to be compatible with Rails 4
2013-07-01 16:07:22 -07:00
Stephan Kaag
e39cc464b1
Refactor routes in order to be compatible with Rails 4
2013-07-01 20:00:06 +02:00
