Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,927 Commits 243 Branches 500 Tags 896 MiB
Commit Graph

4927 Commits

Author SHA1 Message Date
Robin Ward 20cba4e092 Never bind the poster expansion twice. 2013-10-10 15:18:38 -04:00
Robin Ward c3c06ae8ea Merge pull request #1518 from velesin/preload_store_context_refactoring 
removes redundant context binding
 2013-10-10 10:25:17 -07:00
Wojciech Zawistowski 107932576e removes redundant context binding 2013-10-10 18:33:24 +02:00
Robin Ward 5d329cff3a Merge pull request #1517 from nverba/patch-1 
Fix broken markdown formatting.
 2013-10-10 09:08:19 -07:00
Robin Ward ea9398467b For @Sam - hide the poster expansion if you click on the avatar of the user who's expanded 2013-10-10 12:03:52 -04:00
Régis Hanol ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
Neil Lalonde c3fd79d61c Fix rendering of muted topic button 2013-10-10 11:26:20 -04:00
nverba 598d14580c Fix broken markdown formatting. 2013-10-10 13:41:00 +01:00
Régis Hanol f244650832 update images:pull_hotlinked rake task to add support for the markdown reference link style 2013-10-10 11:57:36 +02:00
Régis Hanol be6dd2c71f Merge pull request #1515 from davguij/master 
Changed the client Spanish translation
 2013-10-10 01:30:16 -07:00
Sam b0465c517e (experimental) added framework for filtering all sorts of internals in discourse and consuming by plugins 2013-10-10 18:45:40 +11:00
David Guijarro 2e97677136 Changed the client Spanish translation 
As per my previous pull request.
 2013-10-10 07:36:25 +02:00
Sam 8afff108bf css.scss makes rails 4 sad 2013-10-10 15:23:14 +11:00
Sam b490fd2f88 Merge pull request #1513 from velesin/computed_self_refactoring 
refactors Discourse.Computed to bind context to self
 2013-10-09 21:16:19 -07:00
Sam 90bc3323e1 Merge pull request #1505 from crohr/debian-packaging-with-pkgr 
Debian packaging with pkgr
 2013-10-09 21:14:58 -07:00
Sam 97dfe97d5b work around startup issue 2013-10-10 14:23:24 +11:00
Sam 28a0cb494a rails 4 upgrade 
rack lock is trouble, nuke it out of orbit
more aggressive suicide for forked sidekiq
 2013-10-10 14:23:24 +11:00
Sam c4bab8915c fix initialization issues with unicorn 
amend unicorn script to demonize sidekiq
create a sidekiq demon that unicorn consumes
correct bug in exec_sql with empty params
 2013-10-10 14:23:24 +11:00
Régis Hanol 15de4ac890 add a rake task to pull hotlinked images 2013-10-10 04:04:08 +02:00
Sam 2a948c52a9 this setting needs to be pushed up to 15 so we will be able to nuke new spammer accounts 
it is set to max_topics_in_first_day + max_replies_in_first_day
 2013-10-10 10:45:27 +11:00
Sam ad2ed5fe51 rate limits for topics and posts on first day 
max_topics_in_first_day and max_replies_in_first_day
 2013-10-10 10:32:03 +11:00
Neil Lalonde ecc7ba4be6 Improve the wording of the spam_post_blocked notification 2013-10-09 16:17:26 -04:00
Neil Lalonde 43fc772a53 Merge pull request #1514 from cfstras/youtube-https 
YoutubeOnebox: FIX HTTP-specific URLs
 2013-10-09 12:33:49 -07:00
Claus Strasburger 109c10c883 YoutubeOnebox: FIX HTTP-specific URLs 
by replacing with protocol-agnostic URLs.
This fixes the mixed-content warning for secure instances of discourse, at least for Youtube
 2013-10-09 20:43:59 +02:00
Rafael George ff4169a9ed Merge branch 'refactor-topic-invite-by-email' of github.com:cored/discourse into refactor-topic-invite-by-email 2013-10-09 13:55:40 -04:00
Rafael George 3a1e1e046b Refactor: Topic#invite_by_email 
Extract Topic#email_already_existas_for? and Topic#grant_permission_to_user
Fix failing spec due to missing variable in extracted method
 2013-10-09 13:55:02 -04:00
Régis Hanol c48030f1ef Merge pull request #1508 from abbat/master 
Russian translation (actual version)
 2013-10-09 09:44:08 -07:00
Régis Hanol 3854c2d24f Merge pull request #1510 from velesin/model_refactoring 
refactors Discourse.Model
 2013-10-09 09:26:15 -07:00
Wojciech Zawistowski 708a55cb38 refactors Discourse.Computed to bind context to self 2013-10-09 18:24:33 +02:00
Régis Hanol 9eb0644983 Merge pull request #1511 from velesin/site_self_refactoring 
removes unused context binding from Discourse.Site
 2013-10-09 09:11:51 -07:00
Anton Batenev 75df60c600 Russian translation (actual version) 
Fix YML numeric keys
 2013-10-09 20:07:50 +04:00
Wojciech Zawistowski 41a4f15d62 removes unused context binding from Discourse.Site 2013-10-09 18:06:48 +02:00
Wojciech Zawistowski 56a519c583 refactors Discourse.Model to bind context to self plus some minor clean-ups 2013-10-09 18:00:55 +02:00
Neil Lalonde acca220380 Allow Youtube onebox with start time. All params are used in the youtube onebox now. 2013-10-09 11:40:10 -04:00
Neil Lalonde 4a0b17bb16 Pressing enter in username field of login form will submit the form 2013-10-09 11:07:42 -04:00
Anton Batenev 7d6b93b660 Russian translation (actual version) 
* Migrating from crowdin to transifex translation service (free & less bugs)
 * Reformats YML as transifex service do
 2013-10-09 18:30:38 +04:00
Neil Lalonde 24598c80af Improve login modal on mobile 2013-10-09 10:16:22 -04:00
Sam 939a452293 require dependency was leading to errors in dev 2013-10-09 17:22:41 +11:00
Sam 7993845bfa add current_user_provider so people can override current_user bevior cleanly, see 
http://meta.discourse.org/t/amending-current-user-logic-in-discourse/10278
 2013-10-09 15:11:54 +11:00
Robin Ward 8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04:00
Neil Lalonde bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Neil Lalonde 32af23884e FIX: category validation in composer was still using categoryName instead of categoryId 2013-10-08 14:41:20 -04:00
Régis Hanol 94d68d2453 more vertical space in the upload selector dialog 2013-10-08 19:48:27 +02:00
Régis Hanol 2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Robin Ward 0bda906da4 Merge pull request #1494 from ScotterC/present-user-name 
Presenting name for user stream description
 2013-10-08 08:42:59 -07:00
Scott Carleton 256d82b916 Present Name for stream description 2013-10-08 11:40:16 -04:00
Robin Ward 50c74237cb Supress full name in expansion if it's the same as the username 2013-10-08 11:28:32 -04:00
Robin Ward e7935d4263 Merge pull request #1501 from velesin/debounce_promise_tests 
adds unit tests for Discourse.debouncePromise
 2013-10-08 07:56:07 -07:00
Cyril Rohr a7b8481c8f Allow to set SMTP settings via environment variable. 2013-10-08 15:48:57 +01:00
Robin Ward 158ff76e71 Merge pull request #1469 from kewubenduben/patch-1 
Minor fixes
 2013-10-08 07:46:07 -07:00