summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1Lukas Reschke2013-02-124-3/+62
|\
| * fixing mappedlocal storage to work on non-windows as wellThomas Mueller2013-02-112-1/+18
| * Merge branch 'master' into mapped-storage-unit-testing-linux-masterThomas Mueller2013-02-11545-6537/+32517
| |\
| * | make MappedLocal available and testable within Linux as wellThomas Müller2013-02-093-2/+44
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-13287-2937/+3478
* | | Merge pull request #1624 from owncloud/singleselectFrank Karlitschek2013-02-125-457/+475
|\ \ \
| * | | Split editable select code used for quota selection into a jquery pluginRobin Appelman2013-02-115-457/+475
* | | | Merge pull request #1655 from owncloud/use-correct-tablename-in-cache-masterThomas Müller2013-02-121-1/+1
|\ \ \ \
| * | | | $this->numericId should be determined based on table storages not filecacheThomas Mueller2013-02-121-1/+1
* | | | | Merge pull request #1654 from owncloud/fixing-1652-masterLukas Reschke2013-02-121-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | user name and password need to be encoded as wellThomas Mueller2013-02-121-1/+3
* | | | | Merge pull request #1616 from owncloud/cache_fixes_rebaseThomas Müller2013-02-122-13/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Cache: fix scanner trying to use existing data when file isn't in cacheRobin Appelman2013-02-121-2/+1
| * | | | fixing syntax errorThomas Mueller2013-02-121-1/+1
| * | | | Cache: also preserve etags for filesRobin Appelman2013-02-121-2/+5
| * | | | Cache: don't create a new etag when the mtime hasn't changedRobin Appelman2013-02-111-0/+3
| * | | | Cache: actually use parameterRobin Appelman2013-02-111-1/+1
| * | | | Cache: reuse known folder sizes when doing a shallow scanRobin Appelman2013-02-112-4/+7
| * | | | Cache: simplify scanner logic a bit when handeling with unknown folder sizesRobin Appelman2013-02-111-9/+7
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-12298-3136/+15250
* | | | Merge pull request #1649 from owncloud/fixing-l10n-masterThomas Müller2013-02-121-1/+1
|\ \ \ \
| * | | | fixing issues with UTF8 characters in translatable stringsThomas Mueller2013-02-121-1/+1
* | | | | Merge pull request #1650 from raghunayyar/personal-toggle-fixBernhard Posselt2013-02-121-2/+3
|\ \ \ \ \
| * | | | | Makes password toggle button inside input.raghunayyar2013-02-121-2/+3
* | | | | | Merge pull request #1604 from owncloud/fix_ldap_internalname_generationblizzz2013-02-121-20/+101
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | adjust copyrightArthur Schiwon2013-02-101-1/+1
| * | | | | LDAP: change generation of internal names. Use UUID for users. Change to sequ...Arthur Schiwon2013-02-101-19/+100
* | | | | | Merge pull request #1648 from owncloud/checkRequesttokenFrank Karlitschek2013-02-123-0/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Check requesttokenLukas Reschke2013-02-123-0/+5
|/ / / / /
* | | | | Merge pull request #1636 from owncloud/fixing-smb-masterFrank Karlitschek2013-02-113-6/+12
|\ \ \ \ \
| * | | | | 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
| * | | | | [files_external] fix config gui for all usersThomas Mueller2013-02-111-1/+1
| * | | | | [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 R...Thomas Mueller2013-02-111-5/+0
* | | | | | Merge pull request #1634 from irgsmirx/patch-6Thomas Müller2013-02-111-0/+6
|\ \ \ \ \ \
| * | | | | | Update lib/files/cache/legacy.phpirgsmirx2013-02-111-0/+6
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-12127-621/+939
* | | | | | | Merge pull request #1596 from owncloud/fix_470Thomas Müller2013-02-113-1/+63
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | if you add/remove more than one user from the share dialog replacing 'Share' ...Björn Schießle2013-02-111-4/+4
* | | | | | | | | Merge pull request #1613 from owncloud/multiselect-row-widthThomas Müller2013-02-111-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Files: fix width of table header when files are selectedRobin Appelman2013-02-111-2/+3
| | |_|_|_|/ / / | |/| | | | | |