summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-139-22/+176
* Merge pull request #8488 from owncloud/sabre-notfoundloglevelLukas Reschke2014-05-072-6/+20
|\
| * Some expected Sabre exceptions are now logged with DEBUG levelVincent Petry2014-05-072-6/+20
* | Merge pull request #8223 from owncloud/fix_linkToPublicVincent Petry2014-05-073-5/+231
|\ \
| * | Remove unused varThomas Tanghus2014-04-161-5/+0
| * | Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBaseThomas Tanghus2014-04-162-0/+223
| * | Also fix linkToAbsoluteThomas Tanghus2014-04-161-3/+7
| * | Fix linkToPublic. Refs #8218Thomas Tanghus2014-04-151-2/+6
* | | Merge pull request #8489 from owncloud/share_updater_ignore_part_filesVincent Petry2014-05-072-1/+11
|\ \ \
| * | | check if we have a fileinfoBjoern Schiessle2014-05-071-1/+5
| * | | ignore part filesBjoern Schiessle2014-05-071-0/+6
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0755-225/+341
* | | Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uriVincent Petry2014-05-061-1/+4
|\ \ \
| * | | Send URI instead of filepath to NGINX for X-Acceljosh4trunks2014-04-031-1/+4
* | | | Merge pull request #8466 from owncloud/fix-installation-caretMorris Jobke2014-05-061-2/+0
|\ \ \ \
| * | | | fix enlarged caret on installation pageJan-Christoph Borchardt2014-05-061-2/+0
|/ / / /
* | | | Merge pull request #8459 from owncloud/fix-getUserFolderMorris Jobke2014-05-051-2/+10
|\ \ \ \
| * | | | fix getUserFolder() of server containerMorris Jobke2014-05-051-2/+10
| | |_|/ | |/| |
* | | | Merge pull request #8456 from owncloud/extstorage-unittestssuiteThomas Müller2014-05-054-6/+2
|\ \ \ \
| * | | | Added ext storage app in autotest unit test runVincent Petry2014-05-054-6/+2
| |/ / /
* | | | Merge pull request #8458 from snai/masterVincent Petry2014-05-051-1/+1
|\ \ \ \
| * | | | Updated Owncloud Mailinglist URLMartin Grohmann2014-05-051-1/+1
* | | | | Merge pull request #8455 from owncloud/preview-scaleupicewind19912014-05-051-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Dont create borders around previews when scaling up is disabledRobin Appelman2014-05-051-1/+1
|/ / / /
* | | | Merge pull request #8386 from owncloud/fix_6946_masterVincent Petry2014-05-0511-127/+95
|\ \ \ \ | |/ / / |/| | |
| * | | the group manager calls exists check less often, adjust test accordinglyArthur Schiwon2014-04-281-1/+1
| * | | Group Database backend must not gather user details itself but ask userArthur Schiwon2014-04-2811-127/+95
* | | | Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-masterThomas Müller2014-05-0514-76/+135
|\ \ \ \
| * | | | load image via javascript and use $(document).width() to determine the proper...Thomas Müller2014-05-022-48/+62
| * | | | Images on public sharing get downscaled to increase use experience - this wil...Thomas Müller2014-05-0213-32/+77
* | | | | Merge pull request #8442 from owncloud/fix-typoThomas Müller2014-05-052-9/+9
|\ \ \ \ \
| * | | | | Fix PHP Doc and use readable variable nameLukas Reschke2014-05-041-6/+6
| * | | | | Does also take int or stringLukas Reschke2014-05-041-1/+1
| * | | | | Fix typoLukas Reschke2014-05-041-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0529-130/+209
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-04243-1045/+1206
* | | | | Merge pull request #8440 from wakeup/masterAndreas Fischer2014-05-031-2/+2
|\ \ \ \ \
| * | | | | Update config.sample.phpVolkan Gezer2014-05-031-1/+1
| * | | | | Minor changes in config.sampleVolkan Gezer2014-05-031-2/+2
* | | | | | Merge pull request #8023 from flyser/masterMorris Jobke2014-05-033-3/+49
|\ \ \ \ \ \
| * | | | | | Add unit tests for OC_Helper::phpFileSize functionFabian Henze2014-04-071-0/+22
| * | | | | | Fix setting the max-upload-size for really large values.Fabian Henze2014-04-032-3/+27
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-03156-912/+818
* | | | | | | Merge pull request #8171 from owncloud/fix-importBernhard Posselt2014-05-022-3/+1
|\ \ \ \ \ \ \
| * | | | | | | add class Pimple to autloaderThomas Müller2014-04-282-3/+1
| * | | | | | | be nice and use a relative import so people can use the class without firing ...Bernhard Posselt2014-04-121-1/+1
* | | | | | | | Merge pull request #8377 from youngguns-nl/issue_8376Vincent Petry2014-05-023-3/+29
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | refs #8376; spaces=>tabsSjors van der Pluijm2014-04-291-1/+1
| * | | | | | | refs #8376; spaces=>tabsSjors van der Pluijm2014-04-281-1/+1
| * | | | | | | refs #8376; added comment and applied patch on other filesSjors van der Pluijm2014-04-283-2/+24