Commit Graph

75 Commits

Author SHA1 Message Date
Sam Tuke 8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Jörn Friedrich Dreyer e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Frank Karlitschek b967530795 increase the time limit again to a sensible granularity of 1 min.
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
Bjoern Schiessle 51774cca6b use OC_Filesystem for rollback 2012-07-05 14:20:40 +02:00
Bjoern Schiessle 55cde0e5aa moved remove and rename hook to libs/hooks.php 2012-07-05 11:35:08 +02:00
Sam Tuke b1c9785eb3 Merge branch 'master' of gitorious.org:owncloud/owncloud
Conflicts:
	apps/files_versions/lib/versions.php
2012-07-03 18:17:32 +01:00
Sam Tuke a775deaf22 Moved hooks and versions.php into new lib directory
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
2012-07-03 17:42:51 +01:00
Bjoern Schiessle aec6eea235 use filesystem abstraction layer to copy file versions 2012-07-03 18:25:49 +02:00
Bjoern Schiessle bdd1baeb85 use public API 2012-06-28 14:18:57 +02:00
Bjoern Schiessle e5792cc064 adjust the name and/or location of the stored versions if the actual file gets moved or renamed 2012-06-28 14:06:20 +02:00
Bjoern Schiessle f22f49671b move hook to erase versions from deleted files to the right place 2012-06-28 12:42:47 +02:00
Bjoern Schiessle 52f99a7570 delete file versions if the user deletes a file 2012-06-28 11:48:57 +02:00
Bjoern Schiessle dac539b619 handover the correct timestamp 2012-06-28 11:46:17 +02:00
Bjoern Schiessle c67ae2e7f1 no reason to strip tags at this point 2012-06-27 15:56:14 +02:00
Bjoern Schiessle d5237c42bc Util::formatDate() expect $timestamp as double 2012-06-27 15:05:40 +02:00
Brice Maron d39d7fb9ff Remove references to /apps/ and correct inclusion of settings 2012-06-22 22:05:39 +00:00
Sam Tuke a9a913c273 Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
Sam Tuke 7c3f6f61db Fixed missing jQuery event object - expire interface now works with Firefox 2012-06-21 14:54:24 +01:00
Sam Tuke 72215a818d added new user settings interface for deleting old file versions
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
Bart Visscher cd934d5d89 Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible 2012-06-20 17:10:49 +02:00
Sam Tuke 28a72e0e3c Fixed deleteAll function for deleting all old versions of files (expireAll)
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
Frank Karlitschek 7e931575b4 comment out non working code 2012-06-05 09:28:51 +02:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Frank Karlitschek 5f4132d6ba more fixes 2012-05-31 21:16:36 +02:00
Frank Karlitschek 57a56299d8 more fixes
i don´t understand why this worked before.
2012-05-31 21:10:03 +02:00
Bart Visscher a33f580db1 Remove OC_App::register function
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Sam Tuke 27f7dae932 removed closing php tag 2012-05-22 13:42:55 +01:00
Michael Gapczynski 35bd601215 Fix check for when to store a new version of a file 2012-05-18 22:27:43 -04:00
Michael Gapczynski f750da1802 Fix revert link on history page of file versions 2012-05-18 22:07:48 -04:00
Michael Gapczynski 89f5701d1a Fix versioning of shared files 2012-05-18 22:07:48 -04:00
Michael Gapczynski ea7456a06a Forgot to actually call remove on the history dropdown 2012-05-18 10:53:58 -04:00
Michael Gapczynski fcb4d2aaee Remove the history dropdown before creating a new one 2012-05-18 10:42:49 -04:00
Michael Gapczynski 122d1efecf Don't show the select form in the history dropdown if a file has no other versions 2012-05-18 10:39:43 -04:00
Frank Karlitschek 9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Georg Ehrke 73a72054a3 fix call of all versions page 2012-05-18 12:00:35 +02:00
Michael Gapczynski 5b42325b01 History dropdown clean-up 2012-05-17 18:57:52 -04:00
Tom Needham 74d49920f2 Close history dropdown on success. Avoids confusion. 2012-05-17 21:22:48 +00:00
Robin Appelman bfdb374a2c allow reverting file from history dropdown 2012-05-17 02:16:33 +02:00
Robin Appelman 4ccfd27fa2 fix versioning for movable apps 2012-05-17 01:53:23 +02:00
Sam Tuke 9acd1065b0 made initial testing version of expireAll for version control \ngave some old vars new camelcase names 2012-05-16 18:30:26 +01:00
Sam Tuke fefa4412c4 added phpdoc comment 2012-05-16 15:17:51 +01:00
Sam Tuke c0df40084a added recognition of which version is 'current' - which is currently live and in use on history page 2012-05-16 15:00:36 +01:00
Sam Tuke a00c5ac78c fixed some include path issues
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Robin Appelman 6779f28af4 cache app types during install or update 2012-05-14 22:49:31 +02:00
Klaas Freitag 1fc74ea174 Add ctmp extension to blacklist to make sync test files not versioned. 2012-05-14 10:51:41 +02:00
Sam Tuke d98d72aa99 improved url generation - made use of OC.linkTo() for linking to versions history page 2012-05-11 17:13:58 +01:00
Sam Tuke 03fad97764 fixed some include path issues
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-11 13:17:37 +01:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00