summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix the privatedata key value storeFrank Karlitschek2013-10-303-43/+118
* Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmis...Vincent Petry2013-10-301-1/+12
|\
| * Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-1/+12
* | Merge pull request #5602 from owncloud/update-parent-storage-mtimeThomas Müller2013-10-302-2/+52
|\ \
| * \ Merge branch 'master' into update-parent-storage-mtimeRobin Appelman2013-10-30327-4904/+12915
| |\ \ | |/ / |/| |
* | | Merge pull request #5618 from owncloud/set_default_value_for_recovery_modeBjörn Schießle2013-10-301-3/+1
|\ \ \
| * | | remove unused variableBjoern Schiessle2013-10-301-2/+0
| * | | if the database doesn't contain any information about the recovery mode than ...Bjoern Schiessle2013-10-301-1/+1
|/ / /
* | | Merge pull request #5616 from owncloud/fixing-l10n-masterVincent Petry2013-10-305-5/+6
|\ \ \
| * | | replacing ownCloud by theme-able name or avoid it's usageThomas Müller2013-10-293-3/+4
| * | | avoid usage of brand name 'ownCloud'Thomas Müller2013-10-282-2/+2
* | | | Merge pull request #5603 from owncloud/fix_file_cache_updater_masterVincent Petry2013-10-304-33/+105
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix_file_cache_updater_masterBjoern Schiessle2013-10-2911-68/+129
| |\ \ \ \
| * | | | | make sure that also the storage etag gets changedBjoern Schiessle2013-10-291-4/+7
| * | | | | make getUidAndFilename() privateBjoern Schiessle2013-10-291-1/+1
| * | | | | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-294-33/+102
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-30162-4302/+4246
* | | | | | Fix typoLukas Reschke2013-10-291-1/+1
* | | | | | Merge branch 'master' of https://github.com/owncloud/corev6.0.0beta2Frank Karlitschek2013-10-28142-488/+8384
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #5468 from berendt/reworking_OC_Files_Storage_SwiftThomas Müller2013-10-29141-485/+8381
| |\ \ \ \ \ \
| | * | | | | | settings tags for optional parametersChristian Berendt2013-10-291-5/+5
| | * | | | | | extended parameter descriptions for SwiftChristian Berendt2013-10-291-8/+8
| | * | | | | | add configuration parameter to manually set the timeout of HTTP requestsChristian Berendt2013-10-243-3/+10
| | * | | | | | make Swift::testLocal workable by using a delimiterChristian Berendt2013-10-231-1/+2
| | * | | | | | Revert "make Swift::testLocal workable by fixing the prefix used with the obj...Christian Berendt2013-10-231-4/+1
| | * | | | | | make Swift::testLocal workable by fixing the prefix used with the object list...Christian Berendt2013-10-231-1/+4
| | * | | | | | rewrite of OC\Files\Storage\SwiftChristian Berendt2013-10-221-456/+354
| | * | | | | | renaming OC\Files\Storage\SWIFT to OC\Files\Storage\SwiftChristian Berendt2013-10-221-1/+1
| | * | | | | | adapted existing test casesChristian Berendt2013-10-221-12/+33
| | * | | | | | adjustment of the configuration parametersChristian Berendt2013-10-222-13/+24
| | * | | | | | added stripped library php-opencloud (version 1.6.0)Christian Berendt2013-10-22136-0/+7958
| * | | | | | | Merge pull request #5609 from owncloud/fix_delete_user2Thomas Müller2013-10-291-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | use getHome() to delete users dataBjoern Schiessle2013-10-291-3/+3
| |/ / / / / / /
* / / / / / / / beta 2Frank Karlitschek2013-10-281-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #5592 from owncloud/lost_password_screenThomas Müller2013-10-292-5/+44
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix lost password screen - reuse available CSS rulesMorris Jobke2013-10-292-10/+20
| * | | | | | Fixing the lost Password ScreenJulian Müller2013-10-291-1/+1
| * | | | | | Fixing the Lost Password ScreenJulian Müller2013-10-292-5/+34
* | | | | | | Merge pull request #5605 from owncloud/fix_delete_userBjörn Schießle2013-10-292-9/+30
|\ \ \ \ \ \ \
| * | | | | | | remove user from cache if he was deleted successfullyBjoern Schiessle2013-10-292-9/+30
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5577 from owncloud/fix_urlgenerator_imagepathThomas Müller2013-10-291-5/+5
|\ \ \ \ \ \ \
| * | | | | | | use SERVERROOT instead of WEBROOT in all file_exists checks, whitespaceJörn Friedrich Dreyer2013-10-281-5/+5
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #5606 from owncloud/files-uploaderrorparsingfixThomas Müller2013-10-291-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Added fix to correctly parse non-array error messagesVincent Petry2013-10-291-2/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5607 from owncloud/public-share-styleJan-Christoph Borchardt2013-10-291-15/+13
|\ \ \ \ \ \ \
| * | | | | | | fix style of public share pageMorris Jobke2013-10-291-15/+13
|/ / / / / / /
* | | | | | | Merge pull request #5601 from owncloud/fix-mimetype-detectionMorris Jobke2013-10-292-2/+10
|\ \ \ \ \ \ \
| * | | | | | | Map empty mimetypes to octet-stream for Oracle DBMS.Andreas Fischer2013-10-291-0/+4
| * | | | | | | Return early if fileinfo is there.Andreas Fischer2013-10-291-0/+1
| * | | | | | | Reset mimetype to application/octet-stream on empty reply from file command.Andreas Fischer2013-10-291-0/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 18:34:34 +0000