aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-11-23 14:38:50 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-11-23 14:38:50 +0100
commitbbf2b5b657eab9ce1b504f3984a5b5fdd3dadf2a (patch)
treeb1b180d74ae9d945f5bbdf285032b8d894841306
parentc0bf421b580b8b2ac77570e69b32135311f4d519 (diff)
parentc8b0117d18188b59ff188a3dc0c7c7e6dc662fc8 (diff)
downloadscudcloud-bbf2b5b657eab9ce1b504f3984a5b5fdd3dadf2a.zip
scudcloud-bbf2b5b657eab9ce1b504f3984a5b5fdd3dadf2a.tar.gz
scudcloud-bbf2b5b657eab9ce1b504f3984a5b5fdd3dadf2a.tar.bz2
Merge remote-tracking branch 'refs/remotes/origin/master'
-rw-r--r--README.md6
-rw-r--r--scudcloud-1.1/VERSION2
-rw-r--r--scudcloud-1.1/debian/changelog6
-rwxr-xr-xscudcloud-1.1/lib/scudcloud.py4
-rw-r--r--scudcloud-1.1/scudcloud-src.js17
5 files changed, 20 insertions, 15 deletions
diff --git a/README.md b/README.md
index 546a8a0..d228f1f 100644
--- a/README.md
+++ b/README.md
@@ -95,9 +95,9 @@ First, you'll need to install at least packages for `python3`, `python-qt4` (`qt
Then run the below script: it'll download the code and install it:
```bash
-wget https://github.com/raelgc/scudcloud/archive/v1.1.0.tar.gz
-tar -xvf v1.1.0.tar.gz
-cd scudcloud-1.1.0
+wget https://github.com/raelgc/scudcloud/archive/v1.1.1.tar.gz
+tar -xvf v1.1.1.tar.gz
+cd scudcloud-1.1.1
SOURCE="scudcloud-1.1"
INSTALL="/opt/scudcloud"
sudo mkdir -p $INSTALL/lib
diff --git a/scudcloud-1.1/VERSION b/scudcloud-1.1/VERSION
index 9084fa2..524cb55 100644
--- a/scudcloud-1.1/VERSION
+++ b/scudcloud-1.1/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/scudcloud-1.1/debian/changelog b/scudcloud-1.1/debian/changelog
index 2f1ca6d..b87b436 100644
--- a/scudcloud-1.1/debian/changelog
+++ b/scudcloud-1.1/debian/changelog
@@ -1,3 +1,9 @@
+scudcloud (1.1-1) trusty; urgency=medium
+
+ * Disabling Private browsing (#296)
+
+ -- Rael Gugelmin Cunha <rael.gc@gmail.com> Sat, 21 Nov 2015 13:52:35 -0200
+
scudcloud (1.1-0~bpo80+1) jessie-add; urgency=medium
* Build for jessie-add.
diff --git a/scudcloud-1.1/lib/scudcloud.py b/scudcloud-1.1/lib/scudcloud.py
index d53e04f..5675e12 100755
--- a/scudcloud-1.1/lib/scudcloud.py
+++ b/scudcloud-1.1/lib/scudcloud.py
@@ -78,10 +78,10 @@ class ScudCloud(QtGui.QMainWindow):
QWebSettings.globalSettings().setAttribute(QWebSettings.PluginsEnabled, self.plugins)
# We don't want Java
QWebSettings.globalSettings().setAttribute(QWebSettings.JavaEnabled, False)
- # We don't need History
- QWebSettings.globalSettings().setAttribute(QWebSettings.PrivateBrowsingEnabled, True)
# Enabling Local Storage (now required by Slack)
QWebSettings.globalSettings().setAttribute(QWebSettings.LocalStorageEnabled, True)
+ # We need browsing history (required to not limit LocalStorage)
+ QWebSettings.globalSettings().setAttribute(QWebSettings.PrivateBrowsingEnabled, False)
# Enabling Cache
self.diskCache = QNetworkDiskCache(self)
self.diskCache.setCacheDirectory(self.settings_path)
diff --git a/scudcloud-1.1/scudcloud-src.js b/scudcloud-1.1/scudcloud-src.js
index 3bb9beb..a896cca 100644
--- a/scudcloud-1.1/scudcloud-src.js
+++ b/scudcloud-1.1/scudcloud-src.js
@@ -1,8 +1,7 @@
-
ScudCloud = {
unloaded: true,
// App functions
- hasPreference: function(name){
+ hasPreference: function(name){
return false;
},
getPreference: function(name){
@@ -72,16 +71,16 @@ ScudCloud = {
createSnippet: function(){
return TS.ui.snippet_dialog.start();
},
- listChannels: function(){
+ listChannels: function(){
return TS.channels.getUnarchivedChannelsForUser();
},
- listTeams: function(){
+ listTeams: function(){
var list = TS.getAllTeams();
// Fix for current team displaying no icon
list[0].team_icon = {"image_44":TS.model.team.icon.image_44};
return list;
},
- quicklist: function(){
+ quicklist: function(){
desktop.quicklist(ScudCloud.listChannels());
},
join: function(c){
@@ -90,10 +89,10 @@ ScudCloud = {
setClipboard: function(data){
TS.client.ui.file_pasted_sig.dispatch(data, TS.model.shift_key_pressed);
},
- preferences: function(){
+ preferences: function(){
return TS.ui.prefs_dialog.start();
},
- addTeam: function(){
+ addTeam: function(){
document.location = TS.boot_data.signin_url;
},
getCurrentTeam: function(){
@@ -105,10 +104,10 @@ ScudCloud = {
}
return "";
},
- logout: function(){
+ logout: function(){
document.location = TS.boot_data.logout_url;
},
- help: function(){
+ help: function(){
return TS.help_dialog.start();
}
};