Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib | Vincent Petry | 2014-04-02 | 27 | -723/+1287 | |
|\ \ \ \ | ||||||
| * | | | | 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 | 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 | Vincent Petry | 2014-04-01 | 2 | -8/+20 | |
* | | | | Merge pull request #7935 from owncloud/getpath-shared | Vincent Petry | 2014-04-01 | 2 | -8/+89 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 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: 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 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | 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 | |
| * | | | | 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 | |
* | | | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook | Björn Schießle | 2014-04-01 | 3 | -87/+66 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 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 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-25 | 1 | -1/+84 | |
| * | | | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-25 | 1 | -83/+0 | |
* | | | | | Merge pull request #7872 from owncloud/trash-disablestoragestats | Björn Schießle | 2014-03-28 | 1 | -0/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Do not retrieve storage stats for trash bin | Vincent Petry | 2014-03-28 | 1 | -0/+5 | |
* | | | | | | Merge pull request #7842 from Xenopathic/files_external_config_optional | Robin McCorkell | 2014-03-28 | 2 | -17/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Insert missing brace | Robin McCorkell | 2014-03-24 | 1 | -3/+3 | |
| * | | | | | | Enable the use of 'optional' on password fields (JavaScript part) | Robin McCorkell | 2014-03-21 | 1 | -8/+13 | |
| * | | | | | | Correct field modifier checking | Robin McCorkell | 2014-03-20 | 1 | -3/+3 | |
| * | | | | | | Enable the use of 'optional' on password fields | Robin McCorkell | 2014-03-20 | 1 | -7/+10 | |
* | | | | | | | Merge pull request #7107 from owncloud/load-apps-proper-master | Thomas Müller | 2014-03-28 | 7 | -31/+0 | |
|\ \ \ \ \ \ \ |