summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-3022-2/+50
|
* Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfilesBjörn Schießle2015-05-292-1/+15
|\ | | | | Abort expiration when file is gone
| * Abort expiration when file is goneVincent Petry2015-05-292-1/+15
| | | | | | | | | | | | | | Sometimes a background job for versions expiration was scheduled for a file that has been moved or deleted since. This prevents showing useless warnings in the log and simply bail out.
* | Merge pull request #16517 from owncloud/remove-logo-wideThomas Müller2015-05-291-4/+14
|\ \ | | | | | | replace logo-wide on share page as well with better icon + text
| * | replace logo-wide on share page as well with better icon + textJan-Christoph Borchardt2015-05-221-4/+14
| | |
* | | Missing translation in ldap part.wizard-server.phpMartin2015-05-291-3/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-298-2/+12
| | |
* | | Merge pull request #16607 from owncloud/ie9-textpreviewfallbackThomas Müller2015-05-281-1/+1
|\ \ \ | | | | | | | | Fallback to picture preview for IE <= 9
| * | | Fallback to picture preview for IE <= 9Vincent Petry2015-05-281-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | IE 9 and below do not provide window.btoa and there is currently no way to generate base64 strings without introducting further dependencies. So for now the solution is to fall back to the ugly picture mode for text files whenever IE <= 9 is used.
* | | Merge pull request #16585 from ↵Thomas Müller2015-05-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | mmattel/Missing_translation_in_External_storage_back_end Make string 'SFTP with secret key login' translateable
| * | | Make string 'SFTP with secret key login' translatableMartin2015-05-271-1/+1
| | | |
* | | | Return 404 in shareinfo.php when outgoing s2s disabledVincent Petry2015-05-281-0/+5
| |/ / |/| |
* | | Merge pull request #16591 from owncloud/enc_improved_error_messageBjörn Schießle2015-05-287-8/+116
|\ \ \ | | | | | | | | improved error message for various states
| * | | detect migration statusBjoern Schiessle2015-05-276-7/+115
| | | |
| * | | improve error messages displayed to the userBjoern Schiessle2015-05-271-1/+1
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-05-2810-58/+90
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-272-2/+2
| |
* | Merge pull request #15985 from owncloud/hotfix/fix-encryption-referencesBjörn Schießle2015-05-263-30/+1
|\ \ | | | | | | [enc2] fix references to legacy encryption app name
| * | removing encryption preview checkClark Tomlinson2015-05-181-3/+0
| | |
| * | removing deletion of encryption keysClark Tomlinson2015-05-181-26/+0
| | | | | | | | | | | | this will be handled in the wrapper now
| * | fix references to legacy encryption app nameClark Tomlinson2015-05-183-3/+3
| | |
* | | Merge pull request #16532 from owncloud/cors-no-cookie-authVincent Petry2015-05-261-2/+0
|\ \ \ | | | | | | | | Disallow cookie auth for cors requests
| * | | disallow cookie auth for cors requestsBernhard Posselt2015-05-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing ... fixes fix test add php doc fix small mistake add another phpdoc remove not working cors annotations from files app
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-264-4/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-252-0/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2412-12/+144
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2312-2/+32
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2216-0/+52
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2124-0/+72
| | |
* | | Merge pull request #16469 from ↵Vincent Petry2015-05-201-0/+1
|\ \ \ | |_|/ |/| | | | | | | | oparoz/restore-minheight-for-single-public-previews Restore min-height for single previews
| * | Restore min-height for single previewsOlivier Paroz2015-05-201-0/+1
| | |
* | | Merge pull request #16322 from owncloud/trash-viewMorris Jobke2015-05-202-16/+80
|\ \ \ | | | | | | | | dont go trough the view when moving to trash
| * | | cleanup move/copy logic in trashRobin Appelman2015-05-191-20/+57
| | | |
| * | | adjust testRobin Appelman2015-05-181-1/+7
| | | |
| * | | fix target path for moveRobin Appelman2015-05-181-2/+6
| | | |
| * | | update cache after move to trashRobin Appelman2015-05-181-0/+2
| | | |
| * | | dont go trough the view when moving to trashRobin Appelman2015-05-181-12/+27
| | | |
* | | | Merge pull request #16465 from ↵Morris Jobke2015-05-201-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled Return 401 when accessing public webdav and s2s is disabled
| * | | | Return 401 when accessing public webdav and s2s is disabledVincent Petry2015-05-201-4/+5
| | | | |
* | | | | Merge pull request #16075 from owncloud/skeleton-copy-delayVincent Petry2015-05-208-63/+81
|\ \ \ \ \ | | | | | | | | | | | | wait with copying the skeleton untill login and setupfs are done
| * | | | | Catch NotFoundException and return no quota information which simply ↵Thomas Müller2015-05-191-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | reflects the current state - no file storage has been initialized for the user.
| * | | | | Fix provisioning API unit tests for loginVincent Petry2015-05-183-49/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly login the user every time to make sure their FS is properly setup.
| * | | | | fix testsRobin Appelman2015-05-182-0/+2
| | | | | |
| * | | | | fix testsRobin Appelman2015-05-182-4/+2
| | | | | |
* | | | | | Merge pull request #16326 from owncloud/fix-16192Morris Jobke2015-05-202-3/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | include base dn test in functionality test
| * | | | | | include base dn test in functionality testArthur Schiwon2015-05-132-3/+29
| | | | | | |
* | | | | | | Merge pull request #16444 from owncloud/close-new-dropdownJan-Christoph Borchardt2015-05-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Closes "New" dropdown when switching category
| * | | | | | | Closes "New" dropdown when switching categoryMorris Jobke2015-05-191-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #16394 * return false - stops all following event callbacks
* | | | | | | Merge pull request #16446 from owncloud/fix-url-generationLukas Reschke2015-05-202-1/+113
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix URL generation
| * | | | | | | Added unit tests for download URL in public sharing pageVincent Petry2015-05-192-0/+112
| | | | | | | |