Commit Graph

5617 Commits

Author SHA1 Message Date
Neil Lalonde a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
Régis Hanol 67b6d37da0 Merge pull request #1699 from jjangg96/Korean
Korean translation updated.
2013-11-27 00:23:23 -08:00
jjangg96 c2e7e72b74 faq.ko.html.erb Added
Korean translate updated.
2013-11-27 12:21:59 +09:00
Jeff Atwood 9ba9246c6e Merge pull request #1697 from riking/patch-1
Change :D to map to 😃 instead of 😁
2013-11-26 13:42:40 -08:00
Kane York 49d7e55352 Change :D to map to 😃 instead of 😁
Because 😁 looks like somebody is constipated, really
2013-11-26 13:34:44 -08:00
Régis Hanol 4e310dd75f Merge pull request #1696 from ofgeek/patch-1
Update client.zh_CN.yml
2013-11-26 05:39:07 -08:00
ofGEEK 68ee1059f3 Update client.zh_CN.yml 2013-11-26 20:58:45 +08:00
Sam 9d13c6b931 we need this eager load thing 2013-11-26 15:16:56 +11:00
Sam 6617478878 update some gems 2013-11-26 13:40:02 +11:00
Sam d6a14889ac Merge branch 'master' of github.com:discourse/discourse 2013-11-26 10:21:57 +11:00
Sam 3fa48f8d76 Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937 2013-11-26 10:21:41 +11:00
Régis Hanol b0d132ee2e make sure image urls have a scheme before pulling them in 2013-11-25 19:47:53 +01:00
Régis Hanol 6b6c3d05dd FIX stretched thumbnails 2013-11-25 18:36:13 +01:00
Robin Ward 549060867d Updated documentation for `inlineRegexp` 2013-11-25 11:35:28 -05:00
Robin Ward a8a51746a5 Merge pull request #1693 from sanderdatema/patch-3
Updated Dutch translation
2013-11-25 08:32:50 -08:00
Robin Ward d208be14d2 FIX: Ruby 1.9.3 UTF-8 bug 2013-11-25 11:29:58 -05:00
Sander Datema 2d21e64367 Update client.nl.yml 2013-11-25 17:06:05 +01:00
Sander Datema 6a7e71885d Updated server.nl.yml 2013-11-25 17:03:54 +01:00
Sam 2eee7433f0 update message bus for .stop() support, stop the message bus during test 2013-11-25 18:01:03 +11:00
Sam 95c968d7b7 fix js specs 2013-11-25 17:50:48 +11:00
Sam 6544f39bcc fix topic counts not updating automatically in various spots (top menu / categories page / drop down) 2013-11-25 17:37:51 +11:00
Sam 92528d7207 message bus update, extract message bus js out into gem 2013-11-25 17:37:01 +11:00
Kasper Peulen a7cb139238 support dollar sign in inline dialects
In this way it is possible to use the dollar ($) sign as a startpoint for an inline dialect.
2013-11-23 23:15:40 +01:00
Jeff Atwood 8df30fa48e minor copyedit on summary text 2013-11-22 17:18:38 -08:00
Robin Ward f1a681aa46 Fix: Participant filter was broken. 2013-11-22 17:02:12 -05:00
Régis Hanol 558eb78daa Merge pull request #1689 from velesin/remove_header_controller_mobile_device
removes unused property from HeaderController
2013-11-22 13:39:52 -08:00
Neil Lalonde bc8cd043ad Send the locale of your site to the Discourse Hub 2013-11-22 15:30:47 -05:00
Wojciech Zawistowski afd198a387 removes unused property from HeaderController 2013-11-22 21:07:03 +01:00
Régis Hanol 82b78ec6ba schemaless avatar urls 2013-11-22 19:18:45 +01:00
Régis Hanol 3cf5a363f7 do not destroy uploads when destroying a user 2013-11-22 18:29:07 +01:00
Neil Lalonde 4e45c5ff3d Fix js for handling click of header buttons. They were adding /# to the url, which broke routing. 2013-11-22 11:50:57 -05:00
Neil Lalonde 35bb4fc17f When flag is from system, don't show a user avatar. Say System: instead 2013-11-22 11:14:09 -05:00
Robin Ward 4c0642cbe1 Merge pull request #1684 from abbat/master
Russian translation (actual version)
2013-11-22 08:07:25 -08:00
Robin Ward ec5788f80b Merge pull request #1688 from velesin/sitemap_integration_tests
header sitemap integration tests
2013-11-22 08:06:49 -08:00
Sam 49b48e1eb6 ensure we have a bigint id 2013-11-22 17:51:36 +11:00
Sam b804f0bec9 add license for oobgc, should not be gpl 2013-11-22 17:04:32 +11:00
Sam b590b98491 update mini profiler 2013-11-22 17:04:14 +11:00
Régis Hanol f65cde3cda do not bump posts when rebaking 2013-11-22 01:52:26 +01:00
Neil Lalonde bcfbacec16 Don't show category descriptions as suggested topics 2013-11-21 16:43:22 -05:00
Neil Lalonde 574a8c92c4 Change enforce_global_nicknames to false until we start giving out access keys 2013-11-21 15:44:09 -05:00
Wojciech Zawistowski 1d3097245c header sitemap integration tests 2013-11-21 20:38:56 +01:00
Régis Hanol 60d97b8fc2 fix the build 2013-11-21 19:45:35 +01:00
Régis Hanol d134a5e199 Merge pull request #1686 from velesin/header_category_info_component_fix
FIX: removes invalid, unpaired closing tag
2013-11-21 09:07:27 -08:00
Régis Hanol 30e0d102e3 add unf gem to remove warning 2013-11-21 17:33:43 +01:00
Wojciech Zawistowski b6de8324be FIX: removes invalid, unpaired closing tag 2013-11-21 17:33:03 +01:00
Robin Ward 50005e2ef9 FIX: Back button wasn't reusing scroll position on category filter 2013-11-21 11:31:10 -05:00
Anton Batenev a734878930 Russian translation (actual version) 2013-11-21 13:46:19 +04:00
Régis Hanol fb4fb50b7b Merge pull request #1683 from GManzato/fix_fr_translation
Update french translation
2013-11-21 00:36:41 -08:00
Régis Hanol 7ad21b0f90 Merge pull request #1682 from ofgeek/patch-1
Update client.zh_CN.yml
2013-11-21 00:28:31 -08:00
Gilles Manzato e6995945ea Update french translation 2013-11-21 09:17:15 +01:00