Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20602 from owncloud/fix-installed-apps | Thomas Müller | 2015-11-26 | 2 | -4/+13 |
|\ | | | | | Always installed apps includes the hardcoded ones from shipped.json | ||||
| * | fix unit tests | Morris Jobke | 2015-11-23 | 2 | -4/+13 |
| | | |||||
* | | Merge pull request #20702 from owncloud/move-user-principal-into-subfolder | Thomas Müller | 2015-11-26 | 1 | -1/+6 |
|\ \ | | | | | | | Users are available under it's own principal resource named 'principa… | ||||
| * | | Introduce \OCP\IUser::getEMailAddress() | Thomas Müller | 2015-11-25 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #20393 from owncloud/querybuilder-select-with-alias | Thomas Müller | 2015-11-26 | 1 | -34/+116 |
|\ \ \ | | | | | | | | | Add a method to select a field or value with alias | ||||
| * | | | Add a method to select a field or value with alias | Joas Schilling | 2015-11-23 | 1 | -34/+116 |
| | | | | |||||
* | | | | Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup | Thomas Müller | 2015-11-26 | 1 | -23/+0 |
|\ \ \ \ | | | | | | | | | | | Remove last occurences of OC_Helper::getMimeType() | ||||
| * | | | | Remove last occurences of OC_Helper::getMimeType() | Morris Jobke | 2015-11-26 | 1 | -23/+0 |
| | |/ / | |/| | | | | | | | | | | * ref #4774 | ||||
* | | | | Merge pull request #20731 from owncloud/per-storage-updater | Thomas Müller | 2015-11-26 | 1 | -30/+11 |
|\ \ \ \ | | | | | | | | | | | Make Cache\Updater per storage | ||||
| * | | | | Make Cache\Updater per storage | Robin Appelman | 2015-11-25 | 1 | -30/+11 |
| | | | | | |||||
* | | | | | Remove unused internal methods | Morris Jobke | 2015-11-26 | 1 | -12/+0 |
| |/ / / |/| | | | | | | | | | | | | | | | * removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace * keeps public interface wrapper working as expected | ||||
* | | | | Merge pull request #20691 from owncloud/share2.0_di_fixes | Thomas Müller | 2015-11-25 | 2 | -255/+108 |
|\ \ \ \ | |/ / / |/| | | | [Sharing 2.0] di fixes | ||||
| * | | | [Sharing 2.0] Default share provider only generic DI | Roeland Jago Douma | 2015-11-24 | 1 | -141/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | No injection of userfolders etc. Only generic DI components (IRootFolder) etc should be used to make sure we can also run this from the cli | ||||
| * | | | [Sharing 2.0] Removed unused DI stuff | Roeland Jago Douma | 2015-11-24 | 1 | -114/+3 |
| | | | | | | | | | | | | | | | | | | | | The share manager etc should not care about filtering stuff. They should return what is asked for them. | ||||
* | | | | Merge pull request #20439 from owncloud/etag-propagate-in-storage | Thomas Müller | 2015-11-25 | 3 | -38/+43 |
|\ \ \ \ | | | | | | | | | | | Take submount etag into account for folder etags | ||||
| * | | | | update tests | Robin Appelman | 2015-11-19 | 2 | -38/+10 |
| | | | | | |||||
| * | | | | take the etag of child mounts into account for the folder etag | Robin Appelman | 2015-11-19 | 1 | -0/+33 |
| | |_|/ | |/| | | | | | | | | | | this replaces shared etag propagation | ||||
* | | | | 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 |