summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typoLukas Reschke2013-10-291-1/+1
| | | Whooah! - I'm even committing this total important change without peer review ;-)
* 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
| |\ | | | | | | Reworking \OC\Files\Storage\Swift
| | * 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 ↵Christian Berendt2013-10-231-4/+1
| | | | | | | | | | | | | | | | | | object listing in opendir" This reverts commit b92061da5ab2d11f803731628c4304aa8cd302e3.
| | * make Swift::testLocal workable by fixing the prefix used with the object ↵Christian Berendt2013-10-231-1/+4
| | | | | | | | | | | | listing in opendir
| | * 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 data
| | * | 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
|\ \ | | | | | | Fixing lost password-screen
| * | 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 successfully
| * | | 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, whitespace
| * | | | 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 messages
| * | | | | Added fix to correctly parse non-array error messagesVincent Petry2013-10-291-2/+7
| | |/ / / | |/| | | | | | | | | | | | | Some apps like the antivirus app return messages in a non-array format.
* | | | | Merge pull request #5607 from owncloud/public-share-styleJan-Christoph Borchardt2013-10-291-15/+13
|\ \ \ \ \ | | | | | | | | | | | | fix style of public share page
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fix mimetype detection
| * | | | | 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
| | | | | |
| * | | | | Do not calculate $isWrapped if not needed.Andreas Fischer2013-10-291-2/+1
| |/ / / /
* | | | | Merge pull request #5396 from owncloud/fix-sharing-codeMorris Jobke2013-10-294-35/+64
|\ \ \ \ \ | |/ / / / |/| | | | Fix sharing error message - id -> file name
| * | | | also add new parameter to function callsMorris Jobke2013-10-291-4/+4
| | | | |
| * | | | pass the name of the item source from the browser to the server - no need to ↵Thomas Müller2013-10-234-32/+43
| | | | | | | | | | | | | | | | | | | | get the data via complicated db queries
| * | | | Merge branch 'master' into fix-sharing-codeThomas Müller2013-10-23472-4920/+11290
| |\ \ \ \
| * | | | | Fix sharing error message - id -> file nameMorris Jobke2013-10-171-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | fixe #2827
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-29502-1659/+2294
| | | | | |
* | | | | | Merge pull request #5493 from owncloud/fix-language-detectionThomas Müller2013-10-282-21/+66
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix HTTP language detection
| * | | | | Merge branch 'master' into fix-language-detectionThomas Müller2013-10-2465-1071/+4021
| |\ \ \ \ \
| * | | | | | fixing PHPDoc & grammarThomas Müller2013-10-231-5/+5
| | | | | | |
| * | | | | | Some tests for OC_L10N::findLanguage()Andreas Fischer2013-10-231-0/+41
| | | | | | |
| * | | | | | Have to also strtolower() on available language name. Otherwise no match.Andreas Fischer2013-10-231-4/+6
| | | | | | |
| * | | | | | Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching.Andreas Fischer2013-10-231-0/+4
| | | | | | |
| * | | | | | Apply substring on the correct value.Andreas Fischer2013-10-231-1/+1
| | | | | | |
| * | | | | | Better variable names.Andreas Fischer2013-10-231-9/+9
| | | | | | |
| * | | | | | Fix coding style for else.Andreas Fischer2013-10-231-4/+2
| | | | | | |
| * | | | | | Correct indentation for default language.Andreas Fischer2013-10-231-4/+4
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 04:36:40 +0000