Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #21992 from owncloud/share-dialog-error-handling | Thomas Müller | 2016-01-29 | 2 | -7/+158 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Properly forward error messages in share dialog | Vincent Petry | 2016-01-28 | 2 | -7/+158 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #21928 from owncloud/files-external-js-checkbox-fix | Thomas Müller | 2016-01-29 | 2 | -5/+93 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add storage validation JS unit tests | Robin McCorkell | 2016-01-29 | 1 | -1/+75 | |
| * | | | | | | | Fix validation of inputs that aren't text | Robin McCorkell | 2016-01-26 | 1 | -4/+18 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #21990 from owncloud/systemtags-cleanup-orphans | Thomas Müller | 2016-01-29 | 5 | -17/+268 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Cleanup job for system and user tag orphaned when file was deleted | Vincent Petry | 2016-01-29 | 5 | -17/+268 | |
* | | | | | | | Merge pull request #21701 from owncloud/scan_files_more_details_II | Thomas Müller | 2016-01-29 | 1 | -38/+71 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | occ scan:files Adding more details in the base print out (II) | martin.mattel@diemattels.at | 2016-01-29 | 1 | -38/+71 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #21995 from owncloud/share2_delete_user_defined_group_shares | Thomas Müller | 2016-01-29 | 2 | -65/+67 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | [Share 2.0] When deleting a group share delete children | Roeland Jago Douma | 2016-01-28 | 2 | -65/+67 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #21932 from owncloud/comments-dav-refinements | Thomas Müller | 2016-01-29 | 4 | -8/+36 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | provide info about plugin, and do not run commit ourselves on proppatch | Arthur Schiwon | 2016-01-26 | 4 | -8/+36 | |
* | | | | | | | Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-away | Thomas Müller | 2016-01-29 | 4 | -37/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove other broken usages in deprecated methods | Joas Schilling | 2016-01-29 | 1 | -35/+3 | |
| * | | | | | | | Deprecate the method and warn against using it | Joas Schilling | 2016-01-28 | 2 | -0/+4 | |
| * | | | | | | | Do not create a loop that generates thousands of jobs | Joas Schilling | 2016-01-28 | 1 | -2/+11 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #21981 from owncloud/systemtags-trim-name | Thomas Müller | 2016-01-29 | 1 | -5/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Trim tag names to avoid problems | Joas Schilling | 2016-01-28 | 1 | -5/+6 | |
* | | | | | | | | Merge pull request #21993 from owncloud/updater-htacces | Thomas Müller | 2016-01-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Do not rewrite updater requests | Victor Dubiniuk | 2016-01-28 | 1 | -0/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-29 | 146 | -334/+50 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #21333 from owncloud/migrate-contacts | Thomas Müller | 2016-01-28 | 12 | -5/+650 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add copyright header | Lukas Reschke | 2016-01-28 | 1 | -0/+19 | |
| * | | | | | Fix sql to get shared addressbooks including unit tests | Thomas Müller | 2016-01-27 | 2 | -1/+17 | |
| * | | | | | Unit testing database access to old contacts tables | Thomas Müller | 2016-01-27 | 3 | -3/+267 | |
| * | | | | | Unit testing migration logic | Thomas Müller | 2016-01-27 | 4 | -44/+176 | |
| * | | | | | Add app to migrate contacts and calendars | Thomas Müller | 2016-01-27 | 8 | -5/+219 | |
* | | | | | | Merge pull request #21860 from owncloud/sharedialog-ocs-adapter | Vincent Petry | 2016-01-28 | 9 | -544/+617 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Fix share default expiration date calculation | Vincent Petry | 2016-01-28 | 2 | -9/+8 | |
| * | | | | | Share dialog use OCS API | Vincent Petry | 2016-01-28 | 8 | -537/+611 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #21975 from owncloud/fix_ocs_unit_tests | Thomas Müller | 2016-01-28 | 2 | -32/+32 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix OCS unit tests after two share merges | Roeland Jago Douma | 2016-01-28 | 2 | -32/+32 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #21958 from owncloud/systemtags-style | Thomas Müller | 2016-01-28 | 5 | -25/+46 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use boxes for system tags, shorten permission text | Vincent Petry | 2016-01-28 | 5 | -25/+46 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings | Thomas Müller | 2016-01-28 | 2 | -32/+744 | |
|\ \ \ \ \ | ||||||
| * | | | | | [Share 2.0] Allow using permissions to update link share | Roeland Jago Douma | 2016-01-27 | 2 | -14/+113 | |
| * | | | | | [Share 2.0] Still allow isolated updates | Roeland Jago Douma | 2016-01-27 | 2 | -11/+125 | |
| * | | | | | [Share 2.0] Also handle empty parameter in updateShare | Roeland Jago Douma | 2016-01-27 | 2 | -24/+283 | |
| * | | | | | [Share 2.0] When passing empty strings don't fail | Roeland Jago Douma | 2016-01-27 | 2 | -10/+250 | |
* | | | | | | Merge pull request #21952 from owncloud/systemtags-fix-conflicts | Thomas Müller | 2016-01-28 | 2 | -3/+85 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix system tags conflict situations | Vincent Petry | 2016-01-27 | 2 | -3/+85 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #21851 from owncloud/shared-unreadable | Thomas Müller | 2016-01-28 | 8 | -548/+71 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix cachejail->update | Robin Appelman | 2016-01-28 | 1 | -1/+1 | |
| * | | | | | | cleanup shared cache | Robin Appelman | 2016-01-28 | 8 | -547/+70 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #21858 from owncloud/getMountsForFileId | Thomas Müller | 2016-01-28 | 3 | -13/+205 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix failing oracle and postgres tests | Joas Schilling | 2016-01-27 | 1 | -2/+2 | |
| * | | | | | | Use new constants | Joas Schilling | 2016-01-27 | 1 | -7/+8 | |
| * | | | | | | add IUserMountCache->getMountsForFileId | Robin Appelman | 2016-01-27 | 3 | -7/+198 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #21970 from zander/mentionbot | Thomas Müller | 2016-01-28 | 1 | -1/+2 | |
|\ \ \ \ \ \ |