Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Mark testing app as compatible with 9.1 | Lukas Reschke | 2016-03-13 | 1 | -1/+1 |
* | Merge pull request #22242 from owncloud/remove_old_ocs_share_api_code | Roeland Douma | 2016-03-13 | 3 | -1538/+636 |
|\ | |||||
| * | Do not recurse link share fetching | Roeland Jago Douma | 2016-03-13 | 1 | -0/+5 |
| * | Fix intergration tests | Roeland Jago Douma | 2016-03-13 | 1 | -893/+631 |
| * | Remove the old OCS Share API code | Roeland Jago Douma | 2016-03-13 | 1 | -645/+0 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-12 | 14 | -8/+60 |
* | Merge pull request #23137 from owncloud/bump_doctrine | Thomas Müller | 2016-03-11 | 1 | -0/+0 |
|\ | |||||
| * | [3rdparty] Bump doctrine/dbal | Roeland Jago Douma | 2016-03-11 | 1 | -0/+0 |
|/ | |||||
* | Merge pull request #23141 from owncloud/behat-code-style | Thomas Müller | 2016-03-11 | 13 | -51/+233 |
|\ | |||||
| * | Fix WebDav | Joas Schilling | 2016-03-11 | 2 | -5/+39 |
| * | Fix docs of Tags | Joas Schilling | 2016-03-11 | 1 | -0/+35 |
| * | Remove unnecessary imports | Joas Schilling | 2016-03-11 | 1 | -2/+0 |
| * | Fix comments | Joas Schilling | 2016-03-11 | 1 | -2/+29 |
| * | Fix checksumsContext | Joas Schilling | 2016-03-11 | 1 | -1/+23 |
| * | Fix issues in CardDav | Joas Schilling | 2016-03-11 | 1 | -3/+13 |
| * | Add docs for CalDavContext | Joas Schilling | 2016-03-11 | 1 | -0/+10 |
| * | Docs for BasicStructure | Joas Schilling | 2016-03-11 | 1 | -0/+16 |
| * | Remove trailing spaces | Joas Schilling | 2016-03-11 | 1 | -1/+1 |
| * | Fix the use of traits | Joas Schilling | 2016-03-11 | 2 | -4/+0 |
| * | Fix inheritance of members | Joas Schilling | 2016-03-11 | 3 | -13/+31 |
| * | API version needs to be on basic because we use it there | Joas Schilling | 2016-03-11 | 2 | -12/+11 |
| * | Fix type in class name | Joas Schilling | 2016-03-11 | 1 | -1/+1 |
| * | Remove hardcoded api versions | Joas Schilling | 2016-03-11 | 1 | -3/+3 |
| * | asCreatingAShareWith has no return | Joas Schilling | 2016-03-11 | 1 | -1/+1 |
| * | Fix docs | Joas Schilling | 2016-03-11 | 1 | -3/+20 |
* | | Merge pull request #23125 from owncloud/add-port-support-to-trusteddomain | Thomas Müller | 2016-03-11 | 2 | -1/+15 |
|\ \ | |||||
| * | | Explicitly check for port | Lukas Reschke | 2016-03-10 | 2 | -1/+15 |
* | | | Merge pull request #22750 from owncloud/integration-tests-federated-resharing | Thomas Müller | 2016-03-11 | 3 | -1/+152 |
|\ \ \ | |||||
| * | | | Change resharing to local instead of remote because of a deadlock | Sergio Bertolin | 2016-03-11 | 1 | -5/+10 |
| * | | | Adding new tests for federation sharing | Sergio Bertolín | 2016-03-11 | 3 | -1/+147 |
* | | | | Merge pull request #23133 from owncloud/more_generic_share_parameters | Thomas Müller | 2016-03-11 | 4 | -26/+9 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Use more generic node instead of File/Folder | Roeland Jago Douma | 2016-03-11 | 4 | -26/+9 |
| |/ / | |||||
* | | | Merge pull request #23080 from owncloud/use-non-localized-birthday-title | Thomas Müller | 2016-03-11 | 2 | -3/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use a birthday title which does not require translation because we have no id... | Thomas Müller | 2016-03-10 | 2 | -3/+3 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-11 | 44 | -214/+446 |
* | | | Merge pull request #23086 from owncloud/ldap-sort-deprecated | Thomas Müller | 2016-03-11 | 3 | -30/+1 |
|\ \ \ | |||||
| * | | | remove deprecated ldap_sort | Arthur Schiwon | 2016-03-10 | 3 | -30/+1 |
| |/ / | |||||
* | | | Merge pull request #23129 from SteKoe/add-jpg-to-htaccess | Thomas Müller | 2016-03-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Allow jpg files to be statically served | Stephan Köninger | 2016-03-10 | 1 | -1/+1 |
* | | | | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master | Thomas Müller | 2016-03-10 | 3 | -12/+65 |
|\ \ \ \ | |||||
| * | | | | getOwner is not available on FileHome - fixes #23116 | Thomas Müller | 2016-03-10 | 3 | -12/+65 |
* | | | | | Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10 | Thomas Müller | 2016-03-10 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fake LOCK statement for Windows 7, 8 and 10 network mounts | Morris Jobke | 2016-03-10 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #23027 from owncloud/bump_symfony_console | Thomas Müller | 2016-03-10 | 1 | -0/+0 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | [3rdparty] Bump symfony/console to 2.8.3 | Roeland Jago Douma | 2016-03-10 | 1 | -0/+0 |
* | | | | Merge pull request #23121 from owncloud/scrutinizer_share_fixes | Thomas Müller | 2016-03-10 | 3 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Fix some scrutinizer warning in the sharing code | Roeland Jago Douma | 2016-03-10 | 3 | -4/+4 |
| |/ / / | |||||
* | | | | Merge pull request #23120 from owncloud/do_not_analyze_composer | Thomas Müller | 2016-03-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Scrutinizer should not check generated composer files | Roeland Jago Douma | 2016-03-10 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #23056 from owncloud/fix_23044 | Thomas Müller | 2016-03-10 | 3 | -4/+26 |
|\ \ \ \ |