github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 00:44:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6,385 Commits 214 Branches 500 Tags 960 MiB
95f4c0f583
Commit Graph

6385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam
4bea4cbcaa BUGFIX: add [PM] string to private message emails 2014-01-21 17:24:05 +11:00
Nick Borromeo
e8474bd725 Change user update to use #fetch for defaults 
This changes the use of the || operator when setting the default of the
user attribute if the key does not exist to #fetch. This will make sure
that if false is passed in as the value it will still fail and use the
default setting.

This also adds constants to define and array and a hash of symbols which
is iterated over to set the users attributes.
 2014-01-20 18:07:47 -08:00
Neil Lalonde
9be481f035 Merge pull request #1846 from velesin/admin_site_settings_controller_test_fix 
fixes unit test broken (and commented out) after adding debounce behavio...
 2014-01-20 14:26:24 -08:00
Robin Ward
8c32f22ae0 FIX: Adding components to a ContainerView doesn't set the context 
properly.
 2014-01-20 17:13:36 -05:00
Régis Hanol
5feb5ee54d Changed the topics_per_period_in_top_page default to 50 
100 was still too much
 2014-01-20 22:55:32 +01:00
Neil Lalonde
0289053a70 Add the Lounge category, an exclusive area for trust level 3 users 2014-01-20 16:52:55 -05:00
Neil Lalonde
33c3e027b3 Revert "Add the Lounge category, an exclusive area for trust level 3 users" 2014-01-20 15:43:04 -05:00
Robin Ward
963793549c FIX: Remove failing ruby tests. The same thing is tested in JS and 
passes due to the ability to create a document fragment.
 2014-01-20 15:28:46 -05:00
Robin Ward
6b9b2d3d6a New API for replacing elements in the final JsonML. Also changes spoiler 
tag handling to be more robust with repsect to HTML content.
 2014-01-20 15:15:50 -05:00
Neil Lalonde
2d98720cc8 Add the Lounge category, an exclusive area for trust level 3 users 2014-01-20 15:06:20 -05:00
Neil Lalonde
daa5d023d6 FIX: topics with no replies should show coldness in activity column 2014-01-20 15:06:20 -05:00
Régis Hanol
a0d9821b37 FIX: Digest::Digest deprecation 2014-01-20 18:33:40 +01:00
Wojciech Zawistowski
8812196b81 fixes unit test broken (and commented out) after adding debounce behavior to a method 2014-01-20 17:30:12 +01:00
Régis Hanol
26b7bf388e BUGFIX: JS error when login_required is enabled 2014-01-20 14:41:11 +01:00
Sam
76a250300a BUGFIX: filter by topic 2014-01-20 17:53:30 +11:00
Sam
c7c1c937af STYLE: cleaner targetting in components 2014-01-20 17:25:54 +11:00
Sam
12b72762da BUGFIX: computed.alias (and even property) seems bust in components 2014-01-20 17:22:53 +11:00
Sam
b85e5dc191 FEATURE: collapse PM notifications 2014-01-20 16:18:43 +11:00
Sam
a7730f4b52 BUGFIX: missing styling 2014-01-20 10:44:13 +11:00
Sam
84ff5b7a81 UI: missing space 2014-01-20 10:32:03 +11:00
Régis Hanol
57eacdaeed BUGFIX: properly escape HTML entities in excerpt (props to @ecuk) 2014-01-19 23:54:52 +01:00
Régis Hanol
671b8e7587 Merge pull request #1844 from sanderdatema/patch-1 
Dutch language updated
 2014-01-19 12:01:14 -08:00
Régis Hanol
fbc58bd1eb Merge pull request #1845 from sanderdatema/patch-3 
Typo in scripts/discourse
 2014-01-19 12:00:22 -08:00
Régis Hanol
a24e1f152d BUGFIX: clicking cancel should not reload the page 
when assets have changed.
 2014-01-19 20:55:46 +01:00