merge PR/81, merging with master

.travis.yml

@@ -53,6 +53,8 @@ notifications:
       - "chat.freenode.net#retroshare"
     template:
       - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
+      - "Message: %{commit_message}"
+      - "Commit details: %{compare_url}"
 #  webhooks:
 #    urls:
 #      - https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3

retroshare-gui/src/gui/common/MimeTextEdit.cpp

@@ -19,6 +19,8 @@
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
+#include <QApplication>
+#include <QClipboard>
 #include <QMimeData>
 #include <QTextDocumentFragment>
 #include <QCompleter>
@@ -228,6 +230,7 @@ void MimeTextEdit::contextMenuEvent(QContextMenuEvent *e)
 	QMenu *contextMenu = createStandardContextMenu(e->pos());
 
 	/* Add actions for pasting links */
+	contextMenu->addAction( tr("Paste as plain text"), this, SLOT(pastePlainText()));
 	contextMenu->addSeparator();
 	QAction *pasteLinkAction = contextMenu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste RetroShare Link"), this, SLOT(pasteLink()));
 	contextMenu->addAction(QIcon(":/images/pasterslink.png"), tr("Paste my certificate link"), this, SLOT(pasteOwnCertificateLink()));
@@ -260,3 +263,8 @@ void MimeTextEdit::pasteOwnCertificateLink()
 		insertHtml(link.toHtml() + " ");
 	}
 }
+
+void MimeTextEdit::pastePlainText()
+{
+	insertPlainText(QApplication::clipboard()->text());
+}

retroshare-gui/src/gui/common/MimeTextEdit.h

@@ -58,7 +58,7 @@ private slots:
 	void insertCompletion(const QString &completion);
 	void pasteLink();
 	void pasteOwnCertificateLink();
-
+	void pastePlainText();
 private:
 	QString textUnderCursor() const;