Jörn Friedrich Dreyer
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
jfd
dc3bec6211
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
2012-08-25 03:13:59 +02:00
Jenkins for ownCloud
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
Jenkins for ownCloud
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
Jenkins for ownCloud
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
Michael Gapczynski
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
Jenkins for ownCloud
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
Jenkins for ownCloud
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
Jenkins for ownCloud
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
Jenkins for ownCloud
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
Michael Gapczynski
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
Jenkins for ownCloud
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
Thomas Mueller
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
Bart Visscher
cb71996008
Change image links to use imagePath function
2012-08-12 22:30:13 +02:00
Lukas Reschke
5b16c7a25d
This is unnessecary because we already run htmlentities() over the template engine
2012-08-11 20:53:56 +02:00
Michael Gapczynski
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
Georg Ehrke
da4057ecfd
fix label for versioning in admin settings
2012-08-04 18:51:09 +02:00
Michael Gapczynski
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
Robin Appelman
8a19e134df
fix ununsed variables
2012-07-21 00:20:27 +02:00
Thomas Tanghus
748fcabba4
Added CSRF checks to files_versions. Expect some error messages - and report them ;)
2012-07-17 11:57:38 +02:00
Bjoern Schiessle
e248412ca9
use getStorage() to get versions location
...
update routine implemented
version number of files_versions increased
Conflicts:
apps/files_versions/lib/hooks.php
2012-07-11 11:06:29 +02:00
Bjoern Schiessle
bf09bcc854
add OCP\Files to access files
2012-07-10 19:22:06 +02: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
