Robin Appelman
|
207aa22d12
|
merge master into filesystem
|
2013-01-30 19:24:24 +01:00 |
Lukas Reschke
|
250c565d2b
|
Merge pull request #1360 from owncloud/display_name
introduction of display names
|
2013-01-29 14:05:54 -08:00 |
|
Robin Appelman
|
a67f11c8af
|
Sharing: partailly fix searchByMime
|
2013-01-28 21:25:19 +01:00 |
|
Robin Appelman
|
7207211f3a
|
change required ownCloud version to 4.91
|
2013-01-28 19:58:24 +01:00 |
|
Robin Appelman
|
74f6f85628
|
merge master into filesystem
|
2013-01-28 19:37:58 +01:00 |
|
Robin Appelman
|
c9c919da57
|
Move streamwrappers to seperate files and put them in a namespace
|
2013-01-28 15:34:15 +01:00 |
Thomas Müller
|
31d83fddc4
|
Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
|
2013-01-28 00:29:46 -08:00 |
|
Robin Appelman
|
bca5ce724e
|
Merge branch 'master' into filesystem
|
2013-01-28 02:35:51 +01:00 |
|
Jenkins for ownCloud
|
00a28062e1
|
[tx-robot] updated from transifex
|
2013-01-27 00:06:21 +01:00 |
|
Robin Appelman
|
930b9b9cd0
|
merge master into filesystem
|
2013-01-26 18:49:45 +01:00 |
|
Lukas Reschke
|
2e42c6f54f
|
Use HTML5 data attribute + fix undefined variable
|
2013-01-26 14:07:35 +01:00 |
|
Lukas Reschke
|
047f1988c3
|
Merge branch 'master' into no-inline-js
|
2013-01-25 16:11:07 +01:00 |
Björn Schießle
|
839f4bd949
|
show display name instead of uid in the public shared files view
|
2013-01-25 13:01:53 +01:00 |
|
Jenkins for ownCloud
|
6832dddf39
|
[tx-robot] updated from transifex
|
2013-01-25 00:05:56 +01:00 |
|
Jenkins for ownCloud
|
3ff32eba25
|
[tx-robot] updated from transifex
|
2013-01-24 00:07:38 +01:00 |
|
Thomas Mueller
|
5fadd53088
|
missing renames of publicListView to disableSharing
|
2013-01-23 09:18:26 +01:00 |
|
Lukas Reschke
|
9bc8df3649
|
Move publicListView to external JS
|
2013-01-21 20:36:19 +01:00 |
Michael Gapczynski
|
8ca30d244c
|
Implement getETag() in shared storage
|
2013-01-19 00:02:40 -05:00 |
|
Robin Appelman
|
5445b94416
|
merge master into filesystem
|
2013-01-16 19:04:50 +01:00 |
Bart Visscher
|
5bfe4adbaa
|
Whitespace cleanup
|
2013-01-16 18:09:16 +01:00 |
|
Robin Appelman
|
9bf367e7f8
|
merge master into filesystem
|
2013-01-15 14:57:23 +01:00 |
|
Michael Gapczynski
|
36cac7f924
|
Return NOT_FOUND in shared cache
|
2013-01-10 22:29:47 -05:00 |
|
Thomas Müller
|
60489764f3
|
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
add more linebreaks, replace SQL LIMIT with param
|
2013-01-10 15:14:14 -08:00 |
|
Jenkins for ownCloud
|
d03dce1283
|
[tx-robot] updated from transifex
|
2013-01-11 00:06:14 +01:00 |
|
Jenkins for ownCloud
|
912050afa0
|
[tx-robot] updated from transifex
|
2013-01-10 00:05:53 +01:00 |
Jörn Friedrich Dreyer
|
42e3eaf45a
|
add more linebreaks, replace SQL LIMIT with param
|
2013-01-09 13:57:51 +01:00 |
|
Michael Gapczynski
|
e8b195bf10
|
Almost fix Shared scanner...
|
2013-01-07 20:52:51 -05:00 |
|
Michael Gapczynski
|
8f8a5bbfb7
|
Maked Shared_Permissions extend Permissions class
|
2013-01-07 18:17:14 -05:00 |
|
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 |