summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftpThomas Müller2016-03-312-2/+2
|\
| * Add urlencode to username part of ftp and sftp linksSenorsen2016-03-162-2/+2
* | Merge pull request #23713 from owncloud/small_encryption_fixThomas Müller2016-03-311-0/+1
|\ \
| * | make sure that we always remove the file again from the cache after the versi...Bjoern Schiessle2016-03-311-0/+1
* | | Merge pull request #23564 from owncloud/public-ajaxbasicauthMorris Jobke2016-03-312-2/+20
|\ \ \
| * | | Enforce typeLukas Reschke2016-03-311-2/+5
| * | | Return 401 DummyBasicAuth in case of ajax callVincent Petry2016-03-312-2/+17
* | | | Merge pull request #23655 from owncloud/better-ldap-designMorris Jobke2016-03-311-0/+18
|\ \ \ \
| * | | | Design LDAP wizard to better integrate into the designMorris Jobke2016-03-301-0/+18
* | | | | Merge pull request #23676 from owncloud/handle-null-return-getAppInfoMorris Jobke2016-03-313-1/+19
|\ \ \ \ \
| * | | | | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-03-303-1/+19
* | | | | | Merge pull request #23694 from owncloud/add-cov-graphMorris Jobke2016-03-311-0/+2
|\ \ \ \ \ \
| * | | | | | Adding coverage graph to see how we progressThomas Müller2016-03-311-0/+2
* | | | | | | Merge pull request #16857 from owncloud/printStylesheetsC. Montero Luque2016-03-314-12/+51
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | support print stylesheetsHendrik Leppelsack2016-01-134-12/+51
* | | | | | | Merge pull request #23517 from owncloud/gdrive-stream-downloadFrank Karlitschek2016-03-311-4/+5
|\ \ \ \ \ \ \
| * | | | | | | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
* | | | | | | | Merge pull request #23397 from paurisa/Fixed_23316Frank Karlitschek2016-03-312-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed hidden settings and delete iconsPau2016-03-182-4/+4
* | | | | | | | | Merge pull request #23445 from owncloud/enc_small_improvementFrank Karlitschek2016-03-311-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | no need to calculate the header size, if the first block contain a header we ...Bjoern Schiessle2016-03-211-1/+1
* | | | | | | | | | Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-setFrank Karlitschek2016-03-312-7/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure that the encrypted version is setLukas Reschke2016-03-312-7/+26
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_s...Frank Karlitschek2016-03-3112-130/+310
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-3112-130/+310
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #23516 from owncloud/dropbox-stream-downloadThomas Müller2016-03-311-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Dropbox stream download with RetryWrapperVincent Petry2016-03-231-4/+6
* | | | | | | | | | | Merge pull request #23526 from owncloud/fix_23337Frank Karlitschek2016-03-3110-3/+171
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Add unit testsRoeland Jago Douma2016-03-301-0/+93
| * | | | | | | | | | Move OCP\Share over to PSR-4Roeland Jago Douma2016-03-307-0/+0
| * | | | | | | | | | Add setId and setProviderID to the public interfaceRoeland Jago Douma2016-03-304-3/+78
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23702 from owncloud/emptycontentJan-Christoph Borchardt2016-03-314-4/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | improve emptycontent stylesJan-Christoph Borchardt2016-03-314-4/+9
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23690 from owncloud/add-codecov-iconThomas Müller2016-03-311-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add codecov iconLukas Reschke2016-03-311-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftpThomas Müller2016-03-311-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #15750 from owncloud/loading-feedback-email-usermanagementThomas Müller2016-03-313-10/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add loading feedback for email change in user managementMorris Jobke2016-03-163-10/+33
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-3142-28/+492
* | | | | | | | | | Merge pull request #23642 from stweil/masterThomas Müller2016-03-3011-14/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apps/files_external: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-305-6/+6
| * | | | | | | | | | apps/files_trashbin: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-302-3/+3
| * | | | | | | | | | apps/dav: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-304-5/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23508 from owncloud/text-columns-should-have-lengthThomas Müller2016-03-302-1/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Text columns should really have a length :see_no_evil:Thomas Müller2016-03-232-1/+22
* | | | | | | | | | Merge pull request #23663 from owncloud/share-displayownerfixThomas Müller2016-03-302-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Fix displaying owner before share icon in file listVincent Petry2016-03-302-3/+4
* | | | | | | | | | Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-againThomas Müller2016-03-301-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use the shipped cacerts.pem instead of the global oneLukas Reschke2016-03-301-0/+1
| | |/ / / / / / / | |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 00:49:17 +0000