summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix attribute casing to ensure array keys workArthur Schiwon2015-10-272-4/+15
* fix update quota with known valueArthur Schiwon2015-10-272-3/+42
* Merge pull request #17104 from owncloud/chunked-upload-lockingRobin Appelman2015-10-274-13/+104
|\
| * adjust tests for new dav classesRobin Appelman2015-10-201-6/+6
| * remove locking for chunksRobin Appelman2015-10-201-4/+0
| * fix locking in testsRobin Appelman2015-10-201-2/+8
| * Adjust for wide lockingRobin Appelman2015-10-202-6/+12
| * Add tests for uploading to locked filesRobin Appelman2015-10-201-1/+81
| * locking for chunked dav uploadRobin Appelman2015-10-201-4/+7
* | Merge pull request #19894 from owncloud/enc_configure_encryption_for_home_sto...Thomas Müller2015-10-2711-61/+247
|\ \
| * | make encryption configurable for home storageBjoern Schiessle2015-10-2711-61/+247
* | | Merge pull request #20078 from owncloud/tipsy-bodyThomas Müller2015-10-271-1/+2
|\ \ \ | |/ / |/| |
| * | append tipsys to bodyHendrik Leppelsack2015-10-271-1/+2
* | | Merge pull request #20066 from owncloud/list-principaly-in-debug-modeThomas Müller2015-10-271-3/+8
|\ \ \
| * | | as soon as debug mode is enabled we allow listing of principalsThomas Müller2015-10-261-3/+8
* | | | Merge pull request #20076 from owncloud/fix_20069Thomas Müller2015-10-272-0/+17
|\ \ \ \
| * | | | Verify the src exists in webdav MOVERoeland Jago Douma2015-10-272-0/+17
| | |/ / | |/| |
* | | | Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspasswordThomas Müller2015-10-271-7/+12
|\ \ \ \ | |/ / / |/| | |
| * | | [IE9] Don't send link share password placeholderVincent Petry2015-10-261-7/+12
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2790-90/+216
* | | Merge pull request #19813 from owncloud/stay-on-apps-category-refreshThomas Müller2015-10-265-34/+206
|\ \ \ | |/ / |/| |
| * | Fix backwards and forward buttonJoas Schilling2015-10-261-1/+12
| * | Use speaking idsJoas Schilling2015-10-264-20/+61
| * | Fix backspace in search and empty content messageJoas Schilling2015-10-261-4/+9
| * | Add js tests for empty content pageJoas Schilling2015-10-261-4/+19
| * | Adjust js unit testsJoas Schilling2015-10-261-4/+43
| * | Display empty-content when there are no search resultsJoas Schilling2015-10-261-5/+13
| * | Clear search box for nowJoas Schilling2015-10-261-0/+1
| * | Allow searching by author name and app level as wellJoas Schilling2015-10-261-1/+30
| * | Stay on the same category when refreshing the page on the apps listJoas Schilling2015-10-264-8/+31
* | | Merge pull request #19837 from owncloud/always-enabled-appsThomas Müller2015-10-264-37/+68
|\ \ \
| * | | Fail hard if shipped.json is missingThomas Müller2015-10-261-9/+5
| * | | Don't show apps which are always enabled in the app managerThomas Müller2015-10-263-9/+20
| * | | Store list of apps which cannot be disabled in shipped.jsonThomas Müller2015-10-264-33/+57
* | | | Merge pull request #20049 from owncloud/make-author-file-completeThomas Müller2015-10-26138-132/+340
|\ \ \ \
| * | | | Update AUTHOR fileLukas Reschke2015-10-261-22/+177
| * | | | Update license headersLukas Reschke2015-10-26135-108/+141
| * | | | Update .mailmapLukas Reschke2015-10-261-1/+2
| * | | | Generate AUTHORS file from commitsLukas Reschke2015-10-261-1/+20
* | | | | Merge pull request #20046 from owncloud/share-clicklinkfocusThomas Müller2015-10-262-2/+26
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix share link focus on clickVincent Petry2015-10-262-2/+26
* | | | | Merge pull request #19949 from owncloud/davng-personal-filesThomas Müller2015-10-267-1/+478
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adding required parameters of ctor of class AuthThomas Müller2015-10-261-1/+4
| * | | | Introduced the new webdav endpoint remote.php/dav holding the principals and ...Thomas Müller2015-10-267-1/+475
|/ / / /
* | | | Merge pull request #20010 from owncloud/add-tests-auth-pluginThomas Müller2015-10-263-21/+399
|\ \ \ \
| * | | | Add tests for Sabre Auth plugin + make getCurrentUser compatibleLukas Reschke2015-10-233-21/+399
* | | | | Merge pull request #20037 from owncloud/phpseclib-dev-to-2.0.0Thomas Müller2015-10-261-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bump 3rdparty for phpseclib-2.0.0Roeland Jago Douma2015-10-261-0/+0
| | |/ / | |/| |
* | | | Merge pull request #20031 from owncloud/remove-dead-codeThomas Müller2015-10-261-8/+7
|\ \ \ \
| * | | | Remove dead codeLukas Reschke2015-10-251-8/+7