summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-12131-627/+957
|\
| * Merge pull request #1636 from owncloud/fixing-smb-masterFrank Karlitschek2013-02-113-6/+12
| |\ | | | | | | Fixing smb master
| | * use urlencode not rawurlencodeThomas Mueller2013-02-111-1/+1
| | |
| | * the path must be encoded because within the smb4pph code it's decoded again ↵Thomas Mueller2013-02-111-0/+1
| | | | | | | | | | | | - pretty easy but still .....
| | * [files_external] fix config gui for all usersThomas Mueller2013-02-111-1/+1
| | | | | | | | | | | | backport of 9e05781ec22c3f4e6b89b188332242b03088736e
| | * [files_external] fixing some undefined indexThomas Mueller2013-02-111-0/+10
| | |
| | * [files_external] removing function as it's the same in the base class - THX ↵Thomas Mueller2013-02-111-5/+0
| | | | | | | | | | | | | | | | | | | | | Robin Conflicts: apps/files_external/lib/smb.php
| * | Merge pull request #1634 from irgsmirx/patch-6Thomas Müller2013-02-111-0/+6
| |\ \ | | | | | | | | Update/Bugfix lib/files/cache/legacy.php during database upgrade
| | * | Update lib/files/cache/legacy.phpirgsmirx2013-02-111-0/+6
| | | | | | | | | | | | | | | | | | | | Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed. Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-12127-621/+939
| | | |
* | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| | | |
* | | | Replace another mount point placeholderMichael Gapczynski2013-02-111-1/+1
| | | |
* | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-111552-42741/+125927
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/dropbox.js apps/files_external/js/google.js apps/files_external/js/settings.js apps/files_external/lib/amazons3.php apps/files_external/lib/dropbox.php apps/files_external/lib/google.php apps/files_external/lib/smb.php apps/files_external/lib/swift.php apps/files_external/lib/webdav.php lib/filestorage.php
| * | | Merge pull request #1596 from owncloud/fix_470Thomas Müller2013-02-113-1/+63
| |\ \ \ | | | | | | | | | | webdav put improvements
| | * | | only check content lenght on PUT to make litmus happyJörn Friedrich Dreyer2013-02-112-14/+18
| | | | |
| | * | | delete partial file when file upload is abortedJörn Friedrich Dreyer2013-02-112-14/+17
| | | | |
| | * | | check Content-Length to detect aborted uploadsJörn Friedrich Dreyer2013-02-112-0/+19
| | | | |
| | * | | also rename file when it has not been present beforeJörn Friedrich Dreyer2013-02-111-2/+2
| | | | |
| | * | | readd renaming and mtime handling to new directory nodesJörn Friedrich Dreyer2013-02-111-1/+17
| | | | |
| | * | | send back 'X-OC-MTime: accepted' when X-OC-MTime was appliedJörn Friedrich Dreyer2013-02-111-1/+3
| | | | |
| | * | | add a custom header clients can use to skip a n additional propset requestJörn Friedrich Dreyer2013-02-112-0/+18
| | | | |
| * | | | Merge pull request #1625 from owncloud/fix_shared_stringThomas Müller2013-02-111-4/+4
| |\ \ \ \ | | | | | | | | | | | | fix bug while changing string from "Share" to "Shared"
| | * | | | if you add/remove more than one user from the share dialog replacing 'Share' ↵Björn Schießle2013-02-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | with 'Shared' will lead to a string with more and more trailing 'd's
| * | | | | Merge pull request #1613 from owncloud/multiselect-row-widthThomas Müller2013-02-111-2/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Files: fix width of table header when files are selected
| | * | | | Files: fix width of table header when files are selectedRobin Appelman2013-02-111-2/+3
| | | | | |
| * | | | | Merge pull request #1627 from owncloud/home-svgJan-Christoph Borchardt2013-02-111-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | svg replacement for breadcrumb home icon, fix #1620
| | * | | | | svg replacement for breadcrumb home icon, fix #1620Jan-Christoph Borchardt2013-02-111-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #1626 from owncloud/share-indicator-positionJan-Christoph Borchardt2013-02-111-9/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | Files: always show share action at the right
| | * | | | | Files: always show share action at the rightRobin Appelman2013-02-111-9/+18
| | |/ / / / | | | | | | | | | | | | | | | | | | Fixes #1619
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-11234-2958/+7937
| | | | | |
| * | | | | Merge pull request #1578 from owncloud/mysql_admin_fixThomas Müller2013-02-111-52/+72
| |\ \ \ \ \ | | |/ / / / | |/| | | | added l10n for db error messages
| | * | | | fixing indentThomas Mueller2013-02-111-3/+3
| | | | | |
| | * | | | fixed argument for translationBernhard Posselt2013-02-111-4/+4
| | | | | |
| | * | | | added l10n for db error messagesBernhard Posselt2013-02-091-52/+72
| | | | | |
| * | | | | Merge pull request #1608 from owncloud/fix-shared-linksLukas Reschke2013-02-1112-303/+91
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fix shared links
| | * | | | Share: fix table head color for public shared foldersRobin Appelman2013-02-111-0/+4
| | | | | |
| | * | | | Share: fix downloading selected files from public shared folderRobin Appelman2013-02-111-1/+1
| | | | | |
| | * | | | Share: fix sorting of files in public shared folderRobin Appelman2013-02-111-0/+12
| | | | | |
| | * | | | Share: fix nested subfolders in public shared foldersRobin Appelman2013-02-111-3/+6
| | | | | |
| | * | | | Share: fix breadcrumbs for public shared folderRobin Appelman2013-02-111-1/+1
| | | | | |
| | * | | | Share: fix downloading files from a public shared folderRobin Appelman2013-02-111-1/+1
| | | | | |
| | * | | | Sharing: fix position of file list in public link view of folderRobin Appelman2013-02-111-3/+3
| | | | | |
| | * | | | Update tests and apps to the new \OC\Files\Filesystem::init signatureRobin Appelman2013-02-115-6/+6
| | | | | |
| | * | | | fix positioning of password label, add autofocus to password fieldBjörn Schießle2013-02-111-2/+2
| | | | | |
| | * | | | Set permissions to read onlyMichael Gapczynski2013-02-101-0/+1
| | | | | |
| | * | | | Remove additional old compatibility codeMichael Gapczynski2013-02-101-34/+1
| | | | | |
| | * | | | Replace filename key with fileTarget in templateMichael Gapczynski2013-02-101-3/+3
| | | | | |
| | * | | | Merge branch 'master' into fix-shared-linksMichael Gapczynski2013-02-10533-6445/+32348
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Proper fix for shared linksMichael Gapczynski2013-02-104-24/+29
| | | | | |
| | * | | | Merge branch 'master' into fix-shared-linksMichael Gapczynski2013-02-10720-8151/+19181
| | |\ \ \ \