summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* always create a new instance of the encryption moduleBjoern Schiessle2015-04-172-8/+13
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-1732-28/+274
|
* Merge pull request #15675 from owncloud/enc_error_messagesClark Tomlinson2015-04-166-10/+155
|\ | | | | [encryption] display warning if password changed or if the keys are not initialized
| * display warning if password changed or if the keys are not initializedBjoern Schiessle2015-04-166-10/+155
| |
* | Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-1612-15/+813
|\ \ | |/ |/| add migration script from old encryption to new one
| * decrypt private key for public shares correctlyBjoern Schiessle2015-04-163-4/+4
| |
| * fix decryption of legacy private keyBjoern Schiessle2015-04-161-1/+0
| |
| * add versionBjoern Schiessle2015-04-161-0/+1
| |
| * add migration script from old encryption to new oneBjoern Schiessle2015-04-167-10/+808
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1626-6/+224
| |
* | Merge pull request #15654 from owncloud/enc2_header_system_keysMorris Jobke2015-04-152-2/+4
|\ \ | | | | | | make sure that encrypted private keys always have a header
| * | make sure that encrypted private keys always have a headerBjoern Schiessle2015-04-152-2/+4
| |/
* | Add visibility for methodMorris Jobke2015-04-151-1/+1
| |
* | Fix SFTP storage id to be compatible with older idsVincent Petry2015-04-152-1/+66
| | | | | | | | | | | | Remove port from SFTP storage id if it is 22. This will prevent recreating a different storage entry due to id mismatch after upgrade.
* | Merge pull request #15613 from owncloud/allow-files-nav-iconsThomas Müller2015-04-151-1/+1
|\ \ | |/ |/| Allow files app nav entries to have a different icon class
| * Allow files app nav entries to have a different icon classMorris Jobke2015-04-141-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-152-0/+26
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-14400-3140/+3916
| |
* | Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-143-21/+1
|\ \ | |/ |/| Fix file size of encrypted files
| * 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
|\ \ | |/ |/| Proper copy/move between multiple local storages
| * 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 filepicker
| * | fix filepickerMorris Jobke2015-04-132-4/+27
| | | | | | | | | | | | | | | | | | * add ability to filter for mimetype * fixes #15526 * fixes #11563
* | | 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 point
| * | Properly add trailing slash to mount pointVincent Petry2015-04-131-3/+9
| |/ | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name
* / Do not try to make user subadmin of group twiceRoeland Jago Douma2015-04-132-0/+29
|/ | | | | | | If the provisioning api is used to make a user subadmin of a group that user is already a subadmin just return success. Added unit test to ensure things keep working.
* Merge pull request #15535 from owncloud/smb-1.0.0Morris Jobke2015-04-107-16/+38
|\ | | | | update icewind/smb to 1.0.0
| * 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.php
| * | 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
|\ \ \ | | | | | | | | Dont hide exceptions master
| * | | 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
| | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/tests/user_ldap.php
| * | | do not hide exception when ldap server has a hiccupJörn Friedrich Dreyer2015-04-103-17/+10
| |/ /
* | | Merge pull request #15537 from ↵Morris Jobke2015-04-101-1/+3
|\ \ \ | |_|/ |/| | | | | | | | owncloud/master-fixunittestrelatedtoorphanedshares2 Fix master unit test: Clear leftover shares from other tests
| * | 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
|/ | | | | | | Added InvalidArgumentException to catch HTML parsing errors when XML was expected. Made convertSabreException more generic to be able to handle more exception cases.
* Merge pull request #15521 from owncloud/shareinfo-catchguzzle503Morris Jobke2015-04-101-0/+5
|\ | | | | Properly catch guzzle 503 when querying share info
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 13:28:13 +0000