summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Added DAV client wrapper that support timeout valuesVincent Petry2013-10-161-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since SabreDAV does not support passing a timeout value to curl, this commit adds a subclass for it that will set the timeout value to curlRequest().
* | | | | | | | | | | | | | | | | Merge pull request #5382 from owncloud/sharing_api_include_resharesBjörn Schießle2013-10-172-27/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add reshare option for the OCS Share API
| * | | | | | | | | | | | | | | | | split up reset()['path'] to make it compatible with older PHP versionsBjoern Schiessle2013-10-171-1/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | add test for the reshare optionBjoern Schiessle2013-10-171-2/+59
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | adjust testsBjoern Schiessle2013-10-172-4/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | new option to add reshares to the resultBjoern Schiessle2013-10-171-24/+85
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-17140-2722/+2503
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP Wizard: l10n improvementsArthur Schiwon2013-10-214-6/+7
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Don't set Base User and Base Group when Base DN was detected, would case ↵Arthur Schiwon2013-10-172-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problems but does not provide any benefit. also make sure that empty string is saved instead of false for multiline values
| | | | | | | | | | | | | | * | | | Fix Spinner issues with Base DN fieldArthur Schiwon2013-10-171-2/+11
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | resolve merge conflicts from rebaseArthur Schiwon2013-10-172-46/+32
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Ldap Wizard: also disable tabs, if the first step is not completeArthur Schiwon2013-10-171-0/+2
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP Wizard: make Back and Continue workArthur Schiwon2013-10-172-2/+61
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall ↵Arthur Schiwon2013-10-172-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | port detection
| | | | | | | | | | | | | | * | | | LDAP Wizard: fix couple more or less nasty bugs aka polishingArthur Schiwon2013-10-174-16/+54
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | do not instantiate LDAP Proxy if there are no active configurationsArthur Schiwon2013-10-171-1/+1
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Wizard: autodetection of group-member-assoc attributeArthur Schiwon2013-10-174-1/+84
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP: set displayname as default attribute for user display nameArthur Schiwon2013-10-171-1/+1
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | clean upArthur Schiwon2013-10-171-4/+0
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Wizard does not need data-defaults hereArthur Schiwon2013-10-172-18/+3
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP Wizard: add forgotten templatesArthur Schiwon2013-10-172-0/+79
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean ↵Arthur Schiwon2013-10-171-56/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up Advanced settings, too. This is all done via Wizard, now.
| | | | | | | | | | | | | | * | | | Ldap Wizard: Group Filter configurationArthur Schiwon2013-10-175-64/+258
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Ldap Wizard: Login filter UI, detection of username attribute, composing of ↵Arthur Schiwon2013-10-175-14/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | login filter
| | | | | | | | | | | | | | * | | | LDAP Wizard: create user list filter, show number of user that will have ↵Arthur Schiwon2013-10-175-7/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access to OC
| | | | | | | | | | | | | | * | | | Cleanup code, sort resultsArthur Schiwon2013-10-171-41/+49
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Ldap Wizard: find out whether server supports memberOf in LDAP Filter and ↵Arthur Schiwon2013-10-172-16/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable group chooser if not
| | | | | | | | | | | | | | * | | | cleanup and coding styleArthur Schiwon2013-10-171-2/+2
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | cleanup, doc and todoArthur Schiwon2013-10-171-35/+55
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP Wizard: add detection, load and save of LDAP groups for filter purposesArthur Schiwon2013-10-175-32/+99
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Remove debug outputArthur Schiwon2013-10-171-1/+0
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | css cleanupArthur Schiwon2013-10-173-3/+3
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP Wizard: add detection, load and save of LDAP objectClasses for filter ↵Arthur Schiwon2013-10-1712-33/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purposes
| | | | | | | | | | | | | | * | | | LDAP Wizard: autodetect base DNArthur Schiwon2013-10-176-22/+162
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | ignore autodetect-attribute on public save methodArthur Schiwon2013-10-171-0/+1
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | Simplify WizardResultArthur Schiwon2013-10-172-9/+0
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | First stage of new Wizard, neither feature complete nor readyArthur Schiwon2013-10-1710-15/+688
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | LDAP: move Configuration out of Connection into class of its own. The new ↵Arthur Schiwon2013-10-174-393/+562
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wizard requires it.
| | | | | | | | | | | | | | * | | | Doc fixArthur Schiwon2013-10-171-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszeroMorris Jobke2013-10-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed zip download button for unlimited filesize in public mode
| * | | | | | | | | | | | | | | | | Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717
* | | | | | | | | | | | | | | | | Merge pull request #5392 from owncloud/update-3rdparty-submoduleMorris Jobke2013-10-171-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | update 3rdparty submodule
| * | | | | | | | | | | | | | | | update 3rdparty submoduleThomas Müller2013-10-171-0/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5394 from owncloud/sabre-server-locationThomas Müller2013-10-171-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Move OC_Connector_Sabre_Server to expected location.
| * | | | | | | | | | | | | | | | Move OC_Connector_Sabre_Server to expected location.Andreas Fischer2013-10-171-0/+0
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #5389 from owncloud/fix_shell_execMorris Jobke2013-10-172-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | only call shell_exec if enabled
| * | | | | | | | | | | | | | | fix commentGeorg Ehrke2013-10-171-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | only call shell_exec if enabledGeorg Ehrke2013-10-172-3/+3
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #5381 from owncloud/files-sharingstateafteruploadMorris Jobke2013-10-175-46/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Fixed sharing status update for new/uploaded files
| * | | | | | | | | | | | | | Added missing var in share.jsVincent Petry2013-10-171-0/+1
| | | | | | | | | | | | | | |