Commit Graph

6369 Commits

Author SHA1 Message Date
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
Allen Hancock 16bd665491 Simplify example, remove typo 2014-01-19 13:27:10 -06:00
Sander Datema 261860fd4b Typo in scripts/discourse 2014-01-19 18:54:49 +01:00
Sander Datema be5ecb7d3b Update client.nl.yml 2014-01-19 18:34:29 +01:00
Sander Datema 86ea3853a8 Update server.nl.yml 2014-01-19 18:33:29 +01:00
Régis Hanol 73aa22ca8f Merge pull request #1842 from ofgeek/patch-1
Update client.zh_CN.yml
2014-01-19 07:52:45 -08:00
ofGEEK b7a0bee170 Update client.zh_CN.yml 2014-01-19 21:36:32 +08:00
Régis Hanol 5ec22cdd23 BUGFIX: edit category button should only be shown to staff members 2014-01-19 13:55:32 +01:00
Régis Hanol c4cbf934d0 BUGFIX: move mobile templates to discovery 2014-01-19 00:49:45 +01:00
Allen Hancock fee8c6a460 Clarify commands around rvm 2014-01-18 17:14:37 -06:00
Régis Hanol 0a8e791e14 changed `topics_per_period_in_top_page` default to 100 2014-01-18 22:58:29 +01:00
Régis Hanol b49e448556 FEATURE: show pinned topics for TL0 on top/year page
BUGFIX: word-wrap on topic-excerpt
2014-01-18 19:27:26 +01:00
Régis Hanol 59ab71b060 remove duplicated order_with_pinned_sql method 2014-01-18 19:27:26 +01:00
Régis Hanol aca53aa722 BUGFIX: display links to other periods at the bottom of the top/:period page 2014-01-18 19:27:26 +01:00
Régis Hanol 8d2e5041bc BUGFIX: proper handling of /none subcategory 2014-01-18 19:27:25 +01:00
Régis Hanol 7f5ef60d5f BUGFIX: url was overriden when using the back button after visiting a topic 2014-01-18 19:27:25 +01:00
Régis Hanol e31789327e fix the specs 2014-01-18 19:27:25 +01:00