Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
46,332 Commits 241 Branches 502 Tags 898 MiB
Commit Graph

46332 Commits

Author SHA1 Message Date
Robin Ward a30c019275 Show totals in best of yellow thigny. 2013-03-26 15:40:30 -04:00
Robin Ward f1e2923a91 Display correct post counts, even with a filter active 2013-03-26 15:06:23 -04:00
Robin Ward 5dc47c2d82 Rename `posts_count` in topic view to `post_counts_by_user` which makes much more sense 2013-03-26 14:06:24 -04:00
Robin Ward 2efd3e61c7 TopicView respects `sort_order` and better specs 2013-03-26 13:27:11 -04:00
Sam bd4fcfa412 Merge pull request #567 from ZogStriP/keep-french-l10n-up-to-date-2013-03-25 
keeping French l10n up to date
 2013-03-26 04:53:40 -07:00
tms 172173eccc Make topic lists show last activity more intuitively 2013-03-25 22:13:23 -04:00
Sam a2ada48089 it appears routes can be reloaded in dev under certain conditions 2013-03-25 18:08:23 -07:00
Sam c57ec611e1 basic api support 2013-03-25 18:04:46 -07:00
Sam a177264114 refactoring of topic view tracking 2013-03-25 18:04:46 -07:00
Sam c2db546877 getAjax helper ... saves a lot of typing, we can extend later 2013-03-25 18:04:46 -07:00
Sam 36d60befbd mini profiler fix for multisite 2013-03-25 18:04:46 -07:00
Jeff Atwood 8ce9eefdce bit more spacing for quote reply glyph 2013-03-25 17:31:08 -07:00
Neil Lalonde 1ed6406a7d Add twitter, facebook, and google plus links to share dialog 2013-03-25 18:54:11 -04:00
Régis Hanol 386967c56e keeping French l10n up to date 2013-03-25 23:15:10 +01:00
Sam 7f9f619f82 Merge pull request #566 from mikl/danish-translation-enabling-stub 
Stub for actually enabling the Danish translation.
 2013-03-25 15:12:40 -07:00
Mikkel Hoegh 8ca898760c Oops, missed a spot. 2013-03-25 23:07:02 +01:00
Mikkel Hoegh 4fefe349d0 Stub for actually enabling the Danish translation. 2013-03-25 23:02:08 +01:00
Sam 3f206e6c8c Merge pull request #493 from mikl/danish-translation 
Danish translation.
 2013-03-25 14:06:13 -07:00
Sam 6aaf868d9f Merge pull request #564 from kubabrecka/cs_update19 
cs translation update
 2013-03-25 14:05:26 -07:00
Jeff Atwood bce127d6db add icon-quote glyph to quote reply pop-up button 2013-03-25 11:16:06 -07:00
Robin Ward 19376bb17c Merge pull request #565 from alpacaaa/it_locale 
Italian Translation!
 2013-03-25 10:57:06 -07:00
Robin Ward 90443dac30 Don't email about posts if the user deleted it. 2013-03-25 13:40:48 -04:00
Marco Sampellegrini ce98ce4b93 Italian Translation! 2013-03-25 18:35:38 +01:00
Neil Lalonde ba315c6610 If assets haven't been precompiled, fail to start server in production mode with a message 2013-03-25 13:33:58 -04:00
Robin Ward c372e36cb6 Don't count @mentions as links in a post 2013-03-25 13:12:15 -04:00
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