Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | Added DAV client wrapper that support timeout values | Vincent Petry | 2013-10-16 | 1 | -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_reshares | Björn Schießle | 2013-10-17 | 2 | -27/+145 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add reshare option for the OCS Share API | |||||
| * | | | | | | | | | | | | | | | | | split up reset()['path'] to make it compatible with older PHP versions | Bjoern Schiessle | 2013-10-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | add test for the reshare option | Bjoern Schiessle | 2013-10-17 | 1 | -2/+59 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | adjust tests | Bjoern Schiessle | 2013-10-17 | 2 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | new option to add reshares to the result | Bjoern Schiessle | 2013-10-17 | 1 | -24/+85 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-17 | 140 | -2722/+2503 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: l10n improvements | Arthur Schiwon | 2013-10-21 | 4 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Don't set Base User and Base Group when Base DN was detected, would case ↵ | Arthur Schiwon | 2013-10-17 | 2 | -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 field | Arthur Schiwon | 2013-10-17 | 1 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | resolve merge conflicts from rebase | Arthur Schiwon | 2013-10-17 | 2 | -46/+32 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Ldap Wizard: also disable tabs, if the first step is not complete | Arthur Schiwon | 2013-10-17 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: make Back and Continue work | Arthur Schiwon | 2013-10-17 | 2 | -2/+61 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: Use Ajax Spinner to indicate something is happening, especiall ↵ | Arthur Schiwon | 2013-10-17 | 2 | -0/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | port detection | |||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: fix couple more or less nasty bugs aka polishing | Arthur Schiwon | 2013-10-17 | 4 | -16/+54 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | do not instantiate LDAP Proxy if there are no active configurations | Arthur Schiwon | 2013-10-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Wizard: autodetection of group-member-assoc attribute | Arthur Schiwon | 2013-10-17 | 4 | -1/+84 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP: set displayname as default attribute for user display name | Arthur Schiwon | 2013-10-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | clean up | Arthur Schiwon | 2013-10-17 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Wizard does not need data-defaults here | Arthur Schiwon | 2013-10-17 | 2 | -18/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: add forgotten templates | Arthur Schiwon | 2013-10-17 | 2 | -0/+79 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP: dissolve LDAP Basic settings, move Login Filter to Advanced and clean ↵ | Arthur Schiwon | 2013-10-17 | 1 | -56/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up Advanced settings, too. This is all done via Wizard, now. | |||||
| | | | | | | | | | | | | | * | | | | Ldap Wizard: Group Filter configuration | Arthur Schiwon | 2013-10-17 | 5 | -64/+258 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Ldap Wizard: Login filter UI, detection of username attribute, composing of ↵ | Arthur Schiwon | 2013-10-17 | 5 | -14/+214 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | login filter | |||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: create user list filter, show number of user that will have ↵ | Arthur Schiwon | 2013-10-17 | 5 | -7/+201 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access to OC | |||||
| | | | | | | | | | | | | | * | | | | Cleanup code, sort results | Arthur Schiwon | 2013-10-17 | 1 | -41/+49 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Ldap Wizard: find out whether server supports memberOf in LDAP Filter and ↵ | Arthur Schiwon | 2013-10-17 | 2 | -16/+66 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable group chooser if not | |||||
| | | | | | | | | | | | | | * | | | | cleanup and coding style | Arthur Schiwon | 2013-10-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | cleanup, doc and todo | Arthur Schiwon | 2013-10-17 | 1 | -35/+55 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: add detection, load and save of LDAP groups for filter purposes | Arthur Schiwon | 2013-10-17 | 5 | -32/+99 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Remove debug output | Arthur Schiwon | 2013-10-17 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | css cleanup | Arthur Schiwon | 2013-10-17 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: add detection, load and save of LDAP objectClasses for filter ↵ | Arthur Schiwon | 2013-10-17 | 12 | -33/+343 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purposes | |||||
| | | | | | | | | | | | | | * | | | | LDAP Wizard: autodetect base DN | Arthur Schiwon | 2013-10-17 | 6 | -22/+162 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | ignore autodetect-attribute on public save method | Arthur Schiwon | 2013-10-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | Simplify WizardResult | Arthur Schiwon | 2013-10-17 | 2 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | First stage of new Wizard, neither feature complete nor ready | Arthur Schiwon | 2013-10-17 | 10 | -15/+688 | |
| | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | LDAP: move Configuration out of Connection into class of its own. The new ↵ | Arthur Schiwon | 2013-10-17 | 4 | -393/+562 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wizard requires it. | |||||
| | | | | | | | | | | | | | * | | | | Doc fix | Arthur Schiwon | 2013-10-17 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero | Morris Jobke | 2013-10-17 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed zip download button for unlimited filesize in public mode | |||||
| * | | | | | | | | | | | | | | | | | Fixed zip download button for unlimited filesize in public mode | Vincent Petry | 2013-10-17 | 1 | -1/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717 | |||||
* | | | | | | | | | | | | | | | | | Merge pull request #5392 from owncloud/update-3rdparty-submodule | Morris Jobke | 2013-10-17 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | update 3rdparty submodule | |||||
| * | | | | | | | | | | | | | | | | update 3rdparty submodule | Thomas Müller | 2013-10-17 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5394 from owncloud/sabre-server-location | Thomas Müller | 2013-10-17 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Move OC_Connector_Sabre_Server to expected location. | |||||
| * | | | | | | | | | | | | | | | | Move OC_Connector_Sabre_Server to expected location. | Andreas Fischer | 2013-10-17 | 1 | -0/+0 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge pull request #5389 from owncloud/fix_shell_exec | Morris Jobke | 2013-10-17 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | only call shell_exec if enabled | |||||
| * | | | | | | | | | | | | | | | fix comment | Georg Ehrke | 2013-10-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | only call shell_exec if enabled | Georg Ehrke | 2013-10-17 | 2 | -3/+3 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5381 from owncloud/files-sharingstateafterupload | Morris Jobke | 2013-10-17 | 5 | -46/+83 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fixed sharing status update for new/uploaded files | |||||
| * | | | | | | | | | | | | | | Added missing var in share.js | Vincent Petry | 2013-10-17 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | |