codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3900 commits 7 branches 179 tags 87 MiB
Commit graph

1105 commits

Author SHA1 Message Date
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
Anton Batenev
5281ba5af3 Russian translation (actual version) 2013-07-01 11:14:19 +04:00
Régis Hanol
6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Neil Lalonde
c1a39b5a30 Show date with year in message to banned users who try to log in 2013-06-30 12:49:34 -04:00
Neil Lalonde
dca216ed54 Be a bit more clear in the forgot password message 2013-06-28 18:14:16 -04:00
Robin Ward
2deaf8ef98 Custom Wordpress Serializer and Path, with Specs 2013-06-28 13:56:13 -04:00
Neil Lalonde
2d6118297d Changes to tiny date format to remove mon and show short format dates instead 2013-06-28 13:10:04 -04:00
Neil Lalonde
3c9cdead49 Update title on bookmark button of the last post you read 2013-06-28 13:10:04 -04:00
ThomasHarper
0382ec319e Update client.fr.yml 2013-06-28 16:38:10 +02:00
Robin Ward
4711c75e53 Merge pull request #1103 from royguo/patch-1 
Update server.zh_CN.yml
 2013-06-28 07:21:50 -07:00
Robin Ward
251d169c0d Merge pull request #1104 from ThomasHarper/patch-5 
Update client.fr.yml
 2013-06-28 07:21:10 -07:00
ThomasHarper
71464c0c31 Update client.fr.yml 
dynamic_favion added
 2013-06-28 16:04:20 +02:00
ThomasHarper
80e886bfde Update client.fr.yml 
Adding few translations again
 2013-06-28 15:58:19 +02:00
ThomasHarper
a94947f5b0 Update client.fr.yml 
Adding missing fr translation
 2013-06-28 15:25:05 +02:00
Roy Guo
4034cde6aa Update server.zh_CN.yml 
num_clicks : "点击数"
 2013-06-28 09:54:37 +08:00
Jeff Atwood
40c9014634 make flag reply reply-ier 2013-06-27 16:01:48 -07:00
Neil Lalonde
5d6ad8f39c Show a useful message when a banned user tries to log in 2013-06-27 15:14:42 -04:00
Robin Ward
bf96c8ad01 Support for Custom FAQ content 2013-06-27 12:50:24 -04:00
Robin Ward
d13166fa17 Merge pull request #1095 from Mikulas/typo-translation-czech 
Minor typo fix in czech translation
 2013-06-27 07:08:57 -07:00
Sam
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
Jeff Atwood
5d1f5505af "private topics" doesn't need to say "count" 2013-06-26 21:26:51 -07:00
Régis Hanol
72745d257d provide a way to give a default filename to pasted images in the lightbox overlay 2013-06-26 21:54:08 +02:00
Mikulas
6819cd2886 minor typo fix in czech translation 
grammar source: http://www.proofreading.cz/\?p\=377
 2013-06-26 20:10:50 +02:00
Robin Ward
89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Neil Lalonde
196a8f4ba5 Add dashboard warnings for system_username and notification_email site settings 2013-06-26 10:57:04 -04:00
Jeff Atwood
e4f1255cde copy improvement on account approval 2013-06-26 01:17:27 -07:00
Jeff Atwood
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
Neil Lalonde
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
Neil Lalonde
a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Jeff Atwood
87db582297 minor copyedit on "20 to go.." 2013-06-25 10:36:46 -07:00
Jeff Atwood
a9f4fa4927 copyedits on reply via email 2013-06-25 10:07:27 -07:00
Robin Ward
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
Robin Ward
3fc69337d3 Enable reply by email for all users, display a message in the footer indicating so. 2013-06-25 11:27:17 -04:00
Neil Lalonde
c79ab3fc2e Change modal that asks which topic you want to reply in; upgrade bootbox.js 2013-06-24 15:01:07 -04:00
ThomasHarper
7e9d942060 Update server.fr.yml 
Adding quotes and few things missing
 2013-06-24 15:41:24 +02:00
Robin Ward
bad7707cf3 Merge pull request #1082 from ThomasHarper/patch-2 
Update client.fr.yml
 2013-06-24 06:28:51 -07:00
Robin Ward
4b638a0fea Merge pull request #1083 from ThomasHarper/patch-3 
Update client.fr.yml
 2013-06-24 06:27:59 -07:00
Anton Batenev
fe51fd87cc Russian translation (actual version) 2013-06-24 15:55:44 +04:00
ThomasHarper
b8960f26c9 Update client.fr.yml 
Dates were missing and few stuff on back end
 2013-06-24 12:43:02 +03:00
ThomasHarper
fadab25609 Update client.fr.yml 
Missing quote
 2013-06-24 12:01:42 +03:00
Erlend Sogge Heggen
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
Robin Ward
601c35fc58 Merge pull request #1067 from adkron/feature/supress_to_suppress 
Correct spelling of suppress
 2013-06-21 07:08:12 -07:00
Jeff Atwood
a9c251e71a restructure /admin/flags rows a bit 2013-06-21 00:29:54 -07:00
Amos L King
777e8c2012 Correct spelling of suppress 
supress => suppress

Amos King @adkron <amos.l.king@gmail.com>
 2013-06-20 23:44:27 -05:00
Michael Brown
836ebbaa8e Comment out example anti-hotlinking rules 2013-06-20 22:49:04 -04:00
Jeff Atwood
3775a9c11d shorter copy to fit on /admin better 2013-06-20 11:51:24 -07:00
Robin Ward
4cd71972be Cleaned up QUnit test structure 2013-06-20 13:58:54 -04:00
Robin Ward
2e7c5a674c Merge pull request #1049 from ZogStriP/admin-alerts 
Admin alerts
 2013-06-20 07:51:40 -07:00
Sam
14db3869ba Merge pull request #1050 from abbat/master 
Russian translation (actual version)
 2013-06-20 01:17:53 -07:00
Sam
08df4c41cc Merge branch 'master' of github.com:discourse/discourse 2013-06-20 17:42:29 +10:00
Sam
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
Anton Batenev
f1a1b8ca11 Russian translation (actual version) 2013-06-20 03:44:07 +04:00
Jeff Atwood
f1fd29003d switch medium time format to "mins" vs "minutes" 2013-06-19 16:09:57 -07:00
Robin Ward
8c4aac7f94 Migrate all jasmine specs to Qunit. Removed Jasmine. 2013-06-19 18:18:35 -04:00
Régis Hanol
8a26b86739 added image magick alert 2013-06-19 22:36:56 +02:00
Régis Hanol
9036738ba2 added s3 file uploads alert 2013-06-19 22:11:11 +02:00
Robin Ward
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
Neil Lalonde
c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Robin Ward
04998a6687 FIX: Referenced job incorrectly in clockwork 2013-06-18 10:05:15 -04:00
Jeff Atwood
34daa34bc1 Merge pull request #1042 from Supermathie/sysadmin-docs 
Sysadmin docs
 2013-06-18 00:49:12 -07:00
Sam
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
Michael Brown
b0d676f2f2 fixes in logrotate.conf 2013-06-18 03:04:01 -04:00
Michael Brown
70be638f47 Update sample bluepill config and install docs 2013-06-18 02:28:30 -04:00
Sam
2eb1cc220c posts should be post 2013-06-18 11:24:36 +10:00
Sam
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
Robin Ward
4a9499c9f4 FIX: Trailing paren missing. Thanks Régis! 2013-06-17 17:15:11 -04:00
Robin Ward
8acdc18bc8 First stab at polling support for POP3S / reply by email 2013-06-17 16:49:02 -04:00
Sam
a15ab2a0a6 flag type summary 2013-06-17 17:15:56 +10:00
Sam
8c7519df86 missing pluralization 2013-06-17 15:37:46 +10:00