Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,675 Commits 209 Branches 500 Tags 870 MiB
Commit Graph

5675 Commits

Author SHA1 Message Date
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
Jeff Atwood 5bc3176ffb minor copyedits 2013-11-20 17:21:51 -08:00
ofGEEK fe21ffdab4 Update client.zh_CN.yml 2013-11-21 09:06:33 +08:00
Neil Lalonde c85fca58b5 Version bump to v0.9.7.5 2013-11-20 17:42:55 -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 5055da76e6 Abort triggers for email body processing 2013-11-20 13:30:01 -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
Robin Ward 0bab3f9b4e Revert "Revert "FIX: Markdown bug", breaks build" 
This reverts commit 08ad5d479e.
 2013-11-20 11:53:06 -05:00
Neil Lalonde f3feb441f9 Allow translations for admin_js in plugins. Use deep_merge so plugins can add to existing sections. 2013-11-20 11:51:07 -05: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
Sam 37267f36a6 we better rm on startup to work around jenkins messing it up, till I figure a cleaner way 2013-11-20 17:31:58 +11:00
Sam adf355567c move emoji to correct location without a post rebake 2013-11-20 16:54:49 +11:00
Sam 52c202b05e plugins public is auto generated 2013-11-20 14:39:02 +11:00
Sam 8278fdb9dd relocate emoji plugin, stop pre-compiling assets 2013-11-20 14:38:21 +11:00
Sam a468d6cfb0 message pack 0.5.6 has issues installing 2013-11-20 12:42:43 +11:00
Sam bcc9d749ad load up routes in master 2013-11-20 12:36:19 +11:00
Jeff Atwood 724f81258c copyedit on summarize 2013-11-19 17:27:28 -08:00
Jeff Atwood e2458fa892 brevity for user card filter 2013-11-19 17:21:55 -08:00
Robin Ward fa0b5d3b0e FIX: Missing Private message topic map 2013-11-19 18:59:29 -05:00
Sam 08ad5d479e Revert "FIX: Markdown bug", breaks build 
This reverts commit 4a32cddf80.
 2013-11-20 10:41:21 +11:00
Sam 7603faa20d add rbtrace for production tracing 2013-11-20 10:10:12 +11: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
Neil Lalonde 68a69f06e3 Say All instead of All Results 2013-11-19 16:46:20 -05:00
Robin Ward 4a32cddf80 FIX: Markdown bug 2013-11-19 16:23:04 -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 8f0a0059cc Sorting by activity now sorts on `created_at` rather than `bumped_at` 2013-11-19 12:28:50 -05:00
Robin Ward b98456a65f Hide some values from the topic map if they're 0 2013-11-19 12:24:41 -05:00