Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into external_storage_ui_feedback | Thomas Mueller | 2013-02-12 | 131 | -627/+957 |
|\ | |||||
| * | Merge pull request #1636 from owncloud/fixing-smb-master | Frank Karlitschek | 2013-02-11 | 3 | -6/+12 |
| |\ | | | | | | | Fixing smb master | ||||
| | * | use urlencode not rawurlencode | Thomas Mueller | 2013-02-11 | 1 | -1/+1 |
| | | | |||||
| | * | the path must be encoded because within the smb4pph code it's decoded again ↵ | Thomas Mueller | 2013-02-11 | 1 | -0/+1 |
| | | | | | | | | | | | | - pretty easy but still ..... | ||||
| | * | [files_external] fix config gui for all users | Thomas Mueller | 2013-02-11 | 1 | -1/+1 |
| | | | | | | | | | | | | backport of 9e05781ec22c3f4e6b89b188332242b03088736e | ||||
| | * | [files_external] fixing some undefined index | Thomas Mueller | 2013-02-11 | 1 | -0/+10 |
| | | | |||||
| | * | [files_external] removing function as it's the same in the base class - THX ↵ | Thomas Mueller | 2013-02-11 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | Robin Conflicts: apps/files_external/lib/smb.php | ||||
| * | | Merge pull request #1634 from irgsmirx/patch-6 | Thomas Müller | 2013-02-11 | 1 | -0/+6 |
| |\ \ | | | | | | | | | Update/Bugfix lib/files/cache/legacy.php during database upgrade | ||||
| | * | | Update lib/files/cache/legacy.php | irgsmirx | 2013-02-11 | 1 | -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 transifex | Jenkins for ownCloud | 2013-02-12 | 127 | -621/+939 |
| | | | | |||||
* | | | | fixing namespace | Thomas Mueller | 2013-02-12 | 2 | -3/+3 |
| | | | | |||||
* | | | | Replace another mount point placeholder | Michael Gapczynski | 2013-02-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-11 | 1552 | -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_470 | Thomas Müller | 2013-02-11 | 3 | -1/+63 |
| |\ \ \ | | | | | | | | | | | webdav put improvements | ||||
| | * | | | only check content lenght on PUT to make litmus happy | Jörn Friedrich Dreyer | 2013-02-11 | 2 | -14/+18 |
| | | | | | |||||
| | * | | | delete partial file when file upload is aborted | Jörn Friedrich Dreyer | 2013-02-11 | 2 | -14/+17 |
| | | | | | |||||
| | * | | | check Content-Length to detect aborted uploads | Jörn Friedrich Dreyer | 2013-02-11 | 2 | -0/+19 |
| | | | | | |||||
| | * | | | also rename file when it has not been present before | Jörn Friedrich Dreyer | 2013-02-11 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | readd renaming and mtime handling to new directory nodes | Jörn Friedrich Dreyer | 2013-02-11 | 1 | -1/+17 |
| | | | | | |||||
| | * | | | send back 'X-OC-MTime: accepted' when X-OC-MTime was applied | Jörn Friedrich Dreyer | 2013-02-11 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | add a custom header clients can use to skip a n additional propset request | Jörn Friedrich Dreyer | 2013-02-11 | 2 | -0/+18 |
| | | | | | |||||
| * | | | | Merge pull request #1625 from owncloud/fix_shared_string | Thomas Müller | 2013-02-11 | 1 | -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ßle | 2013-02-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | with 'Shared' will lead to a string with more and more trailing 'd's | ||||
| * | | | | | Merge pull request #1613 from owncloud/multiselect-row-width | Thomas Müller | 2013-02-11 | 1 | -2/+3 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Files: fix width of table header when files are selected | ||||
| | * | | | | Files: fix width of table header when files are selected | Robin Appelman | 2013-02-11 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #1627 from owncloud/home-svg | Jan-Christoph Borchardt | 2013-02-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | svg replacement for breadcrumb home icon, fix #1620 | ||||
| | * | | | | | svg replacement for breadcrumb home icon, fix #1620 | Jan-Christoph Borchardt | 2013-02-11 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #1626 from owncloud/share-indicator-position | Jan-Christoph Borchardt | 2013-02-11 | 1 | -9/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Files: always show share action at the right | ||||
| | * | | | | | Files: always show share action at the right | Robin Appelman | 2013-02-11 | 1 | -9/+18 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | Fixes #1619 | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-11 | 234 | -2958/+7937 |
| | | | | | | |||||
| * | | | | | Merge pull request #1578 from owncloud/mysql_admin_fix | Thomas Müller | 2013-02-11 | 1 | -52/+72 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | added l10n for db error messages | ||||
| | * | | | | fixing indent | Thomas Mueller | 2013-02-11 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | fixed argument for translation | Bernhard Posselt | 2013-02-11 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | added l10n for db error messages | Bernhard Posselt | 2013-02-09 | 1 | -52/+72 |
| | | | | | | |||||
| * | | | | | Merge pull request #1608 from owncloud/fix-shared-links | Lukas Reschke | 2013-02-11 | 12 | -303/+91 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Fix shared links | ||||
| | * | | | | Share: fix table head color for public shared folders | Robin Appelman | 2013-02-11 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Share: fix downloading selected files from public shared folder | Robin Appelman | 2013-02-11 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Share: fix sorting of files in public shared folder | Robin Appelman | 2013-02-11 | 1 | -0/+12 |
| | | | | | | |||||
| | * | | | | Share: fix nested subfolders in public shared folders | Robin Appelman | 2013-02-11 | 1 | -3/+6 |
| | | | | | | |||||
| | * | | | | Share: fix breadcrumbs for public shared folder | Robin Appelman | 2013-02-11 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Share: fix downloading files from a public shared folder | Robin Appelman | 2013-02-11 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Sharing: fix position of file list in public link view of folder | Robin Appelman | 2013-02-11 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Update tests and apps to the new \OC\Files\Filesystem::init signature | Robin Appelman | 2013-02-11 | 5 | -6/+6 |
| | | | | | | |||||
| | * | | | | fix positioning of password label, add autofocus to password field | Björn Schießle | 2013-02-11 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Set permissions to read only | Michael Gapczynski | 2013-02-10 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Remove additional old compatibility code | Michael Gapczynski | 2013-02-10 | 1 | -34/+1 |
| | | | | | | |||||
| | * | | | | Replace filename key with fileTarget in template | Michael Gapczynski | 2013-02-10 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into fix-shared-links | Michael Gapczynski | 2013-02-10 | 533 | -6445/+32348 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Proper fix for shared links | Michael Gapczynski | 2013-02-10 | 4 | -24/+29 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into fix-shared-links | Michael Gapczynski | 2013-02-10 | 720 | -8151/+19181 |
| | |\ \ \ \ |