Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
| * | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Enable the use of 'optional' on password fields for mount configuration | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | See ed0c10a10b0b3a9d9d898a64461de707026cd6d3 | ||||
| * | | | | | Correct field modifier checking | Robin McCorkell | 2014-03-20 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing code checks for the existence of a modifier ('&', '!', '#', '*') anywhere in the field name, but strips the first character regardless. This change makes it so that only modifiers at the beginning of the string are counted. | ||||
| * | | | | | Enable the use of 'optional' on password fields | Robin McCorkell | 2014-03-20 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic has been changed, in that 'class="optional"' is applied to both password and text types if the field begins with the optional market, '&'. | ||||
* | | | | | | Merge pull request #7107 from owncloud/load-apps-proper-master | Thomas Müller | 2014-03-28 | 7 | -31/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Load apps proper master | ||||
| * | | | | | | killing some more calls to OC_App::loadApps(); - because we load all apps in ↵ | Thomas Müller | 2014-03-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | handleRequest() | ||||
| * | | | | | | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 474 | -2654/+5611 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php | ||||
| * | | | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, ↵ | Thomas Müller | 2014-02-06 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication and logging | ||||
| * | | | | | | | remove superfluous $RUNTIME_APPTYPES | Thomas Müller | 2014-02-06 | 5 | -24/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #7724 from owncloud/mobile | Thomas Müller | 2014-03-28 | 7 | -20/+116 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [WIP] Mobile optimization for base layout and Files app |