diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-28 13:18:31 -0300 | 
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-28 13:18:31 -0300 | 
| commit | 2781cc604de74ad3d41c939fb807b5e689d435eb (patch) | |
| tree | ee9d36ef17f20ef92582d2ba7c21ba88ce438fdf | |
| parent | 1675fc49fd5f0825f14460613ea3a0a9f365367d (diff) | |
| parent | c546964e79c1a66688ec305f4f29699dec685e42 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/increase-pastebin-lifetime' into develop
| -rw-r--r-- | changes/feature_increase-pastebin-lifetime | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/loggerwindow.py | 2 | 
2 files changed, 2 insertions, 1 deletions
| diff --git a/changes/feature_increase-pastebin-lifetime b/changes/feature_increase-pastebin-lifetime new file mode 100644 index 00000000..61e86f62 --- /dev/null +++ b/changes/feature_increase-pastebin-lifetime @@ -0,0 +1 @@ +- Increase expiration life of a pastebin log from 1 week to 1 month. diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py index b0e45a50..f19b172f 100644 --- a/src/leap/bitmask/gui/loggerwindow.py +++ b/src/leap/bitmask/gui/loggerwindow.py @@ -206,7 +206,7 @@ class LoggerWindow(QtGui.QDialog):              pb = pastebin.PastebinAPI()              link = pb.paste(PASTEBIN_API_DEV_KEY, content,                              paste_name="Bitmask log", -                            paste_expire_date='1W') +                            paste_expire_date='1M')              # convert to 'raw' link              link = "http://pastebin.com/raw.php?i=" + link.split('/')[-1] | 
