Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert OCS error code change from #20135 | Joas Schilling | 2015-11-05 | 2 | -2/+17 |
* | Merge pull request #20273 from owncloud/sharing-api-adding-tests | Thomas Müller | 2015-11-05 | 2 | -0/+203 |
|\ | |||||
| * | Merge branch 'master' into sharing-api-adding-tests | Sergio Bertolín | 2015-11-05 | 94 | -294/+686 |
| |\ | |||||
| * | | Added changes in the verification of sharing get responses | Sergio Bertolin | 2015-11-05 | 2 | -2/+37 |
| * | | added test for deleting a share | Sergio Bertolin | 2015-11-04 | 2 | -1/+19 |
| * | | Added general function to create shares in preconditions. | Sergio Bertolin | 2015-11-04 | 2 | -7/+97 |
| * | | enhancements to pre and post conditions | Sergio Bertolin | 2015-11-03 | 1 | -0/+60 |
* | | | Merge pull request #20325 from owncloud/subadmin-handle-null | Thomas Müller | 2015-11-05 | 2 | -6/+47 |
|\ \ \ | |_|/ |/| | | |||||
| * | | subadmin methods should not return any null user or group | Arthur Schiwon | 2015-11-05 | 2 | -6/+47 |
* | | | 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 | Morris Jobke | 2015-11-04 | 1 | -0/+5 |
* | | | Merge pull request #20320 from owncloud/drop-file_map | Thomas Müller | 2015-11-05 | 2 | -61/+1 |
|\ \ \ | |||||
| * | | | Drop unused table file_map | Morris Jobke | 2015-11-05 | 3 | -62/+2 |
* | | | | Merge pull request #20321 from owncloud/drop-principal-tables | Thomas Müller | 2015-11-05 | 2 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Drop unused tables principalgroups and principals | Morris Jobke | 2015-11-05 | 2 | -1/+3 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-05 | 32 | -28/+178 |
* | | | Merge pull request #20315 from owncloud/add-coverity | Thomas Müller | 2015-11-04 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Add coverity badge | Lukas Reschke | 2015-11-04 | 1 | -0/+1 |
* | | | | Merge pull request #20053 from owncloud/getfileinfo-locking | Thomas Müller | 2015-11-04 | 3 | -65/+88 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | mark path as checked | Robin Appelman | 2015-11-04 | 1 | -0/+1 |
| * | | | when a file is locked use old cache data | Robin Appelman | 2015-11-04 | 1 | -29/+37 |
| * | | | fix whitespace | Robin Appelman | 2015-11-04 | 1 | -2/+2 |
| * | | | only lock in getDirectoryContent if we need to update the cache | Robin Appelman | 2015-11-03 | 1 | -21/+17 |
| * | | | only lock in getFileInfo if we need to update the cache | Robin Appelman | 2015-11-03 | 1 | -18/+16 |
| * | | | Split checkUpdate | Robin Appelman | 2015-11-03 | 2 | -45/+65 |
* | | | | Merge pull request #20300 from owncloud/fix_comment | Morris Jobke | 2015-11-04 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | adjust comment, this parameter was added for 9.0 | Björn Schießle | 2015-11-04 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #18361 from owncloud/sharing_performance_improvements | Thomas Müller | 2015-11-04 | 3 | -9/+32 |
|\ \ \ \ | |||||
| * | | | | cache result from parent folders | Bjoern Schiessle | 2015-11-04 | 3 | -9/+32 |
* | | | | | Merge pull request #20155 from owncloud/fix-20020 | Morris Jobke | 2015-11-04 | 1 | -3/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | 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 #20283 from owncloud/fix-varaible-type | Thomas Müller | 2015-11-04 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Fix typo in variable name | Morris Jobke | 2015-11-04 | 1 | -4/+4 |
| |/ / / | |||||
* | | | | Merge pull request #18821 from owncloud/global-classes | Thomas Müller | 2015-11-04 | 3 | -20/+51 |
|\ \ \ \ | |||||
| * | | | | Global Classes for Core. | Raghu Nayyar | 2015-11-02 | 3 | -20/+51 |
* | | | | | Merge pull request #20157 from owncloud/users-fixeveryonecount | Thomas Müller | 2015-11-04 | 5 | -60/+110 |
|\ \ \ \ \ | |||||
| * | | | | | fix subadmin user count for empty groups | Morris Jobke | 2015-11-04 | 1 | -0/+1 |
| * | | | | | Fix everyone count for subadmins | Vincent Petry | 2015-10-29 | 5 | -60/+109 |
* | | | | | | Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage | Thomas Müller | 2015-11-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Correct the description of function setEncryptHomeStorage | Phil Davis | 2015-11-03 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-04 | 52 | -40/+202 |
|/ / / / | |||||
* | | | | Merge pull request #20269 from owncloud/capabilities-webdav-ng-sync | Thomas Müller | 2015-11-03 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Add a new core capability which tells the clients which url to use | Thomas Müller | 2015-11-03 | 1 | -1/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20223 from owncloud/fix-apply-webdav-tags | Thomas Müller | 2015-11-03 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix TagList namespace in property map | Vincent Petry | 2015-11-02 | 1 | -1/+1 |
* | | | | Merge pull request #20201 from owncloud/checkboxes-groups-enable | Thomas Müller | 2015-11-03 | 2 | -18/+10 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into checkboxes-groups-enable | Raghu Nayyar | 2015-11-02 | 30 | -10/+90 |
| |\ \ \ \ | |||||
| * | | | | | new checkbox style in app settings | Hendrik Leppelsack | 2015-10-31 | 2 | -18/+10 |
* | | | | | | Merge pull request #20253 from owncloud/external-storage-wording | Thomas Müller | 2015-11-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix external storage wording detail, ref #19858 | Jan-Christoph Borchardt | 2015-11-03 | 1 | -1/+1 |