aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fixing-1424-masterThomas Mueller2013-02-13451-5954/+19120
|\ | | | | | | | | Conflicts: settings/js/users.js
| * [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 plugin
| | * 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 fileca...
| | * | $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 well
| | * | user name and password need to be encoded as wellThomas Mueller2013-02-121-1/+3
| | | | | | | | | | | | | | | | fixes #1652
| * | | Merge pull request #1616 from owncloud/cache_fixes_rebaseThomas Müller2013-02-122-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 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 strings
| | * | 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
| | * | | 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
| |\ \ \ \ | | |/ / / | |/| | | Improve generation of interal user names resp. group display names
| | * | | adjust copyrightArthur Schiwon2013-02-101-1/+1
| | | | |
| | * | | LDAP: change generation of internal names. Use UUID for users. Change to ↵Arthur Schiwon2013-02-101-19/+100
| | | | | | | | | | | | | | | | | | | | sequential numbers for groups as they are still used as display names
| * | | | Merge pull request #1648 from owncloud/checkRequesttokenFrank Karlitschek2013-02-123-0/+5
| |\ \ \ \ | | |_|/ / | |/| | | Check requesttoken
| | * | | Check requesttokenLukas Reschke2013-02-123-0/+5
| |/ / /
| * | | 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
| | | | | |
| * | | | | 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
| | | | | | |
* | | | | | | https://github.com/owncloud/core/pull/1598#discussion_r2976684Thomas Mueller2013-02-121-1/+1
| | | | | | |
* | | | | | | introduce new virtual method hasUserListings() to determine if a user ↵Thomas Mueller2013-02-118-47/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | backend can list it's users.
* | | | | | | Merge branch 'master' into fixing-1424-masterThomas Mueller2013-02-11587-9346/+40177
|\| | | | | |
| * | | | | | 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
| | | |_|_|_|/ | | |/| | | |