Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7969 from Xenopathic/files_external_fix | Vincent Petry | 2014-04-03 | 1 | -4/+4 |
|\ | | | | | Fix error log spam | ||||
| * | Fix error log spam | Robin McCorkell | 2014-04-03 | 1 | -4/+4 |
| | | | | | | | | Regression from e002b7242cb19a0e028d325cd64b57e67dc48108 | ||||
* | | Merge pull request #7970 from owncloud/webdav-upload-hash | Thomas Müller | 2014-04-03 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix uploading files containing a # in the path for webdav | ||||
| * | Fix uploading files containing a # in the path for webdav | Robin Appelman | 2014-03-31 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-03 | 13 | -1/+23 |
| | | |||||
* | | Merge pull request #8014 from owncloud/uploadsize-reuse | icewind1991 | 2014-04-02 | 1 | -1/+1 |
|\ \ | | | | | | | Reuse known free space in the files app | ||||
| * | | Reuse known free space in the files app | Robin Appelman | 2014-04-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7978 from owncloud/enc_cleanup | Vincent Petry | 2014-04-02 | 1 | -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 touch | Bjoern Schiessle | 2014-03-31 | 1 | -45/+0 |
| |/ | |||||
* | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib | Vincent Petry | 2014-04-02 | 27 | -723/+1287 |
|\ \ | | | | | | | Upgraded phpseclib to version 0.3.6 (SFTP ext storage) | ||||
| * | | Upgraded phpseclib to version 0.3.6 | Vincent Petry | 2014-04-02 | 27 | -723/+1287 |
| | | | |||||
* | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled | Morris Jobke | 2014-04-02 | 2 | -10/+8 |
|\ \ \ | |/ / |/| | | always encrypt files to owner | ||||
| * | | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 2 | -10/+8 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-02 | 54 | -98/+16 |
| | | |||||
* | | Merge pull request #7989 from owncloud/files-deletefileregressionfix | Thomas Müller | 2014-04-01 | 2 | -8/+20 |
|\ \ | | | | | | | Fixed broken delete file action | ||||
| * | | Fixed broken delete file action | Vincent Petry | 2014-04-01 | 2 | -8/+20 |
| | | | |||||
* | | | Merge pull request #7935 from owncloud/getpath-shared | Vincent Petry | 2014-04-01 | 2 | -8/+89 |
|\ \ \ | | | | | | | | | Make getPath work for shared files | ||||
| * | | | Improve phpdoc | Robin Appelman | 2014-03-31 | 1 | -0/+7 |
| | | | | |||||
| * | | | Implement getPath for shared files | Robin Appelman | 2014-03-28 | 2 | -8/+82 |
| | | | | |||||
* | | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-state | Bart Visscher | 2014-04-01 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Correct the remembering of the trashbin app state in encryption test | ||||
| * | | | | Remember before change works better | Bart Visscher | 2014-04-01 | 1 | -3/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists | Vincent Petry | 2014-04-01 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix dirInfo check when dir does not exist | ||||
| * | | | | Fix dirInfo check when dir does not exist | Vincent Petry | 2014-04-01 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #7984 from owncloud/wording-applicable2 | Morris Jobke | 2014-04-01 | 1 | -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 default | Jan-Christoph Borchardt | 2014-04-01 | 1 | -3/+6 |
| | | | | |||||
| * | | | external storage: change confusing 'applicable' to 'available for' | Jan-Christoph Borchardt | 2014-04-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #7293 from owncloud/update-shares-postgres | Vincent Petry | 2014-04-01 | 4 | -16/+109 |
|\ \ \ \ | |/ / / |/| | | | fix update to remove shares where file doesn't exist on postgres | ||||
| * | | | Fixed share upgrade cleanup tests to use the correct ids | Vincent Petry | 2014-03-26 | 1 | -9/+9 |
| | | | | |||||
| * | | | Fixed share updater unit test | Vincent Petry | 2014-03-25 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | Now using \OC_DB::insertId() to retrieve the generated ids because Oracle ignores the passed values. | ||||
| * | | | remove invalid shares with one SQL statement | Morris Jobke | 2014-03-13 | 1 | -12/+5 |
| | | | | |||||
| * | | | Added backticks for Oracle in sharing updater unit test | Vincent Petry | 2014-03-13 | 1 | -8/+8 |
| | | | | |||||
| * | | | Clean up database before setup the database for testing | Morris Jobke | 2014-03-13 | 1 | -0/+4 |
| | | | | |||||
| * | | | Refactor update script to class and add unit test | Morris Jobke | 2014-03-13 | 3 | -13/+108 |
| | | | | |||||
| * | | | fix update to remove shares where file doesn't exist on postgres | Jamie McClelland | 2014-03-13 | 2 | -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_hook | Björn Schießle | 2014-04-01 | 3 | -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 twice | Bjoern Schiessle | 2014-03-31 | 1 | -12/+16 |
| | | | | | |||||
| * | | | | move check if a file should be encrypted to the pre hook | Bjoern Schiessle | 2014-03-31 | 2 | -75/+50 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #7975 from owncloud/fix-7973-master-2 | Vincent Petry | 2014-04-01 | 1 | -5/+0 |
|\ \ \ \ | | | | | | | | | | | remove pl_PL - fixes #7973 | ||||
| * | | | | remove pl_PL - fixes #7973 | Thomas Müller | 2014-03-31 | 1 | -5/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #7915 from owncloud/replace-personalblock | Vincent Petry | 2014-04-01 | 6 | -286/+272 |
|\ \ \ \ | | | | | | | | | | | Replace personalblock with .section | ||||
| * | | | | external storage: fix merge conflict, indentation | Jan-Christoph Borchardt | 2014-03-31 | 27 | -75/+164 |
| |\| | | | |||||
| * | | | | replace last personalblock fieldset within files_external | Jan-Christoph Borchardt | 2014-03-31 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | replace personalblock fieldset with section class in core user_ apps | Jan-Christoph Borchardt | 2014-03-27 | 2 | -9/+7 |
| | | | | | |||||
| * | | | | replace personalblock fieldset with section class in files apps | Jan-Christoph Borchardt | 2014-03-27 | 4 | -271/+261 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-01 | 6 | -0/+11 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-30 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails | Björn Schießle | 2014-03-28 | 1 | -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 fails | Bjoern Schiessle | 2014-03-28 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | sharing api cleanup, first step | ||||
| * | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-25 | 1 | -1/+84 |
| | | | |