Commit Graph

9263 Commits

Author SHA1 Message Date
Sam Tuke 47592657d7 Added localisation for encryption settings 2013-01-22 17:15:03 +00:00
Björn Schießle f919230f63 remove inline JavaScript 2013-01-22 17:59:33 +01:00
Sam Tuke 619780a67d Merge branch 'master' into files_encryption 2013-01-22 16:50:20 +00:00
Björn Schießle 039bc91597 fix typo in comment 2013-01-22 17:46:35 +01:00
Björn Schießle 16ae902e31 no undo notification for deleted file, we use the trash bin instead 2013-01-22 17:43:46 +01:00
Robin Appelman db2b485b96 Cache: fix test case Updater::testRename 2013-01-22 16:36:03 +01:00
Björn Schießle 0245ec16a8 rebase to current master; merge conflicts resolved 2013-01-22 15:36:23 +01:00
Björn Schießle b694f996d9 allow admin to change retention obligation for the trash bin, default value is 180 days 2013-01-22 15:33:54 +01:00
Björn Schießle 16d7716dee calculate correct relative date for trashbin file list 2013-01-22 15:33:54 +01:00
Björn Schießle 97e69e5374 remove table row in trash bin view after undelete 2013-01-22 15:33:54 +01:00
Björn Schießle 81ab0affef allow to restore single files/folder from a deleted folder 2013-01-22 15:33:54 +01:00
Björn Schießle 1817c7895b allow to look into deleted directories 2013-01-22 15:33:54 +01:00
Björn Schießle 1255791ef2 handle group restore 2013-01-22 15:33:54 +01:00
Björn Schießle 655a20f963 expire files in trash bin after 30 days 2013-01-22 15:33:54 +01:00
Björn Schießle 8e57fe1a08 remove unneeded function 2013-01-22 15:33:54 +01:00
Björn Schießle a3da82261b remove item in the trash bin view after successful undelete 2013-01-22 15:33:53 +01:00
Björn Schießle d605228937 first version of the trash bin app 2013-01-22 15:33:53 +01:00
Björn Schießle 8259768732 introduce option to disable download action 2013-01-22 15:33:53 +01:00
Björn Schießle dfab3d3d7f call the trash bin view 2013-01-22 15:33:53 +01:00
Björn Schießle 9bacb0e179 rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view 2013-01-22 15:33:53 +01:00
Björn Schießle f15deaf556 listen to post delete event to allow the trash bin to create a copy of the version first 2013-01-22 15:32:57 +01:00
Björn Schießle 9d77317de8 add trash button to web interface 2013-01-22 15:32:57 +01:00
j-ed 9c069530cb Update config/config.sample.php
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
  default and this is sometimes to short especially if a malware/
  spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
2013-01-22 14:24:00 +01:00
j-ed df6ba6955d Update lib/mail.php
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
  default and this is sometimes to short especially if a malware/
  spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
2013-01-22 14:13:24 +01:00
Björn Schießle 5c4e2ad490 allow admin to change retention obligation for the trash bin, default value is 180 days 2013-01-22 13:19:41 +01:00
Björn Schießle bdee0e204e calculate correct relative date for trashbin file list 2013-01-22 12:30:12 +01:00
Lukas Reschke 8907bdaf7f Remove uneeded JS 2013-01-22 12:15:46 +01:00
Björn Schießle 76bd0cffce remove table row in trash bin view after undelete 2013-01-22 12:13:50 +01:00
Björn Schießle 2c3216266c allow to restore single files/folder from a deleted folder 2013-01-22 12:00:04 +01:00
Lukas Reschke bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Lukas Reschke 351d206dd3 Allow eval() and send headers for legacy browsers
The blocking of eval() seems to have problems with JQuery 1.7.2 - let's allow it for now and disable it in the future.
2013-01-22 08:09:01 +01:00
Michael Gapczynski 465c100d8f Add tests for mtime changes in folders - testRename is failing right now 2013-01-22 00:43:43 -05:00
Michael Gapczynski e666ce3622 Fix external storage UI for new storage namespaces 2013-01-21 23:57:26 -05:00
Michael Gapczynski 5136f6d818 Make database connection error messages less verbose 2013-01-21 22:53:32 -05:00
Lukas Reschke 3ffbaf4795 Allow iframes to external domains 2013-01-22 00:30:09 +01:00
Robin Appelman f2d0eeae83 Merge branch 'master' into filesystem 2013-01-22 00:19:44 +01:00
icewind1991 dd40b691ee Merge pull request #1255 from owncloud/leftcontent_fix
Fix scrolling of leftcontent
2013-01-21 15:18:38 -08:00
Thomas Mueller d8d812a91e enable unittesting on appframework and apptemplateadvanced 2013-01-21 23:19:17 +01:00
Robin Appelman 8ede3290ae Cache: add database indexes for mimetype and mimepart 2013-01-21 22:31:44 +01:00
Lukas Reschke 8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Lukas Reschke d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke 30274ee33e Move to OC_App 2013-01-21 22:18:11 +01:00
Lukas Reschke a29f9f90ab Indentation 2013-01-21 22:17:48 +01:00
Robin Appelman 1762378f67 Files: don't load fileactions.js when upgrading filecache 2013-01-21 22:07:55 +01:00
Robin Appelman 42a1a17a30 Cache: return non numberic storage id 2013-01-21 22:01:22 +01:00
Lukas Reschke 3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Lukas Reschke 39da6f8166 Move timezone check to external JS 2013-01-21 21:10:44 +01:00
Lukas Reschke 0c59074eeb Correct copy paste fail 2013-01-21 20:46:42 +01:00
Frank Karlitschek a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Lukas Reschke 9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00