Merge pull request #6551 from AugierLe42e/bootstrap-markdown (bf6af404) · Commits · Gigadoc 2 / diaspora

Changelog.md

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -191,6 +191,7 @@ The command will report queues that still have jobs and launch sidekiq process f
	* Return all contacts in people search [#6951](https://github.com/diaspora/diaspora/pull/6951)		* Return all contacts in people search [#6951](https://github.com/diaspora/diaspora/pull/6951)
	* Make screenreaders read alerts [#6973](https://github.com/diaspora/diaspora/pull/6973)		* Make screenreaders read alerts [#6973](https://github.com/diaspora/diaspora/pull/6973)
	* Display message when there are no posts in a stream [#6974](https://github.com/diaspora/diaspora/pull/6974)		* Display message when there are no posts in a stream [#6974](https://github.com/diaspora/diaspora/pull/6974)
			* Add bootstrap-markdown editor to the publisher [#6551](https://github.com/diaspora/diaspora/pull/6551)

	# 0.5.10.2		# 0.5.10.2

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,7 @@ source "https://rails-assets.org" do
	gem "rails-assets-markdown-it-sub", "1.0.0"		gem "rails-assets-markdown-it-sub", "1.0.0"
	gem "rails-assets-markdown-it-sup", "1.0.0"		gem "rails-assets-markdown-it-sup", "1.0.0"
	gem "rails-assets-highlightjs", "9.4.0"		gem "rails-assets-highlightjs", "9.4.0"
			gem "rails-assets-bootstrap-markdown", "2.9.0"

	# jQuery plugins		# jQuery plugins

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -646,6 +646,10 @@ GEM
	sprockets-rails		sprockets-rails
	rails-assets-autosize (3.0.15)		rails-assets-autosize (3.0.15)
	rails-assets-blueimp-gallery (2.21.2)		rails-assets-blueimp-gallery (2.21.2)
			rails-assets-bootstrap (3.3.6)
			rails-assets-jquery (>= 1.9.1, < 3)
			rails-assets-bootstrap-markdown (2.9.0)
			rails-assets-bootstrap (~> 3)
	rails-assets-diaspora_jsxc (0.1.5.develop.1)		rails-assets-diaspora_jsxc (0.1.5.develop.1)
	rails-assets-favico.js (~> 0.3.9)		rails-assets-favico.js (~> 0.3.9)
	rails-assets-jquery (>= 1.11)		rails-assets-jquery (>= 1.11)
	@@ -994,6 +998,7 @@ DEPENDENCIES
	rails (= 4.2.7.1)		rails (= 4.2.7.1)
	rails-assets-autosize (= 3.0.15)!		rails-assets-autosize (= 3.0.15)!
	rails-assets-blueimp-gallery (= 2.21.2)!		rails-assets-blueimp-gallery (= 2.21.2)!
			rails-assets-bootstrap-markdown (= 2.9.0)!
	rails-assets-diaspora_jsxc (= 0.1.5.develop.1)!		rails-assets-diaspora_jsxc (= 0.1.5.develop.1)!
	rails-assets-highlightjs (= 9.4.0)!		rails-assets-highlightjs (= 9.4.0)!
	rails-assets-jasmine-ajax (= 3.2.0)!		rails-assets-jasmine-ajax (= 3.2.0)!

0 → 100644

+41 −0

Original line number	Original line	Diff line number	Diff line
			// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

			app.views.PreviewPost = app.views.Post.extend({
			templateName: "stream-element",
			className: "stream_element loaded",

			subviews: {
			".feedback": "feedbackView",
			".post-content": "postContentView",
			".oembed": "oEmbedView",
			".opengraph": "openGraphView",
			".poll": "pollView",
			".status-message-location": "postLocationStreamView"
			},

			tooltipSelector: [
			".timeago",
			".delete",
			".permalink"
			].join(", "),

			initialize: function() {
			this.model.set("preview", true);
			this.oEmbedView = new app.views.OEmbed({model: this.model});
			this.openGraphView = new app.views.OpenGraph({model: this.model});
			this.pollView = new app.views.Poll({model: this.model});
			},

			feedbackView: function() {
			return new app.views.Feedback({model: this.model});
			},

			postContentView: function() {
			return new app.views.StatusMessage({model: this.model});
			},

			postLocationStreamView: function() {
			return new app.views.LocationStream({model: this.model});
			}
			});
			// @license-end

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ app.views.PublisherGettingStarted = Backbone.View.extend({

	// initiate all the popover message boxes		// initiate all the popover message boxes
	show: function() {		show: function() {
			app.publisher.open();
	this._addPopover(this.firstMessage, {		this._addPopover(this.firstMessage, {
	trigger: "manual",		trigger: "manual",
	id: "first_message_explain",		id: "first_message_explain",