Commit Graph

1564 Commits

Author SHA1 Message Date
Sam 68343c74c4 Fix broken merge 2014-06-17 10:58:21 +10:00
Sam 56dcd00570 BUGFIX: trust_level_0 group not including trust_level_1
BUGFIX: manual trust level change not adding user to groups
BUGFIX: system not in correct trust level groups
2014-06-17 10:52:02 +10:00
Robin Ward 88b5e78424 Merge branch 'add_custom_embed_by_username' of github.com:justinleveck/discourse into justinleveck-add_custom_embed_by_username
Conflicts:
	config/site_settings.yml
2014-06-16 10:52:15 -04:00
Sam Saffron d65efe7304 SECURITY: fix XSS 2014-06-16 10:24:54 +10:00
Robin Ward f3135533c2 Add some more mail headers back 2014-06-14 12:29:50 -04:00
Jeff Atwood d782a7dc48 remove List-Post header as a test 2014-06-14 01:21:32 -07:00
Jeff Atwood 834b83aaea use a variable to set the header 2014-06-14 00:13:08 -07:00
Jeff Atwood c4d8d80b07 only set List-Post if reply via email is on 2014-06-13 15:49:11 -07:00
Jeff Atwood beaa145572 some email notification header fixes 2014-06-13 15:42:20 -07:00
Robin Ward c690fa0d19 FIX: Replace protocol relative URLs in emails 2014-06-13 17:11:04 -04:00
Neil Lalonde 1876407db8 Version bump to v0.9.9.9 2014-06-13 11:38:13 -04:00
Régis Hanol e5a189fc17 BUGFIX: broken images in edit history with markdown view 2014-06-13 11:29:10 +02:00
Sam 58f3fcbc1a BUGFIX: not terminating self correctly on hangups from parent 2014-06-13 11:15:40 +10:00
Neil Lalonde ba65aa3f6c Add a way to validate min and max value of an integer site setting 2014-06-12 18:04:37 -04:00
Neil Lalonde 17f0777d14 For heroku, check if necessary table exist before trying to precompile assets 2014-06-12 14:41:45 -04:00
Neil Lalonde 39ab0ed0af Version bump to v0.9.9.8 2014-06-12 11:02:39 -04:00
Neil Lalonde 9611a1ac47 Validate username site settings 2014-06-11 16:20:57 -04:00
Régis Hanol 3ac20fb711 BUGFIX: replace backgrounds colors that were too bright for the letter avatars 2014-06-11 15:33:06 +02:00
Sam 62abb873df FEATURE: support serializing user custom fields by plugins 2014-06-11 11:57:22 +10:00
Jeff Atwood 55491d98a6 remove topic-info from topic onebox for now
https://meta.discourse.org/t/discourse-oneboxes-are-not-correctly-translated/16382/2?u=codinghorror
2014-06-10 17:03:44 -07:00
Régis Hanol 0781531e3c Merge pull request #2415 from techAPJ/bulk-invite-users-5
FEATURE: Bulk Invite
2014-06-10 19:11:11 +02:00
Neil Lalonde c88bff5e0c Version bump to v0.9.9.7 2014-06-10 10:49:22 -04:00
Neil Lalonde 3d22f90e9f FIX: email regexp for older rubies 2014-06-10 10:31:22 -04:00
Sam a044e3de58 Remove min_posts_for_search_in_topic
no longer needed, we always search in topic
2014-06-10 15:07:38 +10:00
Neil Lalonde c61462662b Add ability to run validation on site settings. notification_email and other email address settings are now validated. 2014-06-09 16:59:20 -04:00
Justin Leveck a78df3d57d Add custom embed_by_username feature
Feature to allow each imported post to be created using a different discourse
username. A possible use case of this is a multi-author blog where discourse
is being used to track comments. This feature allows authors to receive
updates when someone leaves a comment on one of their articles because each of
the imported posts can be created using the discourse username of the author.
2014-06-09 12:35:38 -07:00
Robin Ward 8e882ad145 CSS: Attempt to remove hairline border from android gmail blockquotes. 2014-06-09 15:28:26 -04:00
Neil Lalonde faed17aa18 Moderators should always be able to create topics too 2014-06-09 15:28:03 -04:00
Robin Ward 44ee7587c0 FIX: Plugins should be required by the path we generate for them 2014-06-09 15:22:11 -04:00
Robin Ward c176dc07c1 Merge pull request #2421 from peternlewis/reply_to_name
Use an appropriate name in the Reply-To header
2014-06-09 11:04:53 -04:00
Neil Lalonde 4d50d0d109 FIX: admins should be able to create topics, even if min_trust_to_create_topic is higher than their trust level 2014-06-09 11:03:21 -04:00
Arpit Jalan 727184641e FEATURE: Bulk Invite 2014-06-09 01:43:39 +05:30
Neil Lalonde d4b8581fbe FIX: avatars:refresh job calling undefined method 2014-06-06 16:48:17 -04:00
Peter N Lewis 0af1242aa8 Use an appropriate name in the Reply-To header
Use "Site Name <>" for the Reply-To header when the reply is to the site or a public topic.

Use "username <>" for the Reply-To header only when the reply is to a private message topic.
2014-06-06 21:09:00 +08:00
Sam 3767080f3b Added rake task to normalize code 2014-06-06 14:08:39 +10:00
Sam Saffron 05ca1e6e46 Added code block normalization routing for import 2014-06-06 10:34:21 +10:00
Neil Lalonde e114e47533 FIX: enum site settings UI was broken 2014-06-05 16:42:37 -04:00
Robin Ward 7bb33c28c2 Add new `max_width` feature for oneboxes. Allows vimeo oneboxes to not
look like total garbage.
2014-06-05 13:18:18 -04:00
Benjamin Kampmann 6b3d5c7348 add min_posts, max_posts to filter the topic list queries
superseeds #2412
2014-06-05 15:30:24 +02:00
Sam f1a28d62a3 FEATURE: support registration of custom html by plugins 2014-06-05 11:39:33 +10:00
Robin Ward a1887c97c6 Merge pull request #2405 from ligthyear/select2-sitesetting
AdminUI: Use Select2.js for SiteSetting Lists – adds Autocomplete and DnD-Sorting
2014-06-04 11:47:46 -04:00
Régis Hanol 0df666277d BUGFIXES: properly deal with bookmarks and deleted posts
BUGFIX: removing a bookmark from the activity feed was busted for deleted posts
BUGFIX: delete associated user actions when deleting a post
2014-06-04 17:41:11 +02:00
Sam cab589ec67 FEATURE: live delete / recover
BUGFIX: total post count could be smaller than filtered posts count
BUGFIX: filteredPostsCount not correctly defined
2014-06-04 14:10:54 +10:00
Sam c6c412fd45 BUGFIX: no reading credit for posts you create 2014-06-04 14:10:54 +10:00
Robin Ward 5bedc56387 New site setting: `limit_suggested_to_category` - ensures suggested
topics belong to the same category as the current topic and doesn't mix
in other categories.
2014-06-03 17:49:04 -04:00
Neil Lalonde 15e91f2da9 FIX: detect css changes in plugins that use register_css 2014-06-03 16:46:32 -04:00
Neil Lalonde 3e16ac62c3 Add register_color_scheme for plugins 2014-06-03 12:37:29 -04:00
Robin Ward 3f9c4100ef Many Plugin upgrades. 2014-06-03 10:33:47 -04:00
Neil Lalonde a644947119 FIX: live reload of css 2014-06-03 10:16:59 -04:00
Sam 95159fb82a BUGFIX: Sidekiq could be initialized incorrectly in some cases
Symptom, no jobs run
2014-06-03 17:17:10 +10:00