summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fix type in class nameJoas Schilling2016-03-111-1/+1
| * | | | Remove hardcoded api versionsJoas Schilling2016-03-111-3/+3
| * | | | asCreatingAShareWith has no returnJoas Schilling2016-03-111-1/+1
| * | | | Fix docsJoas Schilling2016-03-111-3/+20
| |/ / /
* | | | Merge pull request #23125 from owncloud/add-port-support-to-trusteddomainThomas Müller2016-03-112-1/+15
|\ \ \ \
| * | | | Explicitly check for portLukas Reschke2016-03-102-1/+15
| | |/ / | |/| |
* | | | Merge pull request #22750 from owncloud/integration-tests-federated-resharingThomas Müller2016-03-113-1/+152
|\ \ \ \
| * | | | Change resharing to local instead of remote because of a deadlockSergio Bertolin2016-03-111-5/+10
| * | | | Adding new tests for federation sharingSergio Bertolín2016-03-113-1/+147
* | | | | Merge pull request #23133 from owncloud/more_generic_share_parametersThomas Müller2016-03-114-26/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use more generic node instead of File/FolderRoeland Jago Douma2016-03-114-26/+9
| |/ / /
* | | | Merge pull request #23080 from owncloud/use-non-localized-birthday-titleThomas Müller2016-03-112-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Use a birthday title which does not require translation because we have no id...Thomas Müller2016-03-102-3/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1144-214/+446
* | | | Merge pull request #23086 from owncloud/ldap-sort-deprecatedThomas Müller2016-03-113-30/+1
|\ \ \ \
| * | | | remove deprecated ldap_sortArthur Schiwon2016-03-103-30/+1
| |/ / /
* | | | Merge pull request #23129 from SteKoe/add-jpg-to-htaccessThomas Müller2016-03-101-1/+1
|\ \ \ \
| * | | | Allow jpg files to be statically servedStephan Köninger2016-03-101-1/+1
* | | | | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-masterThomas Müller2016-03-103-12/+65
|\ \ \ \ \
| * | | | | getOwner is not available on FileHome - fixes #23116Thomas Müller2016-03-103-12/+65
* | | | | | Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10Thomas Müller2016-03-101-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fake LOCK statement for Windows 7, 8 and 10 network mountsMorris Jobke2016-03-101-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #23027 from owncloud/bump_symfony_consoleThomas Müller2016-03-101-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [3rdparty] Bump symfony/console to 2.8.3Roeland Jago Douma2016-03-101-0/+0
* | | | | Merge pull request #23121 from owncloud/scrutinizer_share_fixesThomas Müller2016-03-103-4/+4
|\ \ \ \ \
| * | | | | Fix some scrutinizer warning in the sharing codeRoeland Jago Douma2016-03-103-4/+4
| |/ / / /
* | | | | Merge pull request #23120 from owncloud/do_not_analyze_composerThomas Müller2016-03-101-1/+1
|\ \ \ \ \
| * | | | | Scrutinizer should not check generated composer filesRoeland Jago Douma2016-03-101-1/+1
| |/ / / /
* | | | | Merge pull request #23056 from owncloud/fix_23044Thomas Müller2016-03-103-4/+26
|\ \ \ \ \
| * | | | | Add intergration testsRoeland Jago Douma2016-03-101-0/+7
| * | | | | Add mimetype to OCS Share API outputRoeland Jago Douma2016-03-102-4/+19
| | |_|/ / | |/| | |
* | | | | Merge pull request #23100 from owncloud/DeepDiver1975-patch-1Thomas Müller2016-03-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Execute travis test on stable branches as wellThomas Müller2016-03-101-1/+1
| |/ / /
* | | | Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-setThomas Müller2016-03-102-4/+19
|\ \ \ \
| * | | | fixes #23004Thomas Müller2016-03-102-3/+18
| * | | | fixes #23020Thomas Müller2016-03-091-1/+1
* | | | | Merge pull request #23087 from owncloud/allow-migrating-all-calendarsThomas Müller2016-03-102-4/+4
|\ \ \ \ \
| * | | | | Allow to migrate calendars of all usersJoas Schilling2016-03-102-4/+4
* | | | | | Merge pull request #23079 from owncloud/readonly-birthday-calThomas Müller2016-03-102-7/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | The birthday_calendar is read-onlyThomas Müller2016-03-102-7/+13
| | |_|/ / | |/| | |
* | | | | Merge pull request #23084 from owncloud/fix_23067Thomas Müller2016-03-101-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix MKCOL for IE11 as wellRoeland Jago Douma2016-03-101-1/+6
|/ / / /
* | | | Merge pull request #21582 from owncloud/core_composerThomas Müller2016-03-1011-0/+526
|\ \ \ \
| * | | | POC for PSR-4 autoloader server.php => Server.phpRoeland Jago Douma2016-03-091-0/+0
| * | | | Add composers default autoloader to coreRoeland Jago Douma2016-03-0910-0/+526
* | | | | Merge pull request #23017 from owncloud/first-stop-the-dockersThomas Müller2016-03-108-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | docker containers should be stopped before being removed - refs https://githu...Thomas Müller2016-03-098-0/+9
* | | | | Merge pull request #23050 from owncloud/href-target-blankThomas Müller2016-03-101-1/+1
|\ \ \ \ \
| * | | | | make sure links open in new tabsJan-Christoph Borchardt2016-03-091-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #23029 from owncloud/add-rewrite-rules-after-setupThomas Müller2016-03-102-3/+3
|\ \ \ \ \