Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1 | Lukas Reschke | 2013-02-12 | 4 | -3/+62 |
|\ | | | | | Mapped storage unit testing linux master | ||||
| * | fixing mappedlocal storage to work on non-windows as well | Thomas Mueller | 2013-02-11 | 2 | -1/+18 |
| | | | | | | | | this allows us to run unit tests on linux - necessary to enable easy regression testing | ||||
| * | Merge branch 'master' into mapped-storage-unit-testing-linux-master | Thomas Mueller | 2013-02-11 | 545 | -6537/+32517 |
| |\ | |||||
| * | | make MappedLocal available and testable within Linux as well | Thomas Müller | 2013-02-09 | 3 | -2/+44 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-13 | 287 | -2937/+3478 |
| | | | |||||
* | | | Merge pull request #1624 from owncloud/singleselect | Frank Karlitschek | 2013-02-12 | 5 | -457/+475 |
|\ \ \ | | | | | | | | | Split editable select code used for quota selection into a jquery plugin | ||||
| * | | | Split editable select code used for quota selection into a jquery plugin | Robin Appelman | 2013-02-11 | 5 | -457/+475 |
| | | | | |||||
* | | | | Merge pull request #1655 from owncloud/use-correct-tablename-in-cache-master | Thomas Müller | 2013-02-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | $this->numericId should be determined based on table storages not fileca... | ||||
| * | | | | $this->numericId should be determined based on table storages not filecache | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1654 from owncloud/fixing-1652-master | Lukas Reschke | 2013-02-12 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | user name and password need to be encoded as well | ||||
| * | | | | user name and password need to be encoded as well | Thomas Mueller | 2013-02-12 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | fixes #1652 | ||||
* | | | | | Merge pull request #1616 from owncloud/cache_fixes_rebase | Thomas Müller | 2013-02-12 | 2 | -13/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | Cache: reuse known folder sizes when doing a shallow scan - rebase | ||||
| * | | | | Cache: fix scanner trying to use existing data when file isn't in cache | Robin Appelman | 2013-02-12 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | fixing syntax error | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Cache: also preserve etags for files | Robin Appelman | 2013-02-12 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Cache: don't create a new etag when the mtime hasn't changed | Robin Appelman | 2013-02-11 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Cache: actually use parameter | Robin Appelman | 2013-02-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Cache: reuse known folder sizes when doing a shallow scan | Robin Appelman | 2013-02-11 | 2 | -4/+7 |
| | | | | | |||||
| * | | | | Cache: simplify scanner logic a bit when handeling with unknown folder sizes | Robin Appelman | 2013-02-11 | 1 | -9/+7 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-12 | 298 | -3136/+15250 |
| | | | | |||||
* | | | | Merge pull request #1649 from owncloud/fixing-l10n-master | Thomas Müller | 2013-02-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | fixing issues with UTF8 characters in translatable strings | ||||
| * | | | | fixing issues with UTF8 characters in translatable strings | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1650 from raghunayyar/personal-toggle-fix | Bernhard Posselt | 2013-02-12 | 1 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Makes password toggle button inside input | ||||
| * | | | | | Makes password toggle button inside input. | raghunayyar | 2013-02-12 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #1604 from owncloud/fix_ldap_internalname_generation | blizzz | 2013-02-12 | 1 | -20/+101 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Improve generation of interal user names resp. group display names | ||||
| * | | | | | adjust copyright | Arthur Schiwon | 2013-02-10 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | LDAP: change generation of internal names. Use UUID for users. Change to ↵ | Arthur Schiwon | 2013-02-10 | 1 | -19/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | sequential numbers for groups as they are still used as display names | ||||
* | | | | | | Merge pull request #1648 from owncloud/checkRequesttoken | Frank Karlitschek | 2013-02-12 | 3 | -0/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Check requesttoken | ||||
| * | | | | | Check requesttoken | Lukas Reschke | 2013-02-12 | 3 | -0/+5 |
|/ / / / / | |||||
* | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | 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 |
| | |_|_|_|/ / / | |/| | | | | | |