Commit Graph

2985 Commits

Author SHA1 Message Date
Neil Lalonde 3442d3adb2 Add left margin to ol and ul 2013-11-27 10:55:54 -05:00
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
jjangg96 c2e7e72b74 faq.ko.html.erb Added
Korean translate updated.
2013-11-27 12:21:59 +09: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
Robin Ward 549060867d Updated documentation for `inlineRegexp` 2013-11-25 11:35:28 -05: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
Robin Ward f1a681aa46 Fix: Participant filter was broken. 2013-11-22 17:02:12 -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 ec5788f80b Merge pull request #1688 from velesin/sitemap_integration_tests
header sitemap integration tests
2013-11-22 08:06:49 -08:00
Régis Hanol f65cde3cda do not bump posts when rebaking 2013-11-22 01:52:26 +01:00
Wojciech Zawistowski 1d3097245c header sitemap integration tests 2013-11-21 20:38:56 +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
Neil Lalonde 69cc1dd689 FIX: don't suggest a username that's already taken, even if hub finds a match 2013-11-20 14:56:21 -05:00
Neil Lalonde 97cb9e1545 Signup with 3rd party auth can find the matching username from the Discourse Hub 2013-11-20 14:56:21 -05:00
Robin Ward ea8e4bfbcf FIX: Double footer navigation 2013-11-20 14:16:33 -05:00
Robin Ward d09735ff46 Merge pull request #1680 from velesin/user_activity_link_title_fix
FIX: repairs title attr in the link
2013-11-20 09:04:43 -08:00
Neil Lalonde 9de07fd83f Merge pull request #1678 from eriko/patch-3
Load plugin settings.
2013-11-20 07:54:20 -08:00
Régis Hanol 31fd5b85bc FIX markdown hotlinked images were not properly pulled 2013-11-20 13:10:08 +01:00
Robin Ward fa0b5d3b0e FIX: Missing Private message topic map 2013-11-19 18:59:29 -05:00
Sam d16298b1d7 Merge pull request #1679 from velesin/logo_improvement
removes redundant enclosing tag
2013-11-19 14:59:45 -08:00
Sam 325ad46c20 Merge pull request #1681 from germanviscuso/japanese_locales
Provides Japanese locales
2013-11-19 14:58:06 -08:00
Neil Lalonde 1616741836 Say something when no site settings match the filter 2013-11-19 16:46:20 -05:00
German Viscuso 3f049f4853 Provides Japanese locales 2013-11-19 22:20:19 +01:00
Wojciech Zawistowski 3a470939f0 FIX: repairs title attr in the link 2013-11-19 21:32:02 +01:00
Wojciech Zawistowski e7c6abde3e removes redundant enclosing tag 2013-11-19 21:28:05 +01:00
Erik Ordway bf390163aa Load plugin settings.
Along the lines for loading the locale files for a plugin we should also load the settings.yml for a plugin.  Updated version 04f3e09 that moves the loading to a function. I do not understand why it was necessary to define the function physically earlier in the file as I thought ruby did two pass but that may only apply to functions and not stray code in the class.
2013-11-19 11:43:01 -08:00
Neil Lalonde 981d8f6aea Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing... 2013-11-19 14:15:28 -05:00
Robin Ward 309904ef8f Revert "Merge pull request #1673 from aperrault/patch-04"
This reverts commit c9ea89bdd3, reversing
changes made to 9ed49888fc.
2013-11-19 14:08:45 -05:00
Robin Ward c9ea89bdd3 Merge pull request #1673 from aperrault/patch-04
Fixing neglect to determine whether a user has the permission to create ...
2013-11-19 10:50:38 -08:00
Robin Ward 9ed49888fc FIX: Invalid sub category links in suggested topics 2013-11-19 13:36:11 -05:00
Régis Hanol a7bbc93b9a Merge pull request #1672 from shivpkumar/shiv/add-session-to-after-create-account
Add 'session' to auth hash in OAuth complete method
2013-11-19 10:16:31 -08:00
Shiv Kumar 2f0e20bc11 add session to auth hash in oauth complete method 2013-11-19 09:58:12 -08:00
Robin Ward 58b275665b Oops, missing translation 2013-11-19 12:57:54 -05:00
Robin Ward f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Robin Ward b98456a65f Hide some values from the topic map if they're 0 2013-11-19 12:24:41 -05:00
Robin Ward 20e4a2ef80 Renamed components so they don't all have the annoying discourse- prefix 2013-11-19 11:59:50 -05:00
Autumn Perrault d9c026bec5 Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein. 2013-11-19 05:09:58 -07:00
Régis Hanol c22f602235 Merge pull request #1669 from GManzato/fix_fr_translation
Update french translation
2013-11-19 00:53:41 -08:00
Gilles Manzato 231fa9c2c0 Update french translation 2013-11-19 01:00:05 +01:00
Sam 3ce6a7be4a defer rendering of the site map
add new and unread links in the site map categories section
2013-11-19 10:41:57 +11:00
Robin Ward 89a96b9e94 FIX: Topic map expansion broken without links. 2013-11-18 17:06:52 -05:00
Robin Ward 9aa2bd068a FIX: Broken links on categories page 2013-11-18 16:59:19 -05:00