Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | CardDavBackEnd requires principalBackend on ctor | Thomas Müller | 2015-11-25 | 2 | -11/+24 |
* | Output owncloud.log to the console | Thomas Müller | 2015-11-25 | 1 | -0/+4 |
* | Adding sync support - including dav tests | Thomas Müller | 2015-11-25 | 4 | -2/+1608 |
* | Merge pull request #20733 from owncloud/scan-eventsource-no-paths | Thomas Müller | 2015-11-25 | 1 | -8/+0 |
|\ | |||||
| * | Dont output paths in scan.php | Robin Appelman | 2015-11-25 | 1 | -8/+0 |
* | | add icon for Federation app | Jan-Christoph Borchardt | 2015-11-25 | 1 | -0/+4 |
* | | Merge pull request #20712 from owncloud/replace-netcat-php | Thomas Müller | 2015-11-25 | 8 | -81/+71 |
|\ \ | |||||
| * | | Replace shitty netcat use with dedicated PHP script | Robin McCorkell | 2015-11-24 | 8 | -81/+71 |
* | | | Merge pull request #20691 from owncloud/share2.0_di_fixes | Thomas Müller | 2015-11-25 | 3 | -124/+222 |
|\ \ \ | |_|/ |/| | | |||||
| * | | [Sharing 2.0] Use the rootfolder to get the path of a share | Roeland Jago Douma | 2015-11-24 | 3 | -49/+65 |
| * | | [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 |
| * | | [Sharing 2.0] Removed unused DI stuff | Roeland Jago Douma | 2015-11-24 | 2 | -26/+23 |
* | | | Merge pull request #20439 from owncloud/etag-propagate-in-storage | Thomas Müller | 2015-11-25 | 15 | -797/+54 |
|\ \ \ | |||||
| * | | | 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 |
* | | | | [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 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | 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 |
* | | | | | Merge pull request #18294 from esakol/issue17173 | Thomas Müller | 2015-11-24 | 1 | -39/+67 |
|\ \ \ \ \ | |||||
| * | | | | | Fix RHDS ldap paged search, Issue #17173 | Mario Kolling | 2015-11-09 | 1 | -39/+67 |
* | | | | | | 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 | blizzz | 2015-11-18 | 1 | -1/+5 |
* | | | | | | | Merge pull request #18999 from owncloud/ext-config-listadmin | Thomas Müller | 2015-11-24 | 9 | -220/+377 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | 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 | 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 | Vincent Petry | 2015-11-23 | 2 | -2/+41 |
* | | | | | | Merge pull request #20222 from owncloud/federated_sharing_auto_complete | Thomas Müller | 2015-11-23 | 23 | -0/+3077 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |