summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-143-21/+1
|\
| * remove calculateUnencryptedSize() - not neededThomas Müller2015-04-142-20/+0
| * fix reading of private keyThomas Müller2015-04-141-1/+1
* | Merge pull request #13360 from owncloud/cross-storage-moveMorris Jobke2015-04-143-10/+103
|\ \ | |/ |/|
| * a bit more phpdocRobin Appelman2015-04-141-0/+6
| * add missing return for sharedRobin Appelman2015-04-131-2/+2
| * properly return false if we cant delete the source fileRobin Appelman2015-04-131-4/+5
| * Fix testRobin Appelman2015-04-131-2/+8
| * Implement move/copyFromStorage for shared storageRobin Appelman2015-04-132-6/+86
* | Merge pull request #15566 from owncloud/fix-filepickerThomas Müller2015-04-142-4/+27
|\ \
| * | fix filepickerMorris Jobke2015-04-132-4/+27
* | | Fix cross storage move with shared storagesRobin Appelman2015-04-132-11/+11
* | | check that we know the parentRobin Appelman2015-04-131-3/+5
* | | check for source cacheRobin Appelman2015-04-131-1/+3
| |/ |/|
* | Merge pull request #15570 from owncloud/shares-properlyformatmountpointMorris Jobke2015-04-131-3/+9
|\ \
| * | Properly add trailing slash to mount pointVincent Petry2015-04-131-3/+9
| |/
* / Do not try to make user subadmin of group twiceRoeland Jago Douma2015-04-132-0/+29
|/
* Merge pull request #15535 from owncloud/smb-1.0.0Morris Jobke2015-04-107-16/+38
|\
| * update icewind/smb to 1.0.0Robin Appelman2015-04-107-16/+38
* | Merge pull request #15538 from owncloud/encryption-crypt-testsClark Tomlinson2015-04-102-29/+283
|\ \
| * | add unit test for crypt.phpBjoern Schiessle2015-04-102-29/+283
* | | Merge pull request #15489 from owncloud/dont_hide_exceptions_masterThomas Müller2015-04-104-68/+218
|\ \ \
| * | | fix cherrypickingJörn Friedrich Dreyer2015-04-103-15/+18
| * | | fix typo and commentMorris Jobke2015-04-102-3/+3
| * | | throw exception if setup is incompleteMorris Jobke2015-04-101-1/+3
| * | | fix_testsJörn Friedrich Dreyer2015-04-103-49/+201
| * | | do not hide exception when ldap server has a hiccupJörn Friedrich Dreyer2015-04-103-17/+10
| |/ /
* | | Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedsh...Morris Jobke2015-04-101-1/+3
|\ \ \ | |_|/ |/| |
| * | Clear leftover shares from other testsVincent Petry2015-04-101-1/+3
| |/
* | Fix converting Guzzle error codes in s2s storageVincent Petry2015-04-101-10/+13
* | Catch more exceptions when connecting to remote DAV serverVincent Petry2015-04-101-0/+2
|/
* Merge pull request #15521 from owncloud/shareinfo-catchguzzle503Morris Jobke2015-04-101-0/+5
|\
| * Properly catch guzzle 503 when querying share infoVincent Petry2015-04-091-0/+5
* | Merge pull request #15437 from owncloud/deleteorphanedfilesThomas Müller2015-04-103-0/+180
|\ \
| * | [command] delete orphaned file cache entriesMorris Jobke2015-04-083-0/+180
* | | Merge pull request #15492 from owncloud/ldap-wizard-overhaulblizzz2015-04-0961-1630/+5143
|\ \ \
| * | | change default value of ldap_tls to 0. It will be detected anyway, but starti...Arthur Schiwon2015-04-092-1/+4
| * | | compile user and login filter on the first time automatically, if a suggestio...Arthur Schiwon2015-04-094-0/+10
| * | | escape filter for outputArthur Schiwon2015-04-091-1/+1
| * | | fix number and insert position when adding/copying a configArthur Schiwon2015-04-091-2/+2
| * | | update back/continue buttons also on tab clickArthur Schiwon2015-04-093-3/+8
| * | | cleanupArthur Schiwon2015-04-091-2/+0
| * | | newlines at end of fileArthur Schiwon2015-04-0912-14/+11
| * | | docArthur Schiwon2015-04-091-2/+2
| * | | move script and style inclusions into templateArthur Schiwon2015-04-092-46/+53
| * | | run functionality checks also when host field changesArthur Schiwon2015-04-091-1/+1
| * | | adjust testsArthur Schiwon2015-04-091-6/+9
| * | | LDAP Wizard OverhaulArthur Schiwon2015-04-0961-1620/+5110
* | | | Merge pull request #15511 from owncloud/fix-typosLukas Reschke2015-04-093-9/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix typos and some other adjustmentsLukas Reschke2015-04-093-9/+12