Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,407 Commits 180 Branches 498 Tags 916 MiB
Commit Graph

1407 Commits

Author SHA1 Message Date
Robin Ward 6568b4aaa9 Better error messages when hitting max mentions/images/links 2013-03-25 12:27:09 -04:00
Neil Lalonde 95a939d6af Fail version_check job silently in development mode 2013-03-25 11:35:48 -04:00
Neil Lalonde 4fb3b58592 Remove the extra column from per_day_counts_report 2013-03-25 11:35:48 -04:00
Robin Ward 7c505df6d4 Merge branch 'update-sidekiq' of git://github.com/nverba/discourse 
Conflicts:
	config/initializers/sidekiq.rb
 2013-03-25 10:26:13 -04:00
Neil Lalonde 4fec7d26fa Merge pull request #550 from kubabrecka/memtotal_macos 
implement MemInfo.mem_total on Mac OS X
 2013-03-25 07:11:16 -07:00
Kuba Brecka 4c5a276a46 cs translation update 2013-03-25 15:07:38 +01:00
Robin Ward ef5da83366 Merge pull request #563 from tangramor/master 
Update the zh_CN and zh_TW translations to the latest en.yml
 2013-03-25 06:52:21 -07:00
tangramor a168ee25c7 Update zh_CN and zh_TW to current en.yml 2013-03-25 20:43:56 +08:00
Mikkel Hoegh 869df58461 Translated Discourse to Danish. 
Squashed commit of the following:

commit db81f4a15e5df5ceb64499aba077acd2f8aed192
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 23:10:25 2013 +0100

    All the user-facing server strings.

commit c7fdf0d4351664cd2a731556b99ecf7f05a09cde
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 22:43:53 2013 +0100

    Like -> Synes godt om.

commit 0f6ba13d65e31246a0a0a9a31707928a14d7220c
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 21:27:51 2013 +0100

    Lots of server strings.

commit d66af8246fb6bc9ccff51f97931f1375b07f2d85
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 19:48:53 2013 +0100

    Translated user facing strings (almost).

commit a84fcf6ff70d7c304c86263d7917207e505e77b1
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Thu Mar 21 22:15:20 2013 +0100

    Even more client strings.

commit ccfc0f7189fb979973b642bee9ec1440f7d39970
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:43:08 2013 +0100

    More client strings.

commit c3e21cab82d95ad5abe92e95ad99acf401cbe9ec
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:12:44 2013 +0100

    Translated a bunch of client strings.

commit 65aad7129b3d9c7df62213522b37e3a413df35de
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:09:28 2013 +0100

    Started work on Danish translation.
 2013-03-25 10:35:03 +01:00
Sam 5b312dd68c Merge pull request #562 from malachaifrazier/patch-2 
Update VAGRANT.md to include direct link to Guard Repo
 2013-03-24 22:35:25 -07:00
Malachai f9ae79bbb4 Update VAGRANT.md 
Updated to include direct link to Guard Repo
 2013-03-25 02:14:19 -03:00
Neil Lalonde 0784c3bbe9 Update DEVELOPER-ADVANCED.md 2013-03-24 23:49:40 -04:00
Sam 622568fd57 fix mp in prd 2013-03-24 20:36:55 -07:00
Sam f921d1c547 comment out dead code 
add some explanations
 2013-03-24 20:09:28 -07:00
Sam 42eb1fa775 update mp 2013-03-24 19:53:05 -07:00
Sam 67c438434b wow, this has been broken for OH so long, we need to segragate users correctly so MP results work as expected 2013-03-24 19:52:03 -07:00
Sam 6804c994f5 fix missing info error 2013-03-24 18:30:19 -07:00
Sam 3f0251dc63 get rid of metamorph 2013-03-24 18:13:03 -07:00
Sam 4cc1b88d91 Merge branch 'scroll_work' 2013-03-24 17:31:10 -07:00
Sam 988a712c77 correct multisite functionality for omniauth 2013-03-24 17:21:18 -07:00
Sam deb603f41c Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax 
Convert a lot of :a => b to a: b and bring peace to the world
 2013-03-24 16:43:17 -07:00
Karan Misra 5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
Sam 36a069488e Merge pull request #492 from sbauch/email-whitelist 
added email whitelist SiteSetting feature to replicate email blacklist S...
 2013-03-24 16:35:24 -07:00
Sam ca997721b1 Merge pull request #532 from kubabrecka/fix_duplicate_tokens 
fix duplicate auth_token in development database images
 2013-03-24 16:32:48 -07:00
Sam b1d1ab7d2b Merge pull request #559 from ZogStriP/fix-exception-when-wrong-resource-type-in-url 
[fixes #391] exception when wrong resource type in URL
 2013-03-24 16:16:34 -07:00
Régis Hanol 0da8f35659 [fixes #391] exception when wrong resource type in URL 2013-03-24 22:25:24 +01:00
Neil Lalonde ff3028de07 Fix a typo and add a step to DEVELOPER-ADVANCED.md 2013-03-24 16:46:28 -04:00
Robin Ward 3cb729df21 Merge pull request #546 from ZogStriP/improve-i18n-spec-speed 
prevent double work in the i18n integrity specs
 2013-03-24 08:28:04 -07:00
Robin Ward 5b9ff91e88 Merge pull request #553 from buddhamagnet/issue-352-missing-template 
Add render nothing to refresh_browsers method
 2013-03-24 08:27:18 -07:00
Robin Ward 1a52150525 Merge pull request #554 from ZogStriP/update-vagrant-guide 
added GIT dependency to VAGRANT guide
 2013-03-24 08:26:46 -07:00
Jeff Atwood 6689f72dfd first-child removes whitespace from top of posts 
MUST REMOVE SCRIPT METAMORPH FROM COOKED FOR THIS TO WORK!
 2013-03-24 03:03:46 -07:00
Jeff Atwood a001232ff3 move h1-h6 margins into topic-body 2013-03-24 02:26:54 -07:00
Jeff Atwood a7dfcc54e8 fix h4 style issue on topic map 2013-03-24 02:07:37 -07:00
Jeff Atwood 85c0a8e396 margin tweak no longer necessary 2013-03-24 02:01:07 -07:00
Jeff Atwood e0a119ba36 remove a TON of unused bootstrap classes 2013-03-24 01:44:42 -07:00
Jeff Atwood 0c8a803144 fix the CSS problem with paras under headings 2013-03-24 00:49:42 -07:00
Jeff Atwood f14cf4c97e reduce read time required for basic user to 15m 2013-03-23 23:52:34 -07:00
Jeff Atwood f10eafe2e1 Merge pull request #555 from ZogStriP/fix-email-notification-for-different-user-being-mentionned 
FIX: Email notification for different user being mentioned
 2013-03-23 18:07:59 -07:00
Régis Hanol 7d43058d20 FIX: Email notification for different user being mentioned 2013-03-24 01:57:00 +01:00
Régis Hanol 27d2645595 added GIT dependency to VAGRANT guide 2013-03-23 23:26:17 +01:00
buddhamagnet baef69d08c add render nothing to refresh_browsers method 2013-03-23 21:37:37 +00:00
Robin Ward 81c099a37c Merge pull request #551 from kubabrecka/cs_update 
cs translation update
 2013-03-23 13:57:43 -07:00
Robin Ward 1a80412b43 Merge pull request #552 from kubabrecka/extract_strings_reports 
extract hardcoded strings from admin reports
 2013-03-23 13:56:23 -07:00
Kuba Brecka 274d665f35 extract hardcoded strings from admin reports 2013-03-23 18:06:28 +01:00
Kuba Brecka e38565ed1d cs translation update 2013-03-23 17:52:45 +01:00
Kuba Brecka 0e27af8473 implement MemInfo.mem_total on Mac OS X 2013-03-23 16:57:47 +01:00
Robin Ward 030ecfaa71 Fix bug where new posts wouldn't load after hitting the bottom if you'd filtered 2013-03-23 11:18:38 -04:00
Robin Ward 842760e50e Bump up best of to top 20% 2013-03-23 11:14:07 -04:00
nverba 0c7579ec9f Update Sidekiq and config 2013-03-23 14:49:50 +00:00
Régis Hanol c98d58378c prevent double work in the i18n integrity specs 2013-03-23 15:49:31 +01:00