Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-13 | 196 | -452/+256 |
| | |||||
* | Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldap | Thomas Müller | 2015-11-12 | 1 | -1/+1 |
|\ | | | | | changed 1.000 to 1,000 | ||||
| * | changed 1.000 to 1,000 | sylvain | 2015-11-12 | 1 | -1/+1 |
| | | | | | | The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating | ||||
* | | Merge pull request #20460 from owncloud/file-handling-wording | Thomas Müller | 2015-11-12 | 1 | -4/+2 |
|\ \ | | | | | | | fix layout and wording for file handling admin setting | ||||
| * | | fix layout and wording for file handling admin setting | Jan-Christoph Borchardt | 2015-11-11 | 1 | -4/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-12 | 2 | -0/+4 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-11 | 14 | -10/+108 |
| | | |||||
* | | Merge pull request #20124 from owncloud/postscriptum-20093 | C. Montero Luque | 2015-11-10 | 2 | -4/+4 |
|\ \ | |/ |/| | remove uselessly used parameter, read all user attributes also when l… | ||||
| * | remove uselessly used parameter, read all user attributes also when looking ↵ | Arthur Schiwon | 2015-11-06 | 2 | -4/+4 |
| | | | | | | | | up users in groups | ||||
* | | Merge pull request #20195 from owncloud/add-caldavtester | Thomas Müller | 2015-11-10 | 4 | -0/+1075 |
|\ \ | | | | | | | Add CalDAVTester to travis | ||||
| * | | Add CalDAVTester to travis | Thomas Müller | 2015-11-10 | 4 | -0/+1075 |
| | | | |||||
* | | | Merge pull request #20224 from owncloud/fileinfo-owner | Robin Appelman | 2015-11-10 | 1 | -0/+16 |
|\ \ \ | | | | | | | | | Add getOwner to FileInfo | ||||
| * | | | Add tests for FileInfo owner | Robin Appelman | 2015-11-10 | 1 | -0/+16 |
| |/ / | |||||
* | | | Merge pull request #20431 from owncloud/carddav-enforce-displayname | Thomas Müller | 2015-11-10 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | When creating addressbooks, make sure the displayname is set | ||||
| * | | | When creating addressbooks, make sure the displayname is set | Arthur Schiwon | 2015-11-10 | 2 | -1/+8 |
| | | | | |||||
* | | | | Merge pull request #20422 from owncloud/fix-20421-master | Thomas Müller | 2015-11-10 | 1 | -0/+3 |
|\ \ \ \ | |/ / / |/| | | | Ensure the user folder exists | ||||
| * | | | Ensure the user folder exists | Thomas Müller | 2015-11-10 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #20415 from owncloud/fix-addressbook-home-set | Thomas Müller | 2015-11-10 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Adding CardDAV plugin to provide addressbook-home-set property | ||||
| * | | Adding CardDAV plugin to provide addressbook-home-set property | Thomas Müller | 2015-11-10 | 1 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-10 | 2 | -0/+2 |
|/ / | |||||
* | | Merge pull request #20333 from owncloud/fix-18956 | Thomas Müller | 2015-11-10 | 7 | -12/+26 |
|\ \ | | | | | | | [LDAP Wizard] make all the buttons beautiful | ||||
| * | | make all the buttons beautiful | Arthur Schiwon | 2015-11-05 | 7 | -12/+26 |
| | | | |||||
* | | | Register DAVACL plugin to provide current-user-principal | Thomas Müller | 2015-11-09 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval | Thomas Müller | 2015-11-09 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Force approval in GDrive oauth to get refresh_token | ||||
| * | | | Force approval in GDrive oauth to get refresh_token | Vincent Petry | 2015-11-06 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | Forcing the approval of app permissions makes sure that the GDrive API will always return a refresh_token. In the case of apps that were already authorized for the current user/domain, the API doesn't return the refresh_token which causes expiration issues. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-09 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-08 | 10 | -60/+66 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-07 | 2 | -0/+2 |
| | | | |||||
* | | | adding individual phpunit.xml and bootstrap.php | Thomas Müller | 2015-11-06 | 2 | -0/+38 |
| | | | |||||
* | | | Adding occ command to create an addressbook | Thomas Müller | 2015-11-06 | 2 | -0/+60 |
| | | | |||||
* | | | Introducing CardDAV into core | Thomas Müller | 2015-11-06 | 22 | -23/+958 |
|/ / | |||||
* | | Merge pull request #20358 from owncloud/extstorage-properlythrowexception | Thomas Müller | 2015-11-06 | 1 | -1/+1 |
|\ \ | | | | | | | Properly throw exception in OC_Mount_Config::getBackendStatus | ||||
| * | | Properly throw exception in OC_Mount_Config::getBackendStatus | Vincent Petry | 2015-11-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #20340 from owncloud/fix-ocs-error-code | Thomas Müller | 2015-11-06 | 2 | -2/+17 |
|\ \ \ | |/ / |/| | | Revert OCS error code change from #20135 | ||||
| * | | Revert OCS error code change from #20135 | Joas Schilling | 2015-11-05 | 2 | -2/+17 |
| |/ | |||||
* | | Merge pull request #20271 from owncloud/fix-18701 | Thomas Müller | 2015-11-06 | 2 | -20/+149 |
|\ \ | | | | | | | LDAP: attempt to connect to backup server again, if main server is no… | ||||
| * | | integration tests | Arthur Schiwon | 2015-11-04 | 1 | -0/+118 |
| | | | |||||
| * | | LDAP: attempt to connect to backup server again, if main server is not ↵ | Arthur Schiwon | 2015-11-03 | 1 | -20/+31 |
| | | | | | | | | | | | | available. Fixes #18701 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-06 | 4 | -0/+10 |
| | | | |||||
* | | | Use the old code for remote shares for now | Roeland Jago Douma | 2015-11-05 | 1 | -0/+8 |
| | | | |||||
* | | | The new sharing code now handles deletion | Roeland Jago Douma | 2015-11-05 | 3 | -3/+196 |
| | | | | | | | | | | | | OCS -> ShareManager -> DefaultShareProvider | ||||
* | | | Prepare OCS Share endpoint | Roeland Jago Douma | 2015-11-05 | 2 | -5/+70 |
| |/ |/| | |||||
* | | Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting | Thomas Müller | 2015-11-05 | 1 | -0/+5 |
|\ \ | | | | | | | [files_external] fix empty user mounts setting | ||||
| * | | [files_external] fix empty user mounts setting | Morris Jobke | 2015-11-04 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | * fixes #19858 * if no backend is allowed to be mounted also the user mount setting should be disabled | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-05 | 28 | -26/+152 |
| | | | |||||
* | | | Merge pull request #20053 from owncloud/getfileinfo-locking | Thomas Müller | 2015-11-04 | 1 | -26/+26 |
|\ \ \ | | | | | | | | | Don't lock if we're only reading cache metadata | ||||
| * | | | Split checkUpdate | Robin Appelman | 2015-11-03 | 1 | -26/+26 |
| | |/ | |/| | |||||
* | | | add port to host only, if an URL is used instead of a plain hostname | Arthur Schiwon | 2015-11-04 | 1 | -3/+7 |
| |/ |/| | |||||
* | | Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage | Thomas Müller | 2015-11-04 | 1 | -1/+1 |
|\ \ | | | | | | | Correct the description of function setEncryptHomeStorage | ||||
| * | | Correct the description of function setEncryptHomeStorage | Phil Davis | 2015-11-03 | 1 | -1/+1 |
| |/ |