Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20602 from owncloud/fix-installed-apps | Thomas Müller | 2015-11-26 | 1 | -0/+6 |
|\ | | | | | Always installed apps includes the hardcoded ones from shipped.json | ||||
| * | Always installed apps includes the hardcoded ones from shipped.json | Morris Jobke | 2015-11-19 | 1 | -0/+6 |
| | | | | | | | | * fixes #20568 | ||||
* | | Merge pull request #20702 from owncloud/move-user-principal-into-subfolder | Thomas Müller | 2015-11-26 | 1 | -0/+10 |
|\ \ | | | | | | | Users are available under it's own principal resource named 'principa… | ||||
| * | | Introduce \OCP\IUser::getEMailAddress() | Thomas Müller | 2015-11-25 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #20393 from owncloud/querybuilder-select-with-alias | Thomas Müller | 2015-11-26 | 1 | -0/+24 |
|\ \ \ | | | | | | | | | 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 | -0/+24 |
| | | | | |||||
* | | | | Untangle the linkToDocs method in OC_Helper | Morris Jobke | 2015-11-26 | 4 | -15/+11 |
| | | | | | | | | | | | | | | | | | | | | * now uses the proper URLGenerator interface * add comment about DI problems | ||||
* | | | | Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup | Thomas Müller | 2015-11-26 | 3 | -14/+2 |
|\ \ \ \ | | | | | | | | | | | Remove last occurences of OC_Helper::getMimeType() | ||||
| * | | | | remove unused method | Morris Jobke | 2015-11-26 | 1 | -12/+0 |
| | | | | | |||||
| * | | | | Remove last occurences of OC_Helper::getMimeType() | Morris Jobke | 2015-11-26 | 2 | -2/+2 |
| | |/ / | |/| | | | | | | | | | | * ref #4774 | ||||
* | | | | Merge pull request #20731 from owncloud/per-storage-updater | Thomas Müller | 2015-11-26 | 5 | -114/+144 |
|\ \ \ \ | | | | | | | | | | | Make Cache\Updater per storage | ||||
| * | | | | Make Cache\Updater per storage | Robin Appelman | 2015-11-25 | 5 | -114/+144 |
| | | | | | |||||
* | | | | | Remove unused internal methods | Morris Jobke | 2015-11-26 | 1 | -31/+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 | 5 | -85/+64 |
|\ \ \ \ | | | | | | | | | | | [Sharing 2.0] di fixes | ||||
| * | | | | [Sharing 2.0] Fix phpdoc etc | Roeland Jago Douma | 2015-11-24 | 5 | -40/+47 |
| | | | | | |||||
| * | | | | [Sharing 2.0] Default share provider only generic DI | Roeland Jago Douma | 2015-11-24 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -36/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The share manager etc should not care about filtering stuff. They should return what is asked for them. | ||||
* | | | | | Merge pull request #20705 from owncloud/fix_20648 | Thomas Müller | 2015-11-25 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix overriding function from 3rdparty warning | ||||
| * | | | | Fix overriding function from 3rdparty warning | Roeland Jago Douma | 2015-11-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Fixes #20648 | ||||
* | | | | | Merge pull request #20439 from owncloud/etag-propagate-in-storage | Thomas Müller | 2015-11-25 | 8 | -110/+242 |
|\ \ \ \ \ | | | | | | | | | | | | | Take submount etag into account for folder etags | ||||
| * | | | | | take the etag of child mounts into account for the folder etag | Robin Appelman | 2015-11-19 | 8 | -21/+158 |
| | | | | | | | | | | | | | | | | | | | | | | | | this replaces shared etag propagation | ||||
| * | | | | | Fix scanning of incomplete folders | Robin Appelman | 2015-11-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | use relative path | Robin Appelman | 2015-11-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix fileinfo for non existing files | Robin Appelman | 2015-11-19 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Some more cleanup for getFIleInfo/getDirectoryContent | Robin Appelman | 2015-11-19 | 2 | -39/+42 |
| | | | | | | |||||
| * | | | | | Split getting cache entry and checking update to a seperate method | Robin Appelman | 2015-11-19 | 1 | -58/+46 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #20636 from owncloud/savre-3.0 | Thomas Müller | 2015-11-24 | 1 | -3/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | sabre/dav 3.0 and related | ||||
| * | | | | | Adjust sabre changes in core | Thomas Müller | 2015-11-24 | 1 | -3/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20692 from owncloud/federation_auto_add_servers | Thomas Müller | 2015-11-24 | 1 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | auto-add ownClouds to the list of trusted servers | ||||
| * | | | | use hooks to auto add server to the list of trusted servers once a federated ↵ | Björn Schießle | 2015-11-24 | 1 | -1/+4 |
| | |/ / | |/| | | | | | | | | | | share was created | ||||
* / | | | Make sure that object id can be a string | Joas Schilling | 2015-11-23 | 2 | -10/+14 |
|/ / / | |||||
* | | | Merge pull request #20679 from owncloud/fixphpdoc | Thomas Müller | 2015-11-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | p() supports string as argument | ||||
| * | | | p() supports string as argument | Morris Jobke | 2015-11-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId | Thomas Müller | 2015-11-23 | 3 | -18/+5 |
|\ \ \ \ | | | | | | | | | | | lastInsertId() is properly working with Oracle if the table name is p… | ||||
| * | | | | Throw an exception in case no table name is passed into lastInsertId of the ↵ | Thomas Müller | 2015-11-23 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | Oracle adapter | ||||
| * | | | | lastInsertId() is properly working with Oracle if the table name is properly ↵ | Thomas Müller | 2015-11-23 | 1 | -16/+1 |
| |/ / / | | | | | | | | | | | | | passed in | ||||
* | | | | Merge pull request #20543 from owncloud/share2.0_fix_hooks | Thomas Müller | 2015-11-23 | 3 | -49/+93 |
|\ \ \ \ | |_|_|/ |/| | | | 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 | 3 | -49/+93 |
| |/ / | | | | | | | | | | | | | | | | | | | To make sure hooks are always fired and child entries are always cleaned. This logic is moved to the share manager. * Updated unit tests | ||||
* / / | Use a DateTime object instead of a timestamp | Joas Schilling | 2015-11-23 | 2 | -22/+23 |
|/ / | |||||
* | | Merge pull request #16902 from owncloud/jsocclient | Thomas Müller | 2015-11-23 | 2 | -3/+13 |
|\ \ | | | | | | | Web UI uses Webdav instead of ajax/* calls | ||||
| * | | also match ie11 with Request::USER_AGENT_IE | Robin Appelman | 2015-11-22 | 1 | -1/+1 |
| | | | |||||
| * | | Now using IE8 workaround of davclient.js for all IE versions | Vincent Petry | 2015-11-22 | 1 | -2/+2 |
| | | | |||||
| * | | Fix undefined HTTP_USER_AGENT | Thomas Müller | 2015-11-22 | 1 | -0/+3 |
| | | | |||||
| * | | Add evert's davclient.js + es6-promise + IE8 workaround | Vincent Petry | 2015-11-22 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | - Add davclient.js lib - Add es6-promise required by that lib - Wrote IE8 workaround lib/shim for davclient.js | ||||
* | | | Merge pull request #20524 from owncloud/pgsql-version-check-error | Thomas Müller | 2015-11-23 | 1 | -6/+3 |
|\ \ \ | |/ / |/| | | assume pgsql >=9 if checking the version fails | ||||
| * | | assume pgsql >=9 if checking the version fails | Robin Appelman | 2015-11-16 | 1 | -6/+3 |
| | | | |||||
* | | | Merge pull request #20614 from ↵ | Thomas Müller | 2015-11-20 | 5 | -12/+21 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/use-mocks-when-testing-isSharingDisabledForUser Use mocks when testing isSharingDisabledForUser | ||||
| * | | | Adjust PHPDoc as suggested | Thomas Müller | 2015-11-20 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fix failing unit test :skull: | Thomas Müller | 2015-11-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use mocks when testing isSharingDisabledForUser | Thomas Müller | 2015-11-19 | 4 | -10/+19 |
| | |/ | |/| |