summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Style cleanup user_ldapBart Visscher2013-02-149-72/+218
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-14136-1302/+1484
|
* Merge pull request #1598 from owncloud/fixing-1424-masterThomas Müller2013-02-1310-65/+108
|\ | | | | Fixing 1424 master
| * missing piece after mergeThomas Mueller2013-02-131-6/+0
| |
| * Merge branch 'master' into fixing-1424-masterThomas Mueller2013-02-13451-5954/+19120
| |\ | | | | | | | | | | | | Conflicts: settings/js/users.js
| * | 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
| |\ \
| * | | no need to implement createUser in web dav authThomas Mueller2013-02-101-6/+0
| | | |
| * | | Merge branch 'master' into fixing-1424-masterThomas Müller2013-02-09332-2161/+6113
| |\ \ \
| * | | | on creation only test for existing users if the backend supports user creationThomas Müller2013-02-083-13/+14
| | | | | | | | | | | | | | | | | | | | this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
* | | | | Merge pull request #1574 from owncloud/installation-label-overflowJan-Christoph Borchardt2013-02-131-2/+6
|\ \ \ \ \ | | | | | | | | | | | | Installation label overflow, fix #871
| * | | | | fixed database input group having two slightly thicker dividersJan-Christoph Borchardt2013-02-091-1/+1
| | | | | |
| * | | | | ellipsize infield labels when too long, specifically fix #871 for database ↵Jan-Christoph Borchardt2013-02-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | labels on installation
* | | | | | Merge pull request #1665 from owncloud/fix_ldap_1605Lukas Reschke2013-02-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | LDAP: format dn before using it, not other way round. fixes #1605
| * | | | | | LDAP: format dn before using it, not other way round. fixes #1605Arthur Schiwon2013-02-131-1/+1
|/ / / / / /
* | | | | | alpha 1Frank Karlitschek2013-02-091-2/+2
| | | | | |
* | | | | | Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1Lukas Reschke2013-02-124-3/+62
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Mapped storage unit testing linux master
| * | | | | fixing mappedlocal storage to work on non-windows as wellThomas Mueller2013-02-112-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-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 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