Commit Graph

8504 Commits

Author SHA1 Message Date
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
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
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
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 8817b603d7 Fix scrolling of leftcontent 2013-01-21 18:29:18 +01:00
Björn Schießle 3fd28632c4 allow to look into deleted directories 2013-01-21 13:07:43 +01:00
Jenkins for ownCloud aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Thomas Müller b0716ba0e0 Merge pull request #1247 from owncloud/clear-queries-cache-on-schema-change-master
cached queries need to be reset on schema change because they become inv...
2013-01-20 14:00:15 -08:00
Thomas Mueller dea77b7610 cached queries need to be reset on schema change because they become invalid
fixes: https://github.com/owncloud/apps/issues/468
2013-01-20 22:46:26 +01:00
Jenkins for ownCloud ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Lukas Reschke 10a9ddd9b2 Merge pull request #1233 from owncloud/visualphpunit
Add listener for VisualPHPUnit
2013-01-19 11:25:31 -08:00
Lukas Reschke 8daefd00fb Sanitize the exception 2013-01-19 19:57:17 +01:00
Lukas Reschke 42b924da0e Also replace the backslash with a minus
For Windows systems
2013-01-19 19:47:26 +01:00
Bernhard Posselt f1939866f3 Merge pull request #1214 from Raydiation/master
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
Lukas Reschke 53b95cb8fd Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
Remove uneeded file
2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt ae244972cb Merge pull request #1228 from owncloud/generating_zip_message
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
Lukas Reschke 02bd8dd45a Change the second part of the notification 2013-01-19 13:12:27 +01:00
Michael Gapczynski bc8957a195 Add listener for VisualPHPUnit 2013-01-18 23:03:53 -05:00
Jenkins for ownCloud a17ca3a69a [tx-robot] updated from transifex 2013-01-19 00:05:38 +01:00
Lukas Reschke f447e6469f Remove uneeded file
I don't saw any usage of this file through the code, I assume it can
safely be removed.
2013-01-18 23:07:11 +01:00
Thomas Müller 31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
Lukas Reschke ad57db3e87 Make the message friendlier 2013-01-18 22:35:26 +01:00
Lukas Reschke edf3572835 Merge pull request #1224 from davidgumberg/patch-2
Typo fix (comment) /lib/base.php
2013-01-18 12:33:15 -08:00
Thomas Mueller 5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
davidgumberg 487e401361 Typo fix (comment) /lib/base.php 2013-01-18 10:52:29 -08:00
Björn Schießle adbc576439 handle group restore 2013-01-18 17:50:44 +01:00
Bart Visscher 9ffd4197ae Fix wrong word in comment 2013-01-18 16:38:40 +01:00
Björn Schießle d2c5f9bec7 fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails.
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
2013-01-18 15:14:42 +01:00
Björn Schießle 8fdcd72d7f expire files in trash bin after 30 days 2013-01-18 15:12:38 +01:00
Thomas Müller 0ed635240a Merge pull request #1205 from owncloud/ocs_api
Return 401 headers when trying to access a restricted api call
2013-01-18 05:52:51 -08:00
Björn Schießle ca14af2fdd remove unneeded function 2013-01-18 14:11:55 +01:00
Björn Schießle d16164b0cd remove item in the trash bin view after successful undelete 2013-01-18 14:09:22 +01:00