Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20691 from owncloud/share2.0_di_fixes | Thomas Müller | 2015-11-25 | 3 | -124/+222 |
|\ | | | | | [Sharing 2.0] di fixes | ||||
| * | [Sharing 2.0] Use the rootfolder to get the path of a share | Roeland Jago Douma | 2015-11-24 | 3 | -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 etc | Roeland Jago Douma | 2015-11-24 | 1 | -6/+6 |
| | | |||||
| * | [Sharing 2.0] Move authentication to the OCS API | Roeland Jago Douma | 2015-11-24 | 3 | -62/+147 |
| | | |||||
| * | [Sharing 2.0] Default share provider only generic DI | Roeland Jago Douma | 2015-11-24 | 1 | -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 stuff | Roeland Jago Douma | 2015-11-24 | 2 | -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-storage | Thomas Müller | 2015-11-25 | 15 | -797/+54 |
|\ \ | | | | | | | Take submount etag into account for folder etags | ||||
| * | | update tests | Robin Appelman | 2015-11-19 | 3 | -3/+2 |
| | | | |||||
| * | | take the etag of child mounts into account for the folder etag | Robin Appelman | 2015-11-19 | 12 | -794/+52 |
| | | | | | | | | | | | | this replaces shared etag propagation | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-25 | 114 | -120/+246 |
| | | | |||||
* | | | Merge pull request #20636 from owncloud/savre-3.0 | Thomas Müller | 2015-11-24 | 10 | -155/+192 |
|\ \ \ | | | | | | | | | sabre/dav 3.0 and related | ||||
| * | | | Adjust sabre changes in core | Thomas Müller | 2015-11-24 | 10 | -155/+192 |
| | | | | |||||
* | | | | Merge pull request #20692 from owncloud/federation_auto_add_servers | Thomas Müller | 2015-11-24 | 7 | -4/+171 |
|\ \ \ \ | | | | | | | | | | | auto-add ownClouds to the list of trusted servers | ||||
| * | | | | Remove invalid use statement | Thomas Müller | 2015-11-24 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | always store server url without a trailing slash | Björn Schießle | 2015-11-24 | 2 | -3/+20 |
| | | | | | |||||
| * | | | | use hooks to auto add server to the list of trusted servers once a federated ↵ | Björn Schießle | 2015-11-24 | 5 | -0/+151 |
| | | | | | | | | | | | | | | | | | | | | share was created | ||||
* | | | | | Merge pull request #18294 from esakol/issue17173 | Thomas Müller | 2015-11-24 | 1 | -39/+67 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix RHDS ldap paged search, Issue #17173 | ||||
| * | | | | | Fix RHDS ldap paged search, Issue #17173 | Mario Kolling | 2015-11-09 | 1 | -39/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic804ea95401a9b49cb2b0866af722aa0d3ee58c5 | ||||
* | | | | | | Merge pull request #20595 from owncloud/fix-double-slashes | Thomas Müller | 2015-11-24 | 1 | -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 share | blizzz | 2015-11-18 | 1 | -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-listadmin | Thomas Müller | 2015-11-24 | 9 | -220/+377 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Improvements to external storages list rendering | ||||
| * | | | | | | Defer initialisation of data until after complete construction | Robin McCorkell | 2015-11-22 | 2 | -22/+39 |
| | | | | | | | |||||
| * | | | | | | Clear highlight on RSA public key generation | Robin McCorkell | 2015-11-21 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Only set value if it exists in the StorageConfig | Robin McCorkell | 2015-11-21 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Reset mountpoint input field when creating new mount | Robin McCorkell | 2015-11-21 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix JS unit tests | Robin McCorkell | 2015-11-21 | 2 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Fix external storage priority logic | Robin McCorkell | 2015-11-21 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Load applicable users/groups correctly | Robin McCorkell | 2015-11-21 | 1 | -0/+13 |
| | | | | | | | |||||
| * | | | | | | Display applicable global storages in personal mount list | Robin McCorkell | 2015-11-21 | 6 | -57/+187 |
| | | | | | | | |||||
| * | | | | | | Render external storages list in JS | Robin McCorkell | 2015-11-21 | 3 | -149/+140 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #20574 from owncloud/files_external_list_command | Robin Appelman | 2015-11-24 | 2 | -0/+265 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Add files_external:list command to list configured external storages | ||||
| * | | | | | | language fixes | Robin Appelman | 2015-11-23 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | truncate long values on default | Robin Appelman | 2015-11-23 | 1 | -1/+17 |
| | | | | | | | |||||
| * | | | | | | hide passwords and secrets on default | Robin Appelman | 2015-11-23 | 1 | -0/+18 |
| | | | | | | | |||||
| * | | | | | | use common --output option | Robin Appelman | 2015-11-23 | 1 | -7/+11 |
| | | | | | | | |||||
| * | | | | | | Add files_external:list command to list configured external storages | Robin Appelman | 2015-11-23 | 2 | -0/+227 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-24 | 308 | -2400/+802 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #20684 from owncloud/more-time | Thomas Müller | 2015-11-23 | 1 | -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 startup | Morris Jobke | 2015-11-23 | 1 | -1/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #20609 from owncloud/dav-donotauththroughajax | Thomas Müller | 2015-11-23 | 2 | -2/+41 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Do not authenticate over ajax Webdav | ||||
| * | | | | | Do not authenticate over ajax | Vincent Petry | 2015-11-23 | 2 | -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_complete | Thomas Müller | 2015-11-23 | 23 | -0/+3077 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | federated sharing auto-complete, first step | ||||
| * | | | | | unit tests | Björn Schießle | 2015-11-20 | 7 | -17/+549 |
| | | | | | | |||||
| * | | | | | fixing OCI and others | Thomas Müller | 2015-11-19 | 5 | -20/+9 |
| | | | | | | |||||
| * | | | | | make sure that both server don't try to exchange the shared secret in parallel | Björn Schießle | 2015-11-19 | 3 | -32/+79 |
| | | | | | | |||||
| * | | | | | add option to auto add servers to the list of trusted servers once a ↵ | Björn Schießle | 2015-11-19 | 9 | -8/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | federated share was created and accepted successfully | ||||
| * | | | | | add status to server list | Björn Schießle | 2015-11-19 | 4 | -5/+19 |
| | | | | | | |||||
| * | | | | | exchange shared secret | Björn Schießle | 2015-11-19 | 12 | -119/+1052 |
| | | | | | | |||||
| * | | | | | added app "federation", allows you to connect ownClouds and exchange user lists | Björn Schießle | 2015-11-19 | 17 | -0/+1503 |
| | | | | | | |||||
* | | | | | | Merge pull request #16902 from owncloud/jsocclient | Thomas Müller | 2015-11-23 | 35 | -1600/+968 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Web UI uses Webdav instead of ajax/* calls |