Michael Gapczynski
|
a7d4d04223
|
Fix mimetypes in shared cache
|
2013-01-07 15:27:22 -05:00 |
Robin Appelman
|
e8d08d4930
|
merge master into filesystem
|
2013-01-07 00:16:10 +01:00 |
|
Michael Gapczynski
|
0b13b41189
|
Merge pull request #1053 from owncloud/ocs_api
External API for ownCloud based on OCS
|
2013-01-04 17:18:58 -08:00 |
|
Michael Gapczynski
|
f144be8857
|
Don't mount shared storage unless there are shared files
|
2013-01-03 11:37:19 -05:00 |
|
Robin Appelman
|
e40be93e87
|
merge master into filesystem
|
2013-01-03 15:59:17 +01:00 |
Jenkins for ownCloud
|
3bcdd8c900
|
[tx-robot] updated from transifex
|
2013-01-03 00:05:19 +01:00 |
|
Michael Gapczynski
|
a1f7c28e28
|
Use the source Scanner for shared storage when the path is specified
|
2013-01-01 14:47:25 -05:00 |
|
Michael Gapczynski
|
fe90130618
|
Initialize storageId variable in shared cache
|
2013-01-01 14:24:18 -05:00 |
|
Michael Gapczynski
|
268c7acfc4
|
Actually add Shared_Watcher
|
2013-01-01 13:16:42 -05:00 |
|
Michael Gapczynski
|
3b67613afc
|
Remove Shared_Scanner and add Shared_Watcher instead
|
2013-01-01 12:43:38 -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 |
|
Michael Gapczynski
|
f2ca7023e1
|
Fix Shared root problems with Watcher and Quota proxy
|
2013-01-01 11:19:33 -05:00 |
Tom Needham
|
3d23e98390
|
Remove the WIP external sharing api
|
2012-12-31 16:31:22 +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 |
|
Jenkins for ownCloud
|
329bddab48
|
[tx-robot] updated from transifex
|
2012-12-31 00:05:31 +01:00 |
|
Jenkins for ownCloud
|
66e57f5fb1
|
[tx-robot] updated from transifex
|
2012-12-30 00:05:52 +01: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 |
|
Michael Gapczynski
|
8bdfb04056
|
Fix shared folders
|
2012-12-28 15:06:12 -05:00 |
|
Michael Gapczynski
|
1910057900
|
Fix shared statuses inside folders
|
2012-12-26 16:20:10 -05:00 |
|
Robin Appelman
|
7e36f730ec
|
merge master into filesystem
|
2012-12-25 14:29:29 +01:00 |
|
Jenkins for ownCloud
|
0656b41747
|
[tx-robot] updated from transifex
|
2012-12-23 00:10:23 +01:00 |
|
Jenkins for ownCloud
|
a4b0df419e
|
[tx-robot] updated from transifex
|
2012-12-18 00:14:58 +01:00 |
Tom Needham
|
3c98f36121
|
Merge branch 'master' into ocs_api
|
2012-12-16 22:29:00 +00:00 |
|
Michael Gapczynski
|
bf05ff351f
|
Initial support for file sharing with filesystem branch
|
2012-12-15 19:44:59 -05:00 |
|
Robin Appelman
|
946d58eaa8
|
merge master into filesystem
|
2012-12-15 02:21:26 +01:00 |
Bart Visscher
|
2ef2dc4dda
|
Fix "There must be a single space between the closing parenthesis and the opening brace"
|
2012-12-15 00:43:46 +01:00 |
|
Tom Needham
|
5fe6129698
|
Merge master into ocs_api, fix conflicts.
|
2012-12-14 15:15:05 +00:00 |
|
Thomas Müller
|
8b4aad73c7
|
Merge pull request #810 from owncloud/send-share-link-by-email
restoring feature to send sharing link via email
|
2012-12-12 04:54:51 -08:00 |
|
Robin Appelman
|
7969d6e646
|
Merge branch 'master' into filesystem
|
2012-12-11 23:57:59 +01:00 |
|
Thomas Mueller
|
162a2c0fba
|
moving sharing email code to core
|
2012-12-10 23:22:42 +01:00 |
|
Thomas Mueller
|
45074d5023
|
restoring feature to send sharing link via email
|
2012-12-10 18:41:08 +01:00 |
|
Jenkins for ownCloud
|
a444999a8c
|
[tx-robot] updated from transifex
|
2012-12-10 00:12:32 +01:00 |
|
Robin Appelman
|
98f42d314c
|
merge master into filesystem
|
2012-12-06 17:47:28 +01:00 |
Björn Schießle
|
bf0f39f5b4
|
make sure that all expected array keys are available
|
2012-12-06 15:57:53 +01:00 |
|
Jenkins for ownCloud
|
524f3c3c0b
|
[tx-robot] updated from transifex
|
2012-12-05 00:04:55 +01:00 |
|
Thomas Mueller
|
18663100d9
|
fixing syntax error + reformat the code
|
2012-12-02 12:12:20 +01:00 |
|
Robin Appelman
|
72b6faa69d
|
merge master into filesystem
|
2012-12-02 03:03:48 +01:00 |
|
Robin Appelman
|
d33f697a5f
|
merge master into filesystem
|
2012-11-30 00:18:42 +01:00 |
|
Jenkins for ownCloud
|
16a630024c
|
[tx-robot] updated from transifex
|
2012-11-30 00:05:16 +01:00 |
|
Jenkins for ownCloud
|
1d4d4fd678
|
[tx-robot] updated from transifex
|
2012-11-28 00:11:21 +01:00 |
Jörn Friedrich Dreyer
|
71e8755d31
|
Merge pull request #380 from butonic/feature_share_link_with_token
Feature share link with token
|
2012-11-26 07:42:53 -08:00 |
|
Jörn Friedrich Dreyer
|
995b5c0739
|
readd fallback code for pre token links
|
2012-11-23 15:51:57 +01:00 |
|
Robin Appelman
|
95057e727d
|
merge master into filesystem
|
2012-11-23 00:40:58 +01:00 |
|
Thomas Müller
|
c773d071ee
|
Merge pull request #506 from owncloud/fix_505
refs #505 - defining publicListView based on template parameter
|
2012-11-22 02:53:10 -08:00 |
|
Jenkins for ownCloud
|
3a5f5e127c
|
[tx-robot] updated from transifex
|
2012-11-22 00:02:16 +01:00 |
|
Robin Appelman
|
97380f3485
|
merge master into filesystem
|
2012-11-21 22:37:14 +01:00 |
|
Jenkins for ownCloud
|
9204be827b
|
[tx-robot] updated from transifex
|
2012-11-21 00:02:33 +01:00 |
|
Jörn Friedrich Dreyer
|
d8a171df26
|
implement share via link token
|
2012-11-20 15:03:12 +01:00 |