Michael Gapczynski
|
f4e4a06826
|
Forgot to select storage from filecache
|
2013-01-01 12:17:54 -05:00 |
Robin Appelman
|
0ac78a6411
|
Share: fix cache put function
|
2013-01-01 18:10:38 +01:00 |
|
Robin Appelman
|
4b65dd608a
|
Share: small phpdoc fixes
|
2013-01-01 18:07:10 +01:00 |
|
Robin Appelman
|
b41189de44
|
Cache: allow storage backends to overwrite Watcher
|
2013-01-01 18:04:29 +01:00 |
|
Michael Gapczynski
|
f2ca7023e1
|
Fix Shared root problems with Watcher and Quota proxy
|
2013-01-01 11:19:33 -05:00 |
|
Michael Gapczynski
|
d0a50fae83
|
Fix eTagUpdate and add tests
|
2012-12-31 18:16:44 -05:00 |
Jenkins for ownCloud
|
c6064a542c
|
[tx-robot] updated from transifex
|
2013-01-01 00:04:42 +01:00 |
Tom Needham
|
3d23e98390
|
Remove the WIP external sharing api
|
2012-12-31 16:31:22 +00:00 |
|
Tom Needham
|
8a5f583cac
|
Remove WIP OAuth code
|
2012-12-31 16:19:46 +00:00 |
|
Tom Needham
|
2ac616682e
|
Remove accidental submodule
|
2012-12-31 16:09:37 +00:00 |
|
Tom Needham
|
9626d9ce31
|
Code cleanup and add copyright info
|
2012-12-31 16:08:21 +00:00 |
|
Tom Needham
|
6eb194b702
|
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
|
2012-12-31 15:47:15 +00:00 |
|
Tom Needham
|
218a5ea890
|
Remove unused methods
|
2012-12-31 14:16:29 +00:00 |
|
Michael Gapczynski
|
aea8b0ff5c
|
Merge branch 'filesystem' into filesystem-etags
Conflicts:
lib/files/cache/updater.php
|
2012-12-30 21:26:48 -05:00 |
|
Michael Gapczynski
|
29b82ccdf3
|
Change length of etag field to 40
|
2012-12-30 21:23:54 -05:00 |
|
Michael Gapczynski
|
96e08a1d96
|
Fix function name
|
2012-12-30 21:23:17 -05:00 |
|
Michael Gapczynski
|
3ee3323b87
|
Fix retrieving of cache and scanner in Updater class
|
2012-12-30 20:27:38 -05:00 |
|
Michael Gapczynski
|
77f12c526b
|
Update etags in parent folders
|
2012-12-30 19:54:51 -05:00 |
|
Michael Gapczynski
|
83064aca51
|
Remove old etag code
|
2012-12-30 19:23:31 -05:00 |
|
Michael Gapczynski
|
a5cb7363a5
|
Use etags from file cache in SabreDAV connector
|
2012-12-30 19:18:05 -05:00 |
|
Jenkins for ownCloud
|
329bddab48
|
[tx-robot] updated from transifex
|
2012-12-31 00:05:31 +01:00 |
|
Michael Gapczynski
|
2c23e143d3
|
Store etags in the file cache
|
2012-12-30 16:32:55 -05:00 |
Lukas Reschke
|
f70f9f3bc4
|
Merge pull request #1043 from owncloud/fix_breadcrumb_slashes
Replace %2F with / in breadcrumbs
|
2012-12-30 08:56:32 -08:00 |
|
Jenkins for ownCloud
|
66e57f5fb1
|
[tx-robot] updated from transifex
|
2012-12-30 00:05:52 +01:00 |
Frank Karlitschek
|
e6de09c0a9
|
check if admin
|
2012-12-29 19:30:31 +00:00 |
|
Michael Gapczynski
|
7980bccaab
|
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
|
2012-12-29 19:30:31 +00:00 |
|
Jenkins for ownCloud
|
0229b070c9
|
[tx-robot] updated from transifex
|
2012-12-29 19:30:31 +00:00 |
|
Michael Gapczynski
|
f94c26e573
|
Change post_write hook to write to prevent creating a duplicate of the original file on upload
|
2012-12-29 19:30:31 +00:00 |
|
Thomas Mueller
|
314dd4bacc
|
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
|
2012-12-29 19:30:31 +00:00 |
|
Michael Gapczynski
|
d275725e23
|
No longer need to create folders locally for external storage mount points
|
2012-12-29 13:43:44 -05:00 |
|
Michael Gapczynski
|
cfc3526b25
|
Fix data for shared root folder
|
2012-12-29 11:45:13 -05:00 |
|
Michael Gapczynski
|
fb053f8e73
|
Fix retrieving of shared source paths
|
2012-12-29 11:09:57 -05:00 |
|
Thomas Müller
|
36da34e5f6
|
Merge pull request #902 from owncloud/storage-wording
Storage wording
|
2012-12-28 23:19:52 -08:00 |
|
Michael Gapczynski
|
b5b48428ab
|
Replace %2F with / in breadcrumbs
|
2012-12-28 19:41:37 -05:00 |
|
Michael Gapczynski
|
f922f836ce
|
Change old variable name $default_quota to $defaultQuota
|
2012-12-28 19:14:33 -05:00 |
|
Jenkins for ownCloud
|
9aefbea074
|
[tx-robot] updated from transifex
|
2012-12-29 00:08:28 +01:00 |
|
Thomas Mueller
|
a3206b4e97
|
only show the max possible upload of 2GB on a 32 bit system.
for a 64 bit system we have no such limitation
refs #856
Conflicts:
apps/files/templates/admin.php
|
2012-12-28 22:17:38 +01:00 |
|
Thomas Mueller
|
7b72424a39
|
Revert "fixed max possible upload size for files app in admin screen"
This reverts commit 7f2208b9a1.
Conflicts:
apps/files/admin.php
|
2012-12-28 22:14:32 +01:00 |
|
Michael Gapczynski
|
8bdfb04056
|
Fix shared folders
|
2012-12-28 15:06:12 -05:00 |
|
Jenkins for ownCloud
|
e9c51b319e
|
[tx-robot] updated from transifex
|
2012-12-28 00:20:34 +01:00 |
|
Michael Gapczynski
|
b035626709
|
Retrieve storage correctly, filename is not the mountpoint
|
2012-12-27 16:53:32 -05:00 |
|
Michael Gapczynski
|
65f1e52107
|
Change old is_readable to isReadable, fixes downloads
|
2012-12-27 15:49:48 -05:00 |
|
Jenkins for ownCloud
|
27f9ea2abb
|
[tx-robot] updated from transifex
|
2012-12-27 00:05:17 +01:00 |
|
Michael Gapczynski
|
1910057900
|
Fix shared statuses inside folders
|
2012-12-26 16:20:10 -05:00 |
|
Michael Gapczynski
|
b4515d874e
|
Only folders have Create permission
|
2012-12-26 15:36:50 -05:00 |
|
Jenkins for ownCloud
|
b7257b2524
|
[tx-robot] updated from transifex
|
2012-12-26 00:12:10 +01:00 |
|
Robin Appelman
|
7e36f730ec
|
merge master into filesystem
|
2012-12-25 14:29:29 +01:00 |
|
Jenkins for ownCloud
|
5d59ac0739
|
[tx-robot] updated from transifex
|
2012-12-25 00:11:11 +01:00 |
|
Jenkins for ownCloud
|
7d52c39419
|
[tx-robot] updated from transifex
|
2012-12-24 00:12:16 +01:00 |
|
Frank Karlitschek
|
15da11effe
|
Merge pull request #845 from owncloud/sqlite_error
Try to fix #836
|
2012-12-22 15:22:09 -08:00 |