Robin Appelman
|
83d6221322
|
merge master into filesytem
|
2013-01-20 03:11:04 +01:00 |
Michael Gapczynski
|
cd8d8360b0
|
Disable fancy folder sharing for now
|
2013-01-18 23:57:13 -05:00 |
|
Michael Gapczynski
|
5df6f9d14d
|
Fix merge
|
2013-01-18 23:56:47 -05:00 |
Thomas Müller
|
31cc9aa80d
|
Merge pull request #986 from owncloud/fixing-784-master
the maximum upload size is now part of the response of the upload and de...
|
2013-01-18 14:06:00 -08:00 |
|
Thomas Mueller
|
5ff29b4348
|
fixing indent
|
2013-01-18 20:09:03 +01: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 |
|
Bart Visscher
|
a8f963d9cf
|
Spaces to tabs
|
2013-01-16 18:09:16 +01:00 |
|
Thomas Müller
|
4668f8c86e
|
Merge pull request #1178 from owncloud/return_true_because_of_ponies
Remove uneeded return
|
2013-01-15 14:01:48 -08:00 |
|
Thomas Mueller
|
388bb6a5e1
|
Merge branch 'master' into fixing-unused-and-undefined-in-master
|
2013-01-14 23:41:34 +01:00 |
Lukas Reschke
|
cc00c54f6a
|
Remove uneeded returns
|
2013-01-14 20:18:08 +01:00 |
|
Thomas Mueller
|
23896a7290
|
Merge branch 'master' into fixing-784-master
Conflicts:
apps/files/js/files.js
|
2013-01-11 09:53:12 +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 |
|
Robin Appelman
|
e8d08d4930
|
merge master into filesystem
|
2013-01-07 00:16:10 +01:00 |
|
Thomas Mueller
|
a21da9f9fd
|
fixing returns
|
2013-01-06 23:59:02 +01:00 |
|
Thomas Mueller
|
1093cdd823
|
fixing returns
|
2013-01-06 23:57:27 +01:00 |
|
Thomas Mueller
|
19edb29cc3
|
add missing return
|
2013-01-06 23:54:18 +01:00 |
|
Thomas Mueller
|
cdd28fcc46
|
fixing undefined variable $where
|
2013-01-06 23:48:04 +01:00 |
|
Thomas Mueller
|
bae1755184
|
Merge branch 'master' into fixing-784-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
|
2013-01-06 22:40:35 +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 |
|
Robin Appelman
|
e40be93e87
|
merge master into filesystem
|
2013-01-03 15:59:17 +01:00 |
|
Robin Appelman
|
54f6f1e6b7
|
phpdoc fixes for public api
|
2013-01-02 16:38:20 +01:00 |
|
Michael Gapczynski
|
f4e4a06826
|
Forgot to select storage from filecache
|
2013-01-01 12:17:54 -05: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 |
|
Michael Gapczynski
|
cfc3526b25
|
Fix data for shared root folder
|
2012-12-29 11:45:13 -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 |
|
Thomas Müller
|
986f5d9f3e
|
fixing variable name
|
2012-12-21 00:04:58 +01:00 |
|
Thomas Müller
|
39d874cd90
|
the maximum upload size is now part of the response of the upload and delete operation.
the maximum upload size is updated within the browser once an upload or delete operation has been finished
|
2012-12-20 17:16:53 +01:00 |
Randolph Carter
|
d2828bab07
|
fixes default email sender address
|
2012-12-19 01:09:14 +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
|
68562dafb4
|
More whitespace fixes
|
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 |
blizzz
|
680ff3a51b
|
Merge pull request #584 from wardragon/ldap_access_userExists_fix
Really fix OCP\Share::shareItem with LDAP users
|
2012-12-12 16:59:43 -08:00 |
|
Thomas Mueller
|
8ed0ce7801
|
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data
|
2012-12-11 17:42:09 +01:00 |
|
Thomas Mueller
|
4cc895aa0a
|
[contacts_api] move addressbook to it's own file
|
2012-12-08 16:42:54 +01:00 |
Lorenzo M. Catucci
|
15afbfd198
|
Add an $excludingBackend optional parameter
to the userExists method both in OCP\User and in OC_User.
|
2012-12-07 17:19:26 +01:00 |
|
Thomas Mueller
|
889e55fdac
|
[contacts_api] update documentation
|
2012-12-06 23:51:35 +01:00 |
|
Thomas Mueller
|
35e55214e2
|
[Contacts API] example for searching added
|
2012-12-02 11:54:30 +01:00 |
|
Robin Appelman
|
d33f697a5f
|
merge master into filesystem
|
2012-11-30 00:18:42 +01:00 |
|
Thomas Mueller
|
f99497a05a
|
test for search and unregister added
|
2012-11-28 23:10:30 +01:00 |
|
Thomas Mueller
|
2d597c2238
|
first unit tests implemented
|
2012-11-28 23:10:00 +01:00 |
|
Thomas Mueller
|
5b1dea56e5
|
change name to IAddressBook
|
2012-11-28 23:08:15 +01:00 |
|
Thomas Mueller
|
fba8c776e1
|
plugin mechanism implemented
|
2012-11-28 23:07:09 +01:00 |
|
Jörn Friedrich Dreyer
|
eaa625c9bc
|
Merge pull request #401 from owncloud/share_hooks
Create functions to install standard hooks
|
2012-11-28 04:35:52 -08:00 |
|
Jörn Friedrich Dreyer
|
995b5c0739
|
readd fallback code for pre token links
|
2012-11-23 15:51:57 +01:00 |
|
Robin Appelman
|
97380f3485
|
merge master into filesystem
|
2012-11-21 22:37:14 +01:00 |