aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20691 from owncloud/share2.0_di_fixesThomas Müller2015-11-253-124/+222
|\ | | | | [Sharing 2.0] di fixes
| * [Sharing 2.0] Use the rootfolder to get the path of a shareRoeland Jago Douma2015-11-243-49/+65
| | | | | | | | | | We need to use the rootfolder here since we also other people than the shareOwner can request a share.
| * [Sharing 2.0] Fix phpdoc etcRoeland Jago Douma2015-11-241-6/+6
| |
| * [Sharing 2.0] Move authentication to the OCS APIRoeland Jago Douma2015-11-243-62/+147
| |
| * [Sharing 2.0] Default share provider only generic DIRoeland Jago Douma2015-11-241-1/+1
| | | | | | | | | | | | No injection of userfolders etc. Only generic DI components (IRootFolder) etc should be used to make sure we can also run this from the cli
| * [Sharing 2.0] Removed unused DI stuffRoeland Jago Douma2015-11-242-26/+23
| | | | | | | | | | The share manager etc should not care about filtering stuff. They should return what is asked for them.
* | Merge pull request #20439 from owncloud/etag-propagate-in-storageThomas Müller2015-11-2515-797/+54
|\ \ | | | | | | Take submount etag into account for folder etags
| * | update testsRobin Appelman2015-11-193-3/+2
| | |
| * | take the etag of child mounts into account for the folder etagRobin Appelman2015-11-1912-794/+52
| | | | | | | | | | | | this replaces shared etag propagation
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-25114-120/+246
| | |
* | | Merge pull request #20636 from owncloud/savre-3.0Thomas Müller2015-11-2410-155/+192
|\ \ \ | | | | | | | | sabre/dav 3.0 and related
| * | | Adjust sabre changes in coreThomas Müller2015-11-2410-155/+192
| | | |
* | | | Merge pull request #20692 from owncloud/federation_auto_add_serversThomas Müller2015-11-247-4/+171
|\ \ \ \ | | | | | | | | | | auto-add ownClouds to the list of trusted servers
| * | | | Remove invalid use statementThomas Müller2015-11-241-1/+0
| | | | |
| * | | | always store server url without a trailing slashBjörn Schießle2015-11-242-3/+20
| | | | |
| * | | | use hooks to auto add server to the list of trusted servers once a federated ↵Björn Schießle2015-11-245-0/+151
| | | | | | | | | | | | | | | | | | | | share was created
* | | | | Merge pull request #18294 from esakol/issue17173Thomas Müller2015-11-241-39/+67
|\ \ \ \ \ | | | | | | | | | | | | Fix RHDS ldap paged search, Issue #17173
| * | | | | Fix RHDS ldap paged search, Issue #17173Mario Kolling2015-11-091-39/+67
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic804ea95401a9b49cb2b0866af722aa0d3ee58c5
* | | | | | Merge pull request #20595 from owncloud/fix-double-slashesThomas Müller2015-11-241-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid double slashes in URL when trying to add an remote share
| * | | | | | Avoid double slashes in URL when trying to add an remote shareblizzz2015-11-181-1/+5
| | | | | | | | | | | | | | | | | | | | | When being on a link share and clicking "Add to your ownCloud" a double slash might be inserted in the URL if the entered ownCloud host ended with a slash. Results in a server error.
* | | | | | | Merge pull request #18999 from owncloud/ext-config-listadminThomas Müller2015-11-249-220/+377
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Improvements to external storages list rendering
| * | | | | | Defer initialisation of data until after complete constructionRobin McCorkell2015-11-222-22/+39
| | | | | | |
| * | | | | | Clear highlight on RSA public key generationRobin McCorkell2015-11-211-1/+1
| | | | | | |
| * | | | | | Only set value if it exists in the StorageConfigRobin McCorkell2015-11-211-2/+5
| | | | | | |
| * | | | | | Reset mountpoint input field when creating new mountRobin McCorkell2015-11-211-0/+1
| | | | | | |
| * | | | | | Fix JS unit testsRobin McCorkell2015-11-212-4/+6
| | | | | | |
| * | | | | | Fix external storage priority logicRobin McCorkell2015-11-211-1/+1
| | | | | | |
| * | | | | | Load applicable users/groups correctlyRobin McCorkell2015-11-211-0/+13
| | | | | | |
| * | | | | | Display applicable global storages in personal mount listRobin McCorkell2015-11-216-57/+187
| | | | | | |
| * | | | | | Render external storages list in JSRobin McCorkell2015-11-213-149/+140
| | | | | | |
* | | | | | | Merge pull request #20574 from owncloud/files_external_list_commandRobin Appelman2015-11-242-0/+265
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Add files_external:list command to list configured external storages
| * | | | | | language fixesRobin Appelman2015-11-231-2/+2
| | | | | | |
| * | | | | | truncate long values on defaultRobin Appelman2015-11-231-1/+17
| | | | | | |
| * | | | | | hide passwords and secrets on defaultRobin Appelman2015-11-231-0/+18
| | | | | | |
| * | | | | | use common --output optionRobin Appelman2015-11-231-7/+11
| | | | | | |
| * | | | | | Add files_external:list command to list configured external storagesRobin Appelman2015-11-232-0/+227
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-24308-2400/+802
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #20684 from owncloud/more-timeThomas Müller2015-11-231-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | webdav docker tests - wait at least 5 seconds after the full startup
| * | | | | | webdav docker tests - wait at least 5 seconds after the full startupMorris Jobke2015-11-231-1/+3
| |/ / / / /
* | | | | | Merge pull request #20609 from owncloud/dav-donotauththroughajaxThomas Müller2015-11-232-2/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Do not authenticate over ajax Webdav
| * | | | | Do not authenticate over ajaxVincent Petry2015-11-232-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that whenever a Webdav call is done through Ajax, if the session has expired, it will not send back a challenge but a simple 401 response. Without this fix, the default code would send back a challenge and trigger the browser's basic auth dialog.
* | | | | | Merge pull request #20222 from owncloud/federated_sharing_auto_completeThomas Müller2015-11-2323-0/+3077
|\ \ \ \ \ \ | |/ / / / / |/| | | | | federated sharing auto-complete, first step
| * | | | | unit testsBjörn Schießle2015-11-207-17/+549
| | | | | |
| * | | | | fixing OCI and othersThomas Müller2015-11-195-20/+9
| | | | | |
| * | | | | make sure that both server don't try to exchange the shared secret in parallelBjörn Schießle2015-11-193-32/+79
| | | | | |
| * | | | | add option to auto add servers to the list of trusted servers once a ↵Björn Schießle2015-11-199-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | federated share was created and accepted successfully
| * | | | | add status to server listBjörn Schießle2015-11-194-5/+19
| | | | | |
| * | | | | exchange shared secretBjörn Schießle2015-11-1912-119/+1052
| | | | | |
| * | | | | added app "federation", allows you to connect ownClouds and exchange user listsBjörn Schießle2015-11-1917-0/+1503
| | | | | |
* | | | | | Merge pull request #16902 from owncloud/jsocclientThomas Müller2015-11-2335-1600/+968
|\ \ \ \ \ \ | | | | | | | | | | | | | | Web UI uses Webdav instead of ajax/* calls