Commit graph

4318 commits

Author SHA1 Message Date
Björn Schießle
d6adab6734 improved message if trash bin is empty 2013-01-30 10:07:29 +01:00
Björn Schießle
0c8bcacdc8 added some additional error handling 2013-01-29 13:36:33 +01:00
Björn Schießle
eafd34684c seperate css no longer needed, use files app css instead 2013-01-29 10:08:41 +01:00
Björn Schießle
d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Björn Schießle
320233ec3d merge conflict fixed 2013-01-28 15:10:00 +01:00
Björn Schießle
f28857377d use hidden input field to disable sharing 2013-01-28 11:28:16 +01:00
Björn Schießle
8067a1394e fix merge conflicts 2013-01-28 11:18:04 +01:00
Thomas Müller
31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Michael Gapczynski
10c428830e Add create permission, fixes #780 2013-01-27 23:31:31 -05:00
Jenkins for ownCloud
b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Lukas Reschke
2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke
6c882d9806 Remove outdated comments 2013-01-26 14:03:17 +01:00
Thomas Müller
276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Jenkins for ownCloud
af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
Lukas Reschke
047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Jenkins for ownCloud
6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Thomas Mueller
ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Björn Schießle
dbb0d04073 restore file in the root folder if the origin folder is not writable 2013-01-24 15:29:22 +01:00
Jenkins for ownCloud
3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Björn Schießle
6ab95e8e33 code clean-up 2013-01-23 11:30:42 +01:00
Lukas Reschke
c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Thomas Mueller
5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Jenkins for ownCloud
c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Björn Schießle
367aadb3b7 rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view 2013-01-22 18:34:59 +01:00
Sam Tuke
aa648fca75 Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
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
16ae902e31 no undo notification for deleted file, we use the trash bin instead 2013-01-22 17:43:46 +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
Lukas Reschke
bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Lukas Reschke
8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Lukas Reschke
9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Lukas Reschke
0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Jenkins for ownCloud
aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00