summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-202-9/+58
* Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-2046-690/+0
|\
| * cleanup languages. closes #11274Volkan Gezer2014-11-2046-690/+0
* | Merge pull request #12226 from owncloud/remove-phpassThomas Müller2014-11-203-12/+40
|\ \
| * | Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-173-12/+40
* | | Merge pull request #12297 from owncloud/issue/10991-all-testcaseMorris Jobke2014-11-2040-99/+176
|\ \ \ | |_|/ |/| |
| * | Make apps/ extend the \Test\TestCase and fix overwritten methodsJoas Schilling2014-11-1939-90/+160
| * | Use base class to reset the file mapperJoas Schilling2014-11-192-9/+16
* | | Merge pull request #12305 from owncloud/sharelist-nodeleteMorris Jobke2014-11-202-12/+30
|\ \ \ | |/ / |/| |
| * | JSHint fixes in sharedfilelistSpec unit test fileVincent Petry2014-11-191-1/+3
| * | Remove delete button in shared with others listVincent Petry2014-11-192-11/+27
* | | Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2Lukas Reschke2014-11-191-0/+8
|\ \ \
| * | | Show warning when invalid user was passedVincent Petry2014-11-141-0/+8
* | | | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPasswordLukas Reschke2014-11-193-0/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | listen to the post_passwordReset hook, backup the old keys and create a new k...Bjoern Schiessle2014-11-173-0/+26
* | | | Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-ena...Morris Jobke2014-11-193-1/+36
|\ \ \ \
| * | | | Only show undelete capability if files_trashbin is enabledLukas Reschke2014-11-183-1/+36
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-194-8/+8
|/ / / /
* | | | $file only contains the filename and not the absolute path, that means that f...Lukas Reschke2014-11-181-1/+1
* | | | Merge pull request #12220 from owncloud/remove-unused-codeMorris Jobke2014-11-183-373/+0
|\ \ \ \
| * | | | Remove unused codeLukas Reschke2014-11-173-373/+0
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-182-0/+16
| |/ / |/| |
* | | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-1714-264/+410
|\ \ \ | |/ / |/| |
| * | Correctly restore previous root mount point after testingJoas Schilling2014-11-171-2/+12
| * | Fix single run of encryption tests and usages of uniqid() and fopen()Joas Schilling2014-11-1712-259/+376
| * | Skip some more tests on Windows which just can not work at allJoas Schilling2014-11-172-3/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-174-16/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-162-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-152-8/+8
* | | Added download size on public sharingVincent Cloutier2014-11-143-2/+4
* | | Refactor file sharing public link handlingLukas Reschke2014-11-1412-219/+732
* | | Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamenameJörn Friedrich Dreyer2014-11-141-4/+1
|\ \ \
| * | | Do not remove dir entry if it has the same name as the parentVincent Petry2014-11-131-4/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-142-2/+8
|/ / /
* | | Merge pull request #12005 from owncloud/bower-multiselectblizzz2014-11-134-2/+750
|\ \ \
| * | | Migrate multiselect to user_ldapMorris Jobke2014-11-134-2/+750
* | | | Merge pull request #9177 from owncloud/jsdocexperimentVincent Petry2014-11-1319-64/+343
|\ \ \ \
| * | | | Improved Javascript docs for JSDocVincent Petry2014-10-3119-64/+343
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-136-12/+12
| |/ / / |/| | |
* | | | Merge pull request #12087 from AdamWill/google-touchVincent Petry2014-11-121-1/+4
|\ \ \ \
| * | | | fix touch() when $mtime is set (Google wants RFC3339) #11267Adam Williamson2014-11-101-1/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1212-4/+30
* | | | | Fix infinite loop if count and limit is 0Morris Jobke2014-11-111-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #11789 from owncloud/fix-11762Morris Jobke2014-11-112-3/+29
|\ \ \ \
| * | | | dont fail with 500 if configured display name attribute is not setArthur Schiwon2014-10-272-3/+29
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1110-18/+18
| |/ / / |/| | |
* | | | Merge pull request #10966 from owncloud/storage-root-share-permissionsMorris Jobke2014-11-102-0/+90
|\ \ \ \
| * | | | Add unit testsRobin Appelman2014-10-311-0/+85
| * | | | Keep the share permissions from mountpointsRobin Appelman2014-10-311-1/+2
| * | | | Dont' use mountpoint permissions as share permissions for external storagesRobin Appelman2014-10-311-0/+4