Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure that object id can be a string | Joas Schilling | 2015-11-23 | 1 | -14/+22 |
| | |||||
* | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId | Thomas Müller | 2015-11-23 | 3 | -44/+7 |
|\ | | | | | lastInsertId() is properly working with Oracle if the table name is p… | ||||
| * | lastInsertId() is properly working with Oracle if the table name is properly ↵ | Thomas Müller | 2015-11-23 | 3 | -44/+7 |
| | | | | | | | | passed in | ||||
* | | Merge pull request #20543 from owncloud/share2.0_fix_hooks | Thomas Müller | 2015-11-23 | 2 | -211/+410 |
|\ \ | | | | | | | Move hook and delete children logic to share manager | ||||
| * | | [Sharing 2.0] Move hook and delete children logic to share manager | Roeland Jago Douma | 2015-11-23 | 2 | -211/+410 |
| | | | | | | | | | | | | | | | | | | | | | To make sure hooks are always fired and child entries are always cleaned. This logic is moved to the share manager. * Updated unit tests | ||||
* | | | Merge pull request #20577 from owncloud/notifications-datetime-timestamp | Thomas Müller | 2015-11-23 | 1 | -25/+35 |
|\ \ \ | |/ / |/| | | Use a DateTime object instead of a timestamp | ||||
| * | | Use a DateTime object instead of a timestamp | Joas Schilling | 2015-11-23 | 1 | -25/+35 |
| |/ | |||||
* | | Merge pull request #20222 from owncloud/federated_sharing_auto_complete | Thomas Müller | 2015-11-23 | 1 | -1/+1 |
|\ \ | |/ |/| | federated sharing auto-complete, first step | ||||
| * | added app "federation", allows you to connect ownClouds and exchange user lists | Björn Schießle | 2015-11-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16902 from owncloud/jsocclient | Thomas Müller | 2015-11-23 | 2 | -11/+28 |
|\ \ | | | | | | | Web UI uses Webdav instead of ajax/* calls | ||||
| * | | Fix undefined HTTP_USER_AGENT | Thomas Müller | 2015-11-22 | 1 | -8/+25 |
| | | | |||||
| * | | Added OC.Files.Client Webdav-based files client | Vincent Petry | 2015-11-22 | 1 | -3/+3 |
| | | | |||||
* | | | Moved changedisplayname to usercontroller | Roeland Jago Douma | 2015-11-20 | 1 | -0/+169 |
|/ / | | | | | | | | | Killed the old static route to change a users display name and moved it to a properly testable controller. | ||||
* | | Merge pull request #20614 from ↵ | Thomas Müller | 2015-11-20 | 1 | -30/+22 |
|\ \ | |/ |/| | | | | | owncloud/use-mocks-when-testing-isSharingDisabledForUser Use mocks when testing isSharingDisabledForUser | ||||
| * | Fix failing unit test :skull: | Thomas Müller | 2015-11-19 | 1 | -15/+1 |
| | | |||||
| * | Use mocks when testing isSharingDisabledForUser | Thomas Müller | 2015-11-19 | 1 | -30/+36 |
| | | |||||
* | | Make the JobList test more robust by sorting the result of getAll before ↵ | Joas Schilling | 2015-11-19 | 1 | -12/+24 |
|/ | | | | comparison | ||||
* | Merge pull request #20551 from owncloud/notification-fix-tests | Thomas Müller | 2015-11-18 | 2 | -20/+58 |
|\ | | | | | Notification - Add tests for the "return $this" and fix it on the new method | ||||
| * | Add tests for the "return $this" and fix it on the new method | Joas Schilling | 2015-11-17 | 2 | -20/+58 |
| | | |||||
* | | Merge pull request #20544 from owncloud/move-index-to-appframework | Thomas Müller | 2015-11-17 | 2 | -13/+25 |
|\ \ | |/ |/| | Move index.php from files to AppFramework | ||||
| * | Move index.php from files to AppFramework | Lukas Reschke | 2015-11-16 | 2 | -13/+25 |
| | | | | | | | | | | 1. Allows it to use the more secure CSP rules of the AppFramework. 2. Adds some unit tests. | ||||
* | | Merge pull request #20539 from owncloud/notification-api-adjustment | Thomas Müller | 2015-11-17 | 2 | -69/+36 |
|\ \ | |/ |/| | Notification api update | ||||
| * | Remove the icon for now | Joas Schilling | 2015-11-16 | 2 | -69/+0 |
| | | |||||
| * | Add "is primary action" to actions | Joas Schilling | 2015-11-16 | 1 | -0/+36 |
| | | |||||
* | | [Share2.0] OCS Share API getShare uses new code | Roeland Jago Douma | 2015-11-16 | 1 | -1/+1 |
|/ | |||||
* | [Avatar] No need to setup FS for avatar tests | Roeland Jago Douma | 2015-11-14 | 1 | -59/+40 |
| | |||||
* | enable microseconds in log timestamps | Christian Schnidrig | 2015-11-12 | 1 | -0/+67 |
| | |||||
* | Add tests for FileInfo owner | Robin Appelman | 2015-11-10 | 1 | -10/+44 |
| | |||||
* | Merge pull request #16604 from owncloud/cache-escape-like | Robin Appelman | 2015-11-10 | 1 | -0/+48 |
|\ | | | | | escape like parameter in cache operations | ||||
| * | Add test for special character during move | Robin Appelman | 2015-11-05 | 1 | -0/+48 |
| | | |||||
* | | Fix autoloader unit test output | Roeland Jago Douma | 2015-11-09 | 1 | -1/+0 |
| | | | | | | | | Removed leftover print statement | ||||
* | | [autoloader] Make sure to load construct full paths | Roeland Jago Douma | 2015-11-06 | 1 | -8/+45 |
| | | | | | | | | | | This reduces a lot of the autoloader magic and makes sure that we generate full paths in the autoloader. | ||||
* | | Merge pull request #20348 from owncloud/issue-20303-integer-group-names | Thomas Müller | 2015-11-06 | 1 | -0/+26 |
|\ \ | | | | | | | Make sure that group names are strings not integers | ||||
| * | | Make sure that group names are strings not integers | Joas Schilling | 2015-11-06 | 1 | -0/+26 |
| | | | |||||
* | | | Merge pull request #20288 from owncloud/fix_20234 | Thomas Müller | 2015-11-06 | 1 | -0/+96 |
|\ \ \ | |/ / |/| | | make sure that we update the unencrypted size for the versions | ||||
| * | | make sure that we update the unencrypted size for the versions | Björn Schießle | 2015-11-04 | 1 | -0/+96 |
| | | | |||||
* | | | Fix oracle | Roeland Jago Douma | 2015-11-05 | 1 | -35/+119 |
| | | | |||||
* | | | Add unshare hooks | Roeland Jago Douma | 2015-11-05 | 1 | -101/+128 |
| | | | |||||
* | | | The new sharing code now handles deletion | Roeland Jago Douma | 2015-11-05 | 2 | -0/+741 |
| | | | | | | | | | | | | OCS -> ShareManager -> DefaultShareProvider | ||||
* | | | subadmin methods should not return any null user or group | Arthur Schiwon | 2015-11-05 | 1 | -0/+31 |
| |/ |/| | |||||
* | | Merge pull request #20157 from owncloud/users-fixeveryonecount | Thomas Müller | 2015-11-04 | 1 | -0/+69 |
|\ \ | |/ |/| | Fix everyone count for subadmins | ||||
| * | Fix everyone count for subadmins | Vincent Petry | 2015-10-29 | 1 | -0/+69 |
| | | | | | | | | Also moved the logic to the UsersController | ||||
* | | Use proper statement to retrieve the IP of an docker instance | Morris Jobke | 2015-10-30 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #20135 from owncloud/check-if-null-subadmin | Thomas Müller | 2015-10-29 | 2 | -191/+362 |
|\ | | | | | Drop OC_SubAdmin and replace usages | ||||
| * | Drop OC_SubAdmin and replace usages | Lukas Reschke | 2015-10-29 | 2 | -191/+362 |
| | | |||||
* | | Merge pull request #20134 from owncloud/pass-with-skipping | Thomas Müller | 2015-10-29 | 2 | -17/+18 |
|\ \ | | | | | | | Make Travis CI pass when DAV was not touched | ||||
| * | | Make Travis CI pass when DAV was not touched | Joas Schilling | 2015-10-29 | 2 | -17/+18 |
| |/ | |||||
* | | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename | Thomas Müller | 2015-10-29 | 2 | -2/+51 |
|\ \ | | | | | | | On rename, also refresh storage_mtime of the target file | ||||
| * | | Fix locking unit tests due to filemtime addition | Vincent Petry | 2015-10-26 | 1 | -2/+10 |
| | | | |||||
| * | | Also adjust storage_mtime of target after rename | Vincent Petry | 2015-10-26 | 1 | -0/+41 |
| | | | | | | | | | | | | Some storages like Dropbox change their mtime on rename... |