Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20789 from owncloud/scanner-skip-not-available | Robin Appelman | 2015-11-27 | 1 | -2/+17 |
|\ | |||||
| * | also log exception | Robin Appelman | 2015-11-27 | 1 | -0/+1 |
| * | Skip unavailable storages in scanner | Robin Appelman | 2015-11-27 | 1 | -2/+16 |
* | | Merge pull request #20792 from owncloud/autoloader-absolute-paths | Thomas Müller | 2015-11-27 | 1 | -1/+5 |
|\ \ | |||||
| * | | Dont bother with stream_resolve_include_path if the path is already absolute | Robin Appelman | 2015-11-27 | 1 | -1/+5 |
| |/ | |||||
* | | Merge pull request #20782 from mitar/better-https | Thomas Müller | 2015-11-27 | 1 | -1/+2 |
|\ \ | |||||
| * | | Also allow empty value for no-HTTPS. | Mitar | 2015-11-27 | 1 | -1/+2 |
| |/ | |||||
* / | Add full interface of server container as alias | Morris Jobke | 2015-11-26 | 1 | -0/+1 |
|/ | |||||
* | 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 | Morris Jobke | 2015-11-19 | 1 | -0/+6 |
* | | Merge pull request #20702 from owncloud/move-user-principal-into-subfolder | Thomas Müller | 2015-11-26 | 2 | -0/+18 |
|\ \ | |||||
| * | | Introduce \OCP\IUser::getEMailAddress() | Thomas Müller | 2015-11-25 | 2 | -0/+18 |
* | | | Merge pull request #20393 from owncloud/querybuilder-select-with-alias | Thomas Müller | 2015-11-26 | 2 | -0/+42 |
|\ \ \ | |||||
| * | | | Add a method to select a field or value with alias | Joas Schilling | 2015-11-23 | 2 | -0/+42 |
* | | | | Merge pull request #20746 from owncloud/untangle-linkToDocs | Thomas Müller | 2015-11-26 | 5 | -17/+16 |
|\ \ \ \ | |||||
| * | | | | Untangle the linkToDocs method in OC_Helper | Morris Jobke | 2015-11-26 | 5 | -17/+16 |
* | | | | | Merge pull request #20562 from owncloud/comments-interfaces | Thomas Müller | 2015-11-26 | 4 | -0/+378 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | proper description for IllegalIDChangeException | Arthur Schiwon | 2015-11-26 | 1 | -1/+1 |
| * | | | | missing setters for setChildrenCount and setLatestChildDateTime (formerly …... | Arthur Schiwon | 2015-11-23 | 1 | -5/+23 |
| * | | | | give creation datetime setter and getter a more meaningful and less misleadin... | Arthur Schiwon | 2015-11-23 | 1 | -5/+5 |
| * | | | | public interfaces for Comments | Arthur Schiwon | 2015-11-23 | 4 | -0/+360 |
* | | | | | Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup | Thomas Müller | 2015-11-26 | 4 | -15/+3 |
|\ \ \ \ \ | |||||
| * | | | | | remove unused method | Morris Jobke | 2015-11-26 | 1 | -12/+0 |
| * | | | | | Remove last occurences of OC_Helper::getMimeType() | Morris Jobke | 2015-11-26 | 3 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20731 from owncloud/per-storage-updater | Thomas Müller | 2015-11-26 | 5 | -114/+144 |
|\ \ \ \ \ | |||||
| * | | | | | Make Cache\Updater per storage | Robin Appelman | 2015-11-25 | 5 | -114/+144 |
* | | | | | | Remove unused internal methods | Morris Jobke | 2015-11-26 | 2 | -33/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #20691 from owncloud/share2.0_di_fixes | Thomas Müller | 2015-11-25 | 5 | -85/+64 |
|\ \ \ \ \ | |||||
| * | | | | | [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 |
| * | | | | | [Sharing 2.0] Removed unused DI stuff | Roeland Jago Douma | 2015-11-24 | 1 | -36/+8 |
* | | | | | | Merge pull request #20705 from owncloud/fix_20648 | Thomas Müller | 2015-11-25 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix overriding function from 3rdparty warning | Roeland Jago Douma | 2015-11-24 | 1 | -2/+2 |
* | | | | | | Merge pull request #20439 from owncloud/etag-propagate-in-storage | Thomas Müller | 2015-11-25 | 8 | -110/+242 |
|\ \ \ \ \ \ | |||||
| * | | | | | | take the etag of child mounts into account for the folder etag | Robin Appelman | 2015-11-19 | 8 | -21/+158 |
| * | | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20693 from owncloud/phpdoc_node | Thomas Müller | 2015-11-24 | 1 | -8/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Consistent interface declaration | Roeland Jago Douma | 2015-11-23 | 1 | -8/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #20682 from owncloud/objectid-to-string | Thomas Müller | 2015-11-24 | 2 | -10/+14 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Make sure that object id can be a string | Joas Schilling | 2015-11-23 | 2 | -10/+14 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-24 | 84 | -158/+6 |
|/ / / | |||||
* | | | Merge pull request #20679 from owncloud/fixphpdoc | Thomas Müller | 2015-11-23 | 1 | -1/+1 |
|\ \ \ |