Commit Graph

972 Commits

Author SHA1 Message Date
Robin Ward b8fd734d0e Merge branch 'refactor-category' of git://github.com/goshakkk/discourse
Conflicts:
	app/models/category.rb
2013-03-08 10:49:25 -05:00
Kuba Brecka bdeef4696f messagebus diagnostics process path on Mac OS 2013-03-08 16:46:23 +01:00
Kuba Brecka 3a8cfffb2d apply locale in sidekiq jobs 2013-03-08 16:22:08 +01:00
Robin Ward fb573b917f Merge pull request #390 from ZogStriP/min-search-term-length-site-setting
added the min-search-term-length site setting
2013-03-08 06:58:45 -08:00
Robin Ward 724057bf94 Merge pull request #394 from kubabrecka/cs_update8
updating cs translation
2013-03-08 06:56:19 -08:00
Sam e11af13b12 add fast xor, we need really fast xor to keep our password function honest. 2013-03-08 05:54:40 -08:00
Sam d6ca23a75b remove N+1 queries 2013-03-08 05:34:19 -08:00
Kuba Brecka d8993272d1 updating cs translation 2013-03-08 13:18:20 +01:00
Sam b27d4dcded upgrade the ruby racer 2013-03-07 14:55:36 -08:00
Robin Ward d848a9fedc Add opengraph and twitter card support to topics 2013-03-07 17:46:43 -05:00
Neil Lalonde 0bbcd6f7e4 Add a warning about bundle update to TROUBLESHOOTING.md 2013-03-07 16:20:09 -05:00
Neil Lalonde 7030f9c5cd Fix jquery in the github commits widget 2013-03-07 15:54:24 -05:00
Neil Lalonde 2ebe0336ae On signup, handle duplicate key errors on email and username better 2013-03-07 14:56:55 -05:00
Neil Lalonde 1133d90dcc Disable submit button on signup form when you've submitted the form 2013-03-07 14:56:55 -05:00
Kuba Brecka 2e76e337a6 1st attempt to support i18n in dates and times 2013-03-07 20:05:18 +01:00
Robin Ward 052887c296 Category Topics are no longer invisible, they are pinned. 2013-03-07 12:46:23 -05:00
Robin Ward c7359145aa Merge pull request #384 from kubabrecka/fix_html_escapes
fix wrongly escaped HTML in <noscript> tags
2013-03-07 09:24:16 -08:00
Robin Ward 5349e1b163 Merge pull request #387 from ZogStriP/g10n-wikipedia-oneboxer
globalized wikipedia onebox
2013-03-07 09:23:19 -08:00
Robin Ward 0d9b251b31 Merge pull request #388 from ryanprayogo/master
More translation for the Indonesian language
2013-03-07 09:22:05 -08:00
Robin Ward 6277397506 Oops, didn't mean to revert to http on rubygems. 2013-03-07 12:20:19 -05:00
Robin Ward f8d8272406 Cleaned up TopicUserSpec, introduces clearing of pinned topics 2013-03-07 12:19:25 -05:00
Neil Lalonde 3af2ab9022 Handle when github api returns a null author, and other missing info 2013-03-07 11:08:18 -05:00
Regis Hanol 5703d6c730 added the min-search-term-length site setting 2013-03-07 16:52:01 +01:00
Sam 590bb2acac update mini profiler so I can see ENV 2013-03-07 03:39:37 -08:00
Ryan Prayogo fee31828d7 More translation for the Indonesian language 2013-03-06 23:35:58 -05:00
Régis Hanol 002776808f highlight the first of the newly loaded topics when scrolling 2013-03-07 03:38:38 +01:00
Régis Hanol 621995f35a globalized wikipedia onebox 2013-03-07 03:30:40 +01:00
Sam a0949ca992 Merge pull request #386 from ZogStriP/keeping-client.fr.yml-up-to-date
keeping client.fr.yml up to date
2013-03-06 17:27:10 -08:00
Régis Hanol 9d9329257d keeping client.fr.yml up to date 2013-03-07 01:04:10 +01:00
Sam 674ed9432e Merge pull request #379 from Sinemys/portuguese-translations
Portuguese translations
2013-03-06 14:59:14 -08:00
Sam 33d1ea500b Merge pull request #383 from kubabrecka/cs_update7
CZ translation update + pseudolocalization update
2013-03-06 14:58:18 -08:00
Kuba Brecka 69d9856d43 fix wrongly escaped HTML in <noscript> tags 2013-03-06 22:25:44 +01:00
Kuba Brecka 98ebd91f96 CZ translation update + pseudolocalization update 2013-03-06 21:42:08 +01:00
Jeff Atwood 985cbb92f1 Merge pull request #382 from nsahler/patch-1
Reply-new fades in
2013-03-06 11:44:53 -08:00
Nick Sahler 7490012b20 Resubmitting 2013-03-06 14:41:24 -05:00
Neil Lalonde fab04dbb58 Add github commits widget 2013-03-06 14:39:01 -05:00
Nick Sahler 5f9093f21d "reply-new" transitions instead of instantly popping in 2013-03-06 14:26:38 -05:00
Luís Ramalho 3333abefb7 PT corrections 2013-03-06 19:19:55 +00:00
Ismael Abreu 2396673847 Portuguese translations 2013-03-06 19:18:45 +00:00
Luís Ramalho 7324c74191 Postuguese translations 2013-03-06 19:18:22 +00:00
Alexander 02f29cd43f Prevent quote content collisions with multiples in one post
[Fixes #142]
2013-03-06 09:53:34 -08:00
Robin Ward c123e40638 Merge pull request #373 from alxndr/master
Raise 404 from Admin::UsersController#show if no user found
2013-03-06 09:17:47 -08:00
Robin Ward 610be79061 Merge pull request #375 from ZogStriP/autofocus-login
autofocus the login input in the login modal
2013-03-06 09:17:10 -08:00
Robin Ward 3b645383fb Merge pull request #372 from kubabrecka/markdown_fix1
Markdown editor translations into client.en.yml + tiny translation fixes
2013-03-06 09:15:52 -08:00
Robin Ward fa50d651ae Merge pull request #374 from ZogStriP/french-18n-update
keeping the server.fr.yml file up to date
2013-03-06 09:15:14 -08:00
Robin Ward a360f30748 Merge pull request #376 from ryanprayogo/master
Initial Indonesian translations
2013-03-06 09:14:51 -08:00
Robin Ward 6a63178411 Merge pull request #377 from kubabrecka/typos5
various typos in comments
2013-03-06 09:14:16 -08:00
Robin Ward 4a6b4b6028 Merge pull request #378 from thomas-mcdonald/master
Don't install development gems on Travis
2013-03-06 09:13:46 -08:00
Robin Ward 1e43eac600 Simple CSS changes to help with lower width screens such as Surface tablet 2013-03-06 12:08:06 -05:00
Neil Lalonde f129693942 Use a github commits widget hosted on discourse.org 2013-03-06 12:04:45 -05:00