summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Bump Dropbox library to newest upstream versionLukas Reschke2015-06-0110-187/+4720
* add changeLock to the storage apiRobin Appelman2015-06-011-0/+11
* add locking to the storage apiRobin Appelman2015-06-011-0/+26
* Merge pull request #16629 from owncloud/files-renametoreservednameVincent Petry2015-06-012-24/+16
|\
| * Check target name on rename with web UIVincent Petry2015-05-292-24/+16
* | Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-callsLukas Reschke2015-06-011-0/+10
|\ \
| * | Fix files_external l10nMorris Jobke2015-05-301-0/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-014-0/+12
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-3140-18/+100
|/ /
* / [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 goneVincent Petry2015-05-292-1/+15
* | 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 + 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 <= 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
* | | | 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
|\ \ \
| * | | 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
|\ \
| * | 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-183-3/+3
* | | Merge pull request #16532 from owncloud/cors-no-cookie-authVincent Petry2015-05-261-2/+0
|\ \ \
| * | | disallow cookie auth for cors requestsBernhard Posselt2015-05-221-2/+0
* | | | [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 oparoz/restore-minheight-for-single-public-pre...Vincent Petry2015-05-201-0/+1
|\ \ \ | |_|/ |/| |
| * | Restore min-height for single previewsOlivier Paroz2015-05-201-0/+1
* | | Merge pull request #16322 from owncloud/trash-viewMorris Jobke2015-05-202-16/+80
|\ \ \
| * | | 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 owncloud/s2s-returnpropererrorwhenpublicwebdav...Morris Jobke2015-05-201-4/+5
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | Catch NotFoundException and return no quota information which simply reflects...Thomas Müller2015-05-191-10/+26