Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-08 | 68 | -64/+12 |
| | |||||
* | Merge pull request #21498 from owncloud/cleanup-OC_DB | Thomas Müller | 2016-01-07 | 2 | -11/+0 |
|\ | | | | | Cleanup OC_DB methods | ||||
| * | Remove OC_DB::dropTable | Morris Jobke | 2016-01-07 | 2 | -11/+0 |
| | | |||||
* | | Merge pull request #21066 from ↵ | Thomas Müller | 2016-01-07 | 3 | -0/+128 |
|\ \ | | | | | | | | | | | | | owncloud/behat_capabilities_changing_server_configuration Added new capabilities test with changes in server configuration | ||||
| * | | Add an OCS app for testing instead of using sudo and exec | Joas Schilling | 2015-12-11 | 3 | -0/+128 |
| | | | |||||
* | | | Merge pull request #21506 from ↵ | Thomas Müller | 2016-01-07 | 10 | -21/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue-20218-min-max-owncloud-version-warning Issue 20218 min max owncloud version warning | ||||
| * | | | Remove deprecated shipped flag from info.xml which has no use anymore | Joas Schilling | 2016-01-07 | 9 | -9/+0 |
| | | | | |||||
| * | | | Add ownCloud min and max version for shipped apps | Joas Schilling | 2016-01-07 | 10 | -12/+14 |
| | | | | |||||
* | | | | Merge pull request #21481 from owncloud/ext-smb-dependencies | Thomas Müller | 2016-01-07 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | Check libsmbclient-php as well as smbclient binary | ||||
| * | | | | Check libsmbclient-php as well as smbclient binary | Robin McCorkell | 2016-01-07 | 1 | -2/+4 |
| |/ / / | |||||
* | | | | Merge pull request #21455 from owncloud/fix-method-signature | Thomas Müller | 2016-01-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix method call + undefined variable | ||||
| * | | | | Fix method call + undefined variable | Lukas Reschke | 2016-01-07 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Variable is not defined 2. Method does not expect any parameters ``` Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45 ``` | ||||
* | | | | Merge pull request #20773 from owncloud/share2.0_create | Thomas Müller | 2016-01-07 | 3 | -10/+451 |
|\ \ \ \ | |_|_|/ |/| | | | [Sharing 2.0] create share | ||||
| * | | | [Sharing 2.0] Add L10N instance to manager for translated errors | Roeland Jago Douma | 2016-01-06 | 2 | -5/+9 |
| | | | | |||||
| * | | | [Sharing 2.0] Do not use static function to get numeric storage id | Roeland Jago Douma | 2016-01-06 | 2 | -5/+15 |
| | | | | |||||
| * | | | [Sharing 2.0] General exceptions return 403 | Roeland Jago Douma | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This is the same as the old behaviour | ||||
| * | | | [Share 2.0] Enable share creation via OCS API | Roeland Jago Douma | 2016-01-06 | 3 | -5/+432 |
| | | | | |||||
* | | | | Merge pull request #21359 from owncloud/check-changes | Thomas Müller | 2016-01-07 | 2 | -4/+2 |
|\ \ \ \ | | | | | | | | | | | remove mention of 'filesystem_check_changes' => 2 from the config sample | ||||
| * | | | | fix js unit tests | Morris Jobke | 2016-01-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Also remove it from the web interface | Robin Appelman | 2016-01-07 | 1 | -2/+0 |
| | |/ / | |/| | | |||||
* / | | | Add token in webdav download link of public page | Vincent Petry | 2016-01-07 | 2 | -4/+8 |
|/ / / | |||||
* | | | Merge pull request #21343 from owncloud/ldap-showremnants-json-output | Thomas Müller | 2016-01-07 | 1 | -11/+15 |
|\ \ \ | | | | | | | | | Add an option to occ ldap:showremnants to output a json encoded array… | ||||
| * | | | Add an option to occ ldap:showremnants to output a json encoded array for ↵ | Stephen Colebrook | 2015-12-22 | 1 | -11/+15 |
| | | | | | | | | | | | | | | | | use in scripts and other tools. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-07 | 16 | -0/+78 |
| | | | | |||||
* | | | | Make LDAP more robust to exceptions and log them properly | Morris Jobke | 2016-01-06 | 2 | -1/+2 |
| |/ / |/| | | |||||
* | | | Inject OCSClient | Lukas Reschke | 2016-01-06 | 3 | -18/+25 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/21451 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-06 | 6 | -22/+22 |
| | | | |||||
* | | | Use color instead of transparency for proper tooltip appearance | Morris Jobke | 2016-01-05 | 1 | -0/+3 |
| | | | | | | | | | | | | * fixes #21436 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-05 | 8 | -2/+98 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-04 | 10 | -0/+58 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-31 | 12 | -2/+122 |
| | | | |||||
* | | | Merge pull request #21291 from owncloud/refactor-call-check | Thomas Müller | 2015-12-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Refactor OC_Util::callCheck | ||||
| * | | | Refactor OC_Util::callCheck | Morris Jobke | 2015-12-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #21254 from owncloud/files-uploadcanceliconfix | Thomas Müller | 2015-12-28 | 2 | -23/+36 |
|\ \ \ \ | | | | | | | | | | | Correctly render uploadtext indicator only on folders | ||||
| * | | | | Use showBusyState for upload into folder | Vincent Petry | 2015-12-18 | 1 | -22/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the original icon will be restored properly in case it's not the default folder icon | ||||
| * | | | | Correctly render uploadtext indicator only on folders | Vincent Petry | 2015-12-18 | 2 | -1/+16 |
| | | | | | |||||
* | | | | | Merge pull request #21216 from owncloud/fopen-statcache | Thomas Müller | 2015-12-28 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Clear SMB statcache after fopen | ||||
| * | | | | | clear statcache after fopen for smb | Robin Appelman | 2015-12-15 | 1 | -2/+7 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-28 | 10 | -2/+58 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-27 | 6 | -0/+20 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-25 | 4 | -0/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #21093 from owncloud/migrate-no-user | Robin Appelman | 2015-12-24 | 3 | -13/+61 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Dont break the files_external migrator if no user is logged in | ||||
| * | | | | | | Migrate files external for the user that the filesystem is being setup for | Robin Appelman | 2015-12-14 | 3 | -13/+61 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-23 | 2 | -0/+2 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Make a modifiable copy of the webdav properties in JS file list | Vincent Petry | 2015-12-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugins can extend _getWebdavProperties to add custom properties. These should not be added to the original properties list, so now the FileList makes a copy of the array. | ||||
* | | | | | | Merge pull request #21287 from owncloud/travis-dav-caldavtester | Thomas Müller | 2015-12-22 | 6 | -0/+3701 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Adding integration tests for CalDAV | ||||
| * | | | | | Adding integration tests for CalDAV | Thomas Müller | 2015-12-21 | 6 | -0/+3701 |
| | | | | | | |||||
* | | | | | | Add error logging to federated sharing handshake | Robin Appelman | 2015-12-21 | 5 | -10/+37 |
|/ / / / / | |||||
* | | | | | Merge pull request #21293 from owncloud/restructure-travis-dav-testing | Thomas Müller | 2015-12-21 | 7 | -57/+65 |
|\ \ \ \ \ | | | | | | | | | | | | | Restructure travis tests | ||||
| * | | | | | Sleep in carddavtester as well | Thomas Müller | 2015-12-21 | 1 | -0/+2 |
| | | | | | |