Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 |
|\ \ \ \ | |||||
| * | | | | Add intergration tests | Roeland Jago Douma | 2016-03-10 | 1 | -0/+7 |
| * | | | | Add mimetype to OCS Share API output | Roeland Jago Douma | 2016-03-10 | 2 | -4/+19 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #23100 from owncloud/DeepDiver1975-patch-1 | Thomas Müller | 2016-03-10 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Execute travis test on stable branches as well | Thomas Müller | 2016-03-10 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-set | Thomas Müller | 2016-03-10 | 2 | -4/+19 |
|\ \ \ | |||||
| * | | | fixes #23004 | Thomas Müller | 2016-03-10 | 2 | -3/+18 |
| * | | | fixes #23020 | Thomas Müller | 2016-03-09 | 1 | -1/+1 |
* | | | | Merge pull request #23087 from owncloud/allow-migrating-all-calendars | Thomas Müller | 2016-03-10 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Allow to migrate calendars of all users | Joas Schilling | 2016-03-10 | 2 | -4/+4 |
* | | | | | Merge pull request #23079 from owncloud/readonly-birthday-cal | Thomas Müller | 2016-03-10 | 2 | -7/+13 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | The birthday_calendar is read-only | Thomas Müller | 2016-03-10 | 2 | -7/+13 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #23084 from owncloud/fix_23067 | Thomas Müller | 2016-03-10 | 1 | -1/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix MKCOL for IE11 as well | Roeland Jago Douma | 2016-03-10 | 1 | -1/+6 |
|/ / / | |||||
* | | | Merge pull request #21582 from owncloud/core_composer | Thomas Müller | 2016-03-10 | 11 | -0/+526 |
|\ \ \ | |||||
| * | | | POC for PSR-4 autoloader server.php => Server.php | Roeland Jago Douma | 2016-03-09 | 1 | -0/+0 |
| * | | | Add composers default autoloader to core | Roeland Jago Douma | 2016-03-09 | 10 | -0/+526 |
* | | | | Merge pull request #23017 from owncloud/first-stop-the-dockers | Thomas Müller | 2016-03-10 | 8 | -0/+9 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | docker containers should be stopped before being removed - refs https://githu... | Thomas Müller | 2016-03-09 | 8 | -0/+9 |
* | | | | Merge pull request #23050 from owncloud/href-target-blank | Thomas Müller | 2016-03-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | make sure links open in new tabs | Jan-Christoph Borchardt | 2016-03-09 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #23029 from owncloud/add-rewrite-rules-after-setup | Thomas Müller | 2016-03-10 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Add base rewrite rule only when RewriteBase is defined | Lukas Reschke | 2016-03-09 | 2 | -3/+3 |
| | |/ / | |/| | |