summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-2912-6/+20
* Merge pull request #16578 from owncloud/fix_16556Thomas Müller2015-05-281-1/+1
|\
| * show txt preview when file contains textGeorg Ehrke2015-05-271-1/+1
* | Merge pull request #16607 from owncloud/ie9-textpreviewfallbackThomas Müller2015-05-281-1/+1
|\ \
| * | Fallback to picture preview for IE <= 9Vincent Petry2015-05-281-1/+1
* | | Merge pull request #16585 from mmattel/Missing_translation_in_External_storag...Thomas Müller2015-05-281-1/+1
|\ \ \
| * | | Make string 'SFTP with secret key login' translatableMartin2015-05-271-1/+1
| | |/ | |/|
* | | Merge pull request #16592 from owncloud/fix-16574Morris Jobke2015-05-281-0/+1
|\ \ \
| * | | Add type hint for OC_ChannelVictor Dubiniuk2015-05-271-0/+1
| |/ /
* | | Merge pull request #16380 from rullzer/fix_16281Morris Jobke2015-05-282-15/+117
|\ \ \
| * | | Properly format remote recipientsRoeland Jago Douma2015-05-272-15/+117
| |/ /
* | | Merge pull request #16610 from owncloud/s2s-shareinforeturn404whendisabledVincent Petry2015-05-281-0/+5
|\ \ \
| * | | Return 404 in shareinfo.php when outgoing s2s disabledVincent Petry2015-05-281-0/+5
| | |/ | |/|
* | | Merge pull request #16613 from owncloud/quota-onlyforfilesMorris Jobke2015-05-282-14/+28
|\ \ \
| * | | Only use quota stream wrapper on "files"Vincent Petry2015-05-282-14/+28
|/ / /
* | | Merge pull request #16467 from owncloud/apps-fixsortLukas Reschke2015-05-282-9/+27
|\ \ \
| * | | Sort apps by level, then by nameVincent Petry2015-05-202-9/+27
* | | | Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storagesVincent Petry2015-05-285-45/+150
|\ \ \ \
| * | | | copy keys before we move a file between storages to make sure that the new ta...Bjoern Schiessle2015-05-223-27/+107
| * | | | distinguish between source and target mount point to allow copy/rename betwee...Bjoern Schiessle2015-05-212-18/+43
* | | | | Merge pull request #16577 from owncloud/enc_improve_migrationVincent Petry2015-05-282-58/+63
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | only request encryption module for files which are not excludedBjoern Schiessle2015-05-272-58/+63
| | |_|/ | |/| |
* | | | Merge pull request #16591 from owncloud/enc_improved_error_messageBjörn Schießle2015-05-2812-35/+136
|\ \ \ \
| * | | | detect migration statusBjoern Schiessle2015-05-276-7/+115
| * | | | improve error messages displayed to the userBjoern Schiessle2015-05-276-28/+21
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2850-132/+266
* | | | Merge pull request #16595 from owncloud/scrutinizer-timeoutLukas Reschke2015-05-271-1/+1
|\ \ \ \
| * | | | [scrutinizer] Increase timeout of external code coverage Morris Jobke2015-05-271-1/+1
* | | | | Merge pull request #16583 from owncloud/fix-code-indentationLukas Reschke2015-05-271-25/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix indentationLukas Reschke2015-05-271-25/+25
| |/ / /
* | | | Merge pull request #16417 from owncloud/master-16415Morris Jobke2015-05-271-5/+0
|\ \ \ \ | |/ / / |/| | |
| * | | fix theme in IE8 and IE9Morris Jobke2015-05-181-5/+0
* | | | Merge pull request #16527 from owncloud/end-processing-when-404Morris Jobke2015-05-271-0/+1
|\ \ \ \
| * | | | End processing when file is not foundLukas Reschke2015-05-221-0/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-274-6/+6
* | | | | Merge pull request #15985 from owncloud/hotfix/fix-encryption-referencesBjörn Schießle2015-05-264-31/+2
|\ \ \ \ \
| * | | | | removing encryption preview checkClark Tomlinson2015-05-181-3/+0
| * | | | | removing deletion of encryption keysClark Tomlinson2015-05-181-26/+0
| * | | | | fix references to legacy encryption app nameClark Tomlinson2015-05-184-4/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #16565 from owncloud/add-urandom-checkThomas Müller2015-05-264-4/+50
|\ \ \ \ \
| * | | | | Add check for availability of /dev/urandomLukas Reschke2015-05-264-4/+50
* | | | | | Merge pull request #16519 from owncloud/example-themeJan-Christoph Borchardt2015-05-2613-7/+207
|\ \ \ \ \ \
| * | | | | | add example themeJan-Christoph Borchardt2015-05-2213-7/+207
* | | | | | | Merge pull request #16563 from owncloud/revert-16562-revert-15203-revert-1520...Thomas Müller2015-05-261-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""Thomas Müller2015-05-261-5/+0
|/ / / / / / /
* | | | | | | Merge pull request #16562 from owncloud/revert-15203-revert-15201-webdav-ng-b...Oliver Kohl D.Sc.2015-05-261-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "FIX for webdav.mediencenter.t-online.de""Oliver Kohl D.Sc2015-05-261-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #16521 from owncloud/unbold-placeholder-imageVincent Petry2015-05-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | use normal font weight instead of bold for image placeholdersJan-Christoph Borchardt2015-05-221-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #16561 from owncloud/add-default-timeout-backBjörn Schießle2015-05-262-3/+80
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 04:55:59 +0000