Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_external | Robin Appelman | 2016-03-21 | 32 | -478/+761 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #22789 from owncloud/dav-sharesproperty | Thomas Müller | 2016-03-21 | 11 | -60/+693 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove duplicated copyright | Roeland Jago Douma | 2016-03-17 | 2 | -27/+0 | |
| * | | | | | | | Display share status info in favorite list | Vincent Petry | 2016-03-17 | 4 | -15/+112 | |
| * | | | | | | | Add webdav property for share info in PROPFIND response | Vincent Petry | 2016-03-17 | 7 | -45/+608 | |
* | | | | | | | | Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser | Thomas Müller | 2016-03-21 | 5 | -10/+31 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Necessary code changes to make browser plugin properly work | Thomas Müller | 2016-03-17 | 2 | -1/+5 | |
| * | | | | | | | In debugging mode we enable Sabre's browser plugin since it helps a lot when ... | Thomas Müller | 2016-03-17 | 3 | -9/+26 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-... | Thomas Müller | 2016-03-21 | 2 | -49/+52 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | disable the recovery key if the master key is enabled | Bjoern Schiessle | 2016-03-03 | 2 | -49/+52 | |
* | | | | | | | | Merge pull request #23329 from owncloud/fix-21555 | Thomas Müller | 2016-03-21 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Avatar must be saved after login is done and external storages set up properl... | Arthur Schiwon | 2016-03-16 | 2 | -1/+17 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-21 | 8 | -4/+58 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-20 | 12 | -12/+42 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-19 | 4 | -4/+30 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-18 | 2 | -8/+2 | |
* | | | | | | Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory | Thomas Müller | 2016-03-17 | 2 | -7/+29 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix dropbox storage to not store the whole file in memory | Vincent Petry | 2016-03-15 | 2 | -7/+29 | |
* | | | | | | | Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap | Thomas Müller | 2016-03-17 | 2 | -3/+89 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix writing to cache when fallback server should be used immediately | Arthur Schiwon | 2016-03-16 | 2 | -3/+89 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #23346 from owncloud/fix_23325 | Thomas Müller | 2016-03-17 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Set proper public webdav permissions when public upload disabled | Roeland Jago Douma | 2016-03-17 | 1 | -0/+5 | |
* | | | | | | | Merge pull request #23287 from owncloud/issue-22786-absolute-paths | Thomas Müller | 2016-03-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Make sure to append the web root as per doc | Joas Schilling | 2016-03-16 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #23334 from owncloud/ext-user-mounting-gui | Thomas Müller | 2016-03-17 | 6 | -5/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Display external storage GUI even if user mounting disabled | Robin McCorkell | 2016-03-16 | 6 | -5/+14 | |
* | | | | | | | | Merge pull request #23336 from owncloud/occ-typos | Thomas Müller | 2016-03-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Some typo corrections in occ command output | Carla Schroder | 2016-03-16 | 1 | -1/+1 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-17 | 2 | -0/+6 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally... | Thomas Müller | 2016-03-16 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fallback for crappy ancient distributions | Lukas Reschke | 2016-03-12 | 1 | -0/+7 | |
* | | | | | | | | Merge pull request #23253 from owncloud/give-swift-more-time | Thomas Müller | 2016-03-16 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Give swift 15 seconds after startup | Morris Jobke | 2016-03-16 | 1 | -2/+3 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #23082 from owncloud/contacts_calendar_name_color | Thomas Müller | 2016-03-16 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add title and color to birthday calendar | Georg Ehrke | 2016-03-10 | 1 | -0/+5 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | handle connection errors as storage not available in smb | Robin Appelman | 2016-03-16 | 1 | -14/+40 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #23155 from owncloud/fed-unshare-with | Thomas Müller | 2016-03-16 | 2 | -1/+33 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Specify the target user when unsharing a federated share | Robin Appelman | 2016-03-14 | 2 | -1/+33 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-16 | 4 | -2/+6 | |
* | | | | | | Merge pull request #23251 from owncloud/fix_22907 | Thomas Müller | 2016-03-15 | 2 | -2/+42 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | allow group shares, even if not all public keys are available | Bjoern Schiessle | 2016-03-15 | 2 | -2/+42 | |
* | | | | | | Merge pull request #22998 from owncloud/delay-loading-the-scanner | Thomas Müller | 2016-03-15 | 2 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Delay check till scanner is used | Lukas Reschke | 2016-03-09 | 2 | -5/+5 | |
* | | | | | | | Merge pull request #23039 from owncloud/invalid-share-storage | Thomas Müller | 2016-03-15 | 4 | -352/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | move failedstorage to core | Robin Appelman | 2016-03-11 | 4 | -359/+2 | |
| * | | | | | | | dont break when there is an invalid share | Robin Appelman | 2016-03-11 | 2 | -6/+31 | |
* | | | | | | | | Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilde... | Thomas Müller | 2016-03-15 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Correctly escape join statements and use selectAlias | Joas Schilling | 2016-03-10 | 2 | -4/+4 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-15 | 16 | -12/+70 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-14 | 20 | -14/+22 |