summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7969 from Xenopathic/files_external_fixVincent Petry2014-04-031-4/+4
|\ | | | | Fix error log spam
| * Fix error log spamRobin McCorkell2014-04-031-4/+4
| | | | | | | | Regression from e002b7242cb19a0e028d325cd64b57e67dc48108
* | Merge pull request #7970 from owncloud/webdav-upload-hashThomas Müller2014-04-031-1/+1
|\ \ | |/ |/| Fix uploading files containing a # in the path for webdav
| * Fix uploading files containing a # in the path for webdavRobin Appelman2014-03-311-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0313-1/+23
| |
* | Merge pull request #8014 from owncloud/uploadsize-reuseicewind19912014-04-021-1/+1
|\ \ | | | | | | Reuse known free space in the files app
| * | Reuse known free space in the files appRobin Appelman2014-04-021-1/+1
| | |
* | | Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\ \ \ | |/ / |/| | there is no need to re-calculate the shares after a touch
| * | there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
| |/
* | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclibVincent Petry2014-04-0227-723/+1287
|\ \ | | | | | | Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
| * | Upgraded phpseclib to version 0.3.6Vincent Petry2014-04-0227-723/+1287
| | |
* | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-022-10/+8
|\ \ \ | |/ / |/| | always encrypt files to owner
| * | always encrypt files to ownerBjoern Schiessle2014-03-312-10/+8
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0254-98/+16
| |
* | Merge pull request #7989 from owncloud/files-deletefileregressionfixThomas Müller2014-04-012-8/+20
|\ \ | | | | | | Fixed broken delete file action
| * | Fixed broken delete file actionVincent Petry2014-04-012-8/+20
| | |
* | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-012-8/+89
|\ \ \ | | | | | | | | Make getPath work for shared files
| * | | Improve phpdocRobin Appelman2014-03-311-0/+7
| | | |
| * | | Implement getPath for shared filesRobin Appelman2014-03-282-8/+82
| | | |
* | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
|\ \ \ \ | | | | | | | | | | Correct the remembering of the trashbin app state in encryption test
| * | | | Remember before change works betterBart Visscher2014-04-011-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexistsVincent Petry2014-04-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix dirInfo check when dir does not exist
| * | | | Fix dirInfo check when dir does not existVincent Petry2014-04-011-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #7984 from owncloud/wording-applicable2Morris Jobke2014-04-011-4/+7
|\ \ \ \ | |/ / / |/| | | External Storage: change confusing 'applicable' to 'available for', default to »All Users«
| * | | external storage: set storages to be available for All Users by defaultJan-Christoph Borchardt2014-04-011-3/+6
| | | |
| * | | external storage: change confusing 'applicable' to 'available for'Jan-Christoph Borchardt2014-04-011-1/+1
| | | |
* | | | Merge pull request #7293 from owncloud/update-shares-postgresVincent Petry2014-04-014-16/+109
|\ \ \ \ | |/ / / |/| | | fix update to remove shares where file doesn't exist on postgres
| * | | Fixed share upgrade cleanup tests to use the correct idsVincent Petry2014-03-261-9/+9
| | | |
| * | | Fixed share updater unit testVincent Petry2014-03-251-8/+10
| | | | | | | | | | | | | | | | | | | | Now using \OC_DB::insertId() to retrieve the generated ids because Oracle ignores the passed values.
| * | | remove invalid shares with one SQL statementMorris Jobke2014-03-131-12/+5
| | | |
| * | | Added backticks for Oracle in sharing updater unit testVincent Petry2014-03-131-8/+8
| | | |
| * | | Clean up database before setup the database for testingMorris Jobke2014-03-131-0/+4
| | | |
| * | | Refactor update script to class and add unit testMorris Jobke2014-03-133-13/+108
| | | |
| * | | fix update to remove shares where file doesn't exist on postgresJamie McClelland2014-03-132-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without patch, breaks with: Failed to upgrade "files_sharing". Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR: invalid input syntax for integer: "5,179"" See: https://github.com/owncloud/core/issues/5758 removing unnecessary cruft - no parameter is set, none to pass. https://github.com/owncloud/core/issues/5758 removing subquery, making more readable See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979 parameters to sql calls should be arrays https://github.com/owncloud/core/pull/6016 boosting version to ensure fix gets executed properly escaping the sql select statement removing extraneous closing paren.
* | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \ \ \ | | | | | | | | | | move check if a file should be encrypted to the pre hook
| * | | | don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| | | | |
| * | | | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
| | |_|/ | |/| |
* | | | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-011-5/+0
|\ \ \ \ | | | | | | | | | | remove pl_PL - fixes #7973
| * | | | remove pl_PL - fixes #7973Thomas Müller2014-03-311-5/+0
| | |_|/ | |/| |
* | | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-016-286/+272
|\ \ \ \ | | | | | | | | | | Replace personalblock with .section
| * | | | external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-3127-75/+164
| |\| | |
| * | | | replace last personalblock fieldset within files_externalJan-Christoph Borchardt2014-03-311-3/+1
| | | | |
| * | | | replace personalblock fieldset with section class in core user_ appsJan-Christoph Borchardt2014-03-272-9/+7
| | | | |
| * | | | replace personalblock fieldset with section class in files appsJan-Christoph Borchardt2014-03-274-271/+261
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-016-0/+11
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-301-0/+1
| | |
* | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_failsBjörn Schießle2014-03-281-0/+2
|\ \ \ | | | | | | | | don't write file if opening a stream to encrypt the data fails
| * | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
| | | |
* | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_apiVincent Petry2014-03-281-1/+1
|\ \ \ \ | |/ / / |/| | | sharing api cleanup, first step
| * | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-251-1/+84
| | | |