Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,207 Commits 260 Branches 502 Tags 851 MiB
Commit Graph

6207 Commits

Author SHA1 Message Date
Robin Ward c9cca78ab2 FIX: Show "Begin Discussion" button when there are 0 replies 2014-01-23 12:59:10 -05:00
Robin Ward 6ec1f93c05 Merge pull request #1855 from chrishunt/update-favcount 
Bump favcount.js to v1.5.0
 2014-01-23 09:46:14 -08:00
Chris Hunt 4e9cf2f26e Bump favcount.js to v1.5.0 
We've already made the CORS changes in our copy of favcount, but we
should bump the version to match upstream.
 2014-01-23 09:29:28 -08:00
Robin Ward 03779697e7 FIX: Could navigate back to "Preferences" from "Change Email" 2014-01-23 11:39:02 -05:00
Régis Hanol ae06ea6323 BUGFIX: clicking the logo when the homepage was /categories or /top would fail 2014-01-23 17:08:52 +01:00
Robin Ward 7b20079d85 FIX: Allow Favcount to be used with CORS. I've submitted this upstream 
too:

https://github.com/chrishunt/favcount/pull/8
 2014-01-23 11:07:10 -05:00
Robin Ward 97dd560d84 Allow CORS on .ico files. Should help with Favcount.js 2014-01-23 10:41:22 -05:00
Sam f59c223210 BUGFIX: not seeding welcome topic 2014-01-23 22:59:53 +11:00
Régis Hanol bfc9664231 BUGFIX: site_contact_username was case-sensitive 2014-01-23 11:26:31 +01:00
Régis Hanol 202d1064ea BUGFIX: do not allow loop over topics list using keyboard shortcuts 2014-01-23 00:39:46 +01:00
Neil Lalonde ae3b53bb76 Add a page in admin to view trust level 3 requirements for a user. Only shows for users who are currently at trust level 2. 2014-01-22 18:17:45 -05:00
Neil Lalonde c1fec2d3e2 Lower default invite_expiry_days to 4 days 2014-01-22 18:17:45 -05:00
Robin Ward 659b95178a FIX: Removed `Rails.logger`. Sigh. 2014-01-22 17:09:57 -05:00
Jeff Atwood a4605f597c minor copyedit 2014-01-22 12:58:15 -08:00
Jeff Atwood 226a6c0c71 improve default meta category definition 2014-01-22 12:55:41 -08:00
Robin Ward 2d15c82b26 FIX: Digest styling for oneboxes 2014-01-22 15:30:44 -05:00
Jeff Atwood 959218c7cd omit needless words 2014-01-22 11:36:48 -08:00
Jeff Atwood 07af39720a some minor updates 2014-01-22 11:35:38 -08:00
Robin Ward 39c6e48aa5 FEATURE: Return only the first paragraph of text in HTML digests, unless 
there is only one post. In that case return everything. Remove
dependency on 'html_truncator'
 2014-01-22 12:37:37 -05:00
Robin Ward 502b4730c8 FIX: Don't show uncategorized badges in digest emails 2014-01-22 11:27:57 -05:00
Robin Ward 745cd0f4e9 FIX: Removes `console.log` 2014-01-22 11:07:19 -05:00
Régis Hanol 7a82b65386 BUGFIX: restore Mousetrap's bindGlobal plugin 
cleared deprecated warnings in admin_customize_view
 2014-01-22 16:52:09 +01:00
Régis Hanol 9a3c64535b BUGFIX: regular track option was unavailable (props to @riking) 2014-01-22 10:40:45 +01:00
Régis Hanol 9313f27a89 update mousetrap to latest 2014-01-22 10:17:37 +01:00
Sam d3723b5ceb BUGFIX: addressees of a pm was in a tiny box 2014-01-22 18:24:29 +11:00
Sam 7e5a17f277 FEATURE: mute/watch/track buttons for private conversations 2014-01-22 17:46:52 +11:00
Sam fc3bad8ff4 FEATURE: Seed a meta category, we want everyone to have it 2014-01-22 16:05:46 +11:00
Robin Ward 194081ca47 FIX: Hidden posts were not being displayed with the correct messaging. 2014-01-21 17:23:03 -05:00
Neil Lalonde da825451d0 Invite link can't be used to log in after you set a password or sign in with 3rd party 2014-01-21 16:56:41 -05:00
Neil Lalonde 1dbc1c56b4 FIX: inviting a user again after the first invite expires will create a new invite 2014-01-21 16:56:40 -05:00
Robin Ward e2c361f353 FIX: Indented code blocks followed by `<blockquote>` weren't working. 2014-01-21 16:18:20 -05:00
Robin Ward d867fb62e4 FIX: Upstream markdown-js fix for quotes inside lists. 2014-01-21 14:34:53 -05:00
Régis Hanol 3618e8b527 FEATURE: CTRL+ENTER and CMD+ENTER shortcut to submit the current message 2014-01-21 19:47:57 +01:00
Robin Ward 7fb1b4dded FIX: Can do multiple `:)` emojis on one line 2014-01-21 13:33:19 -05:00
Régis Hanol 0bb02505b0 BUGFIX: error when find_similar_to has no response 2014-01-21 19:32:37 +01:00
Robin Ward a524194a46 FIX: Bugged up Components vs. Views. My original error was using 
`templateName` instead of `layoutName` in an `Em.Component`. This fixes
that and backs out other "fixes"
 2014-01-21 13:08:47 -05:00
Neil Lalonde ba74226346 FIX: invited users get clearer messaging when setting a password for the first time 2014-01-21 12:42:26 -05:00
Robin Ward 3c3449aa1b Revert "New API for replacing elements in the final JsonML. Also changes spoiler" 
This reverts commit 6b9b2d3d6a.

We have come up with a better solution that does not involve HTML
parsing.
 2014-01-21 12:04:58 -05:00
Régis Hanol 3c2d4070a8 Merge pull request #1852 from velesin/search_keyboard_nav_fix 
FIX: keyboard navigation in the search box results dropdown
 2014-01-21 08:56:22 -08:00
Wojciech Zawistowski e9c0445769 FIX: keyboard navigation in the search box results dropdown 2014-01-21 17:17:40 +01:00
Neil Lalonde 5f46ce7329 Fix cold colours in activity column of topic lists 2014-01-21 11:11:30 -05:00
Robin Ward 564a7e505e FIX: Deprecation warning on bindAttr 2014-01-21 11:06:18 -05:00
Robin Ward 0a8432645d FIX: Updated Markdown-js to include my latest FIX from upstream: 
https://github.com/evilstreak/markdown-js/pull/164
 2014-01-21 11:05:17 -05:00
Robin Ward 2684f20ada Merge pull request #1841 from CiderCooler/master 
Clarify commands around rvm
 2014-01-21 07:07:20 -08:00
Robin Ward 839c6f0aa8 Merge pull request #1850 from Supermathie/sysadmin-docs 
Finally merge in @kpfleming's suggestions in #1430
 2014-01-21 07:05:47 -08:00
Robin Ward 1fe95f044a Merge pull request #1849 from vikhyat/fix-pm-invite 
Fix inviting others to private messages.
 2014-01-21 07:05:15 -08:00
Régis Hanol 1fd71bb237 BUGFIX: make the system_user an elder (TL=4) 
Otherwise it won't be able to create topic when the `min_trust_to_create_topic` is > 0
 2014-01-21 15:21:38 +01:00
Régis Hanol 5a3c77abd9 Merge pull request #1847 from nickborromeo/refactor-user-updater 
Change user update to use #fetch for defaults
 2014-01-21 00:57:46 -08:00
Michael Brown 8bd7dbfc3e Merge branch 'ubuntu-install-notes' of github.com:bloomberg/discourse into sysadmin-docs 
Conflicts:
	docs/INSTALL-ubuntu.md
 2014-01-21 01:39:46 -05:00
Vikhyat Korrapati 7a45d261a7 Fix inviting others to private messages. 2014-01-21 11:57:05 +05:30