aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21509 from owncloud/users-scrolltopThomas Müller2016-01-131-1/+8
|\
| * Keep scroll position in users page when sortingVincent Petry2016-01-071-1/+8
* | Merge pull request #21606 from owncloud/special_characters_testsThomas Müller2016-01-131-0/+19
|\ \
| * | Added test case about deleting a group with special charactersSergio Bertolín2016-01-131-0/+8
| * | Added test with spcial chars in groupSergio Bertolín2016-01-131-0/+11
* | | Merge pull request #21659 from ErikPel/cssfixThomas Müller2016-01-131-1/+1
|\ \ \
| * | | Fixed #21542Erik Pellikka2016-01-131-1/+1
* | | | Merge pull request #21655 from owncloud/remove-listener-pluginThomas Müller2016-01-136-82/+0
|\ \ \ \
| * | | | Remove the listener pluginJoas Schilling2016-01-136-82/+0
* | | | | Merge pull request #21392 from owncloud/files_external-importThomas Müller2016-01-134-0/+287
|\ \ \ \ \
| * | | | | Add import command for files externalRobin Appelman2016-01-114-0/+287
* | | | | | Merge pull request #21591 from owncloud/add-code-checking-for-appsThomas Müller2016-01-137-15/+267
|\ \ \ \ \ \
| * | | | | | Verify signature of apps with level "Official" coming from the appstoreLukas Reschke2016-01-107-15/+267
* | | | | | | Merge pull request #21612 from owncloud/fix_21598Thomas Müller2016-01-132-16/+69
|\ \ \ \ \ \ \
| * | | | | | | only use master key ID if a user is logged in. Otherwise keep the public link...Björn Schießle2016-01-112-16/+69
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #21615 from owncloud/shared-islocalThomas Müller2016-01-131-0/+7
|\ \ \ \ \ \ \
| * | | | | | | implement isLocal for shared storageRobin Appelman2016-01-111-0/+7
| |/ / / / / /
* | | | | | | Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdocThomas Müller2016-01-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix wrong class name in phpdocblizzz2016-01-111-1/+1
* | | | | | | | Merge pull request #21630 from owncloud/add-some-security-headers-as-hardeningThomas Müller2016-01-134-12/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Add X-Download-Options and X-Permitted-Cross-Domain-PoliciesLukas Reschke2016-01-124-12/+45
* | | | | | | | | Merge pull request #21648 from owncloud/smb-statcache-capThomas Müller2016-01-134-2/+163
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | cap the number of entries we cache in smb's statcacheRobin Appelman2016-01-124-2/+163
* | | | | | | | | Merge pull request #21663 from owncloud/occ-external-mountpointThomas Müller2016-01-131-2/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | allow setting mountpoint with occ files_external:configRobin Appelman2016-01-121-2/+10
* | | | | | | | | | Merge pull request #21668 from owncloud/add-super-evil-and-hidden-config-swit...Thomas Müller2016-01-135-4/+248
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add hidden config switch to disable code integrity checkingLukas Reschke2016-01-125-4/+248
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #21671 from owncloud/fix-setup-on-masterThomas Müller2016-01-131-1/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use legacy method when ownCloud is not yet installedLukas Reschke2016-01-121-1/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #21673 from owncloud/chrsch-masterThomas Müller2016-01-131-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | -- Fixed error where $enabled is parsed but emptyChristoph Schaefer2016-01-131-0/+4
| |/ / / / / / / /
* | | | | | | | | Merge pull request #21653 from owncloud/update-license-headers-2016Thomas Müller2016-01-131195-1594/+2742
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Happy new year!Thomas Müller2016-01-121194-1593/+2739
| * | | | | | | | | We have new apps ....Thomas Müller2016-01-121-1/+3
* | | | | | | | | | Merge pull request #20948 from owncloud/fed-sync-contactsThomas Müller2016-01-1319-30/+582
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reuse backend as provided by the app containerThomas Müller2016-01-121-9/+3
| * | | | | | | | | | Fix ctor callThomas Müller2016-01-123-4/+0
| * | | | | | | | | | fix doc-blockBjörn Schießle2016-01-121-7/+1
| * | | | | | | | | | create urls in a way that sabredav handles it correctlyBjörn Schießle2016-01-121-2/+2
| * | | | | | | | | | Catch exceptions during syncThomas Müller2016-01-122-7/+8
| * | | | | | | | | | federation has to be of type filesystem so that we load this app for webdav r...Thomas Müller2016-01-122-0/+6
| * | | | | | | | | | Inject DbHandler ....Thomas Müller2016-01-122-9/+10
| * | | | | | | | | | md5 -> sha1Thomas Müller2016-01-121-1/+1
| * | | | | | | | | | Address commentsThomas Müller2016-01-123-7/+11
| * | | | | | | | | | Adding unit tests for the sync serviceThomas Müller2016-01-122-1/+94
| * | | | | | | | | | Adding tests and adjust PHPDocThomas Müller2016-01-126-13/+120
| * | | | | | | | | | Fix registration of sync commandThomas Müller2016-01-121-4/+1
| * | | | | | | | | | Decouple federation and dav appThomas Müller2016-01-1210-26/+271
| * | | | | | | | | | Use EventDispatcher to allow additional setup of auth backends - move federat...Thomas Müller2016-01-124-3/+35
| * | | | | | | | | | Allow trusted servers to authenticateThomas Müller2016-01-124-3/+85
| |/ / / / / / / / /