summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_externalRobin Appelman2016-03-2132-478/+761
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #22789 from owncloud/dav-sharespropertyThomas Müller2016-03-2111-60/+693
|\ \ \ \ \ \ \
| * | | | | | | Remove duplicated copyrightRoeland Jago Douma2016-03-172-27/+0
| * | | | | | | Display share status info in favorite listVincent Petry2016-03-174-15/+112
| * | | | | | | Add webdav property for share info in PROPFIND responseVincent Petry2016-03-177-45/+608
* | | | | | | | Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browserThomas Müller2016-03-215-10/+31
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Necessary code changes to make browser plugin properly workThomas Müller2016-03-172-1/+5
| * | | | | | | In debugging mode we enable Sabre's browser plugin since it helps a lot when ...Thomas Müller2016-03-173-9/+26
| |/ / / / / /
* | | | | | | Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-...Thomas Müller2016-03-212-49/+52
|\ \ \ \ \ \ \
| * | | | | | | disable the recovery key if the master key is enabledBjoern Schiessle2016-03-032-49/+52
* | | | | | | | Merge pull request #23329 from owncloud/fix-21555Thomas Müller2016-03-212-1/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Avatar must be saved after login is done and external storages set up properl...Arthur Schiwon2016-03-162-1/+17
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-218-4/+58
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2012-12/+42
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-194-4/+30
| |_|_|_|/ / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-182-8/+2
* | | | | | Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemoryThomas Müller2016-03-172-7/+29
|\ \ \ \ \ \
| * | | | | | Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-152-7/+29
* | | | | | | Merge pull request #23282 from owncloud/fix-caching-unavailable-ldapThomas Müller2016-03-172-3/+89
|\ \ \ \ \ \ \
| * | | | | | | fix writing to cache when fallback server should be used immediatelyArthur Schiwon2016-03-162-3/+89
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #23346 from owncloud/fix_23325Thomas Müller2016-03-171-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Set proper public webdav permissions when public upload disabledRoeland Jago Douma2016-03-171-0/+5
* | | | | | | Merge pull request #23287 from owncloud/issue-22786-absolute-pathsThomas Müller2016-03-171-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Make sure to append the web root as per docJoas Schilling2016-03-161-2/+2
* | | | | | | Merge pull request #23334 from owncloud/ext-user-mounting-guiThomas Müller2016-03-176-5/+14
|\ \ \ \ \ \ \
| * | | | | | | Display external storage GUI even if user mounting disabledRobin McCorkell2016-03-166-5/+14
* | | | | | | | Merge pull request #23336 from owncloud/occ-typosThomas Müller2016-03-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Some typo corrections in occ command outputCarla Schroder2016-03-161-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-172-0/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally...Thomas Müller2016-03-161-0/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fallback for crappy ancient distributionsLukas Reschke2016-03-121-0/+7
* | | | | | | | Merge pull request #23253 from owncloud/give-swift-more-timeThomas Müller2016-03-161-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Give swift 15 seconds after startupMorris Jobke2016-03-161-2/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #23082 from owncloud/contacts_calendar_name_colorThomas Müller2016-03-161-0/+5
|\ \ \ \ \ \ \
| * | | | | | | add title and color to birthday calendarGeorg Ehrke2016-03-101-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | handle connection errors as storage not available in smbRobin Appelman2016-03-161-14/+40
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #23155 from owncloud/fed-unshare-withThomas Müller2016-03-162-1/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Specify the target user when unsharing a federated shareRobin Appelman2016-03-142-1/+33
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-164-2/+6
* | | | | | Merge pull request #23251 from owncloud/fix_22907Thomas Müller2016-03-152-2/+42
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | allow group shares, even if not all public keys are availableBjoern Schiessle2016-03-152-2/+42
* | | | | | Merge pull request #22998 from owncloud/delay-loading-the-scannerThomas Müller2016-03-152-5/+5
|\ \ \ \ \ \
| * | | | | | Delay check till scanner is usedLukas Reschke2016-03-092-5/+5
* | | | | | | Merge pull request #23039 from owncloud/invalid-share-storageThomas Müller2016-03-154-352/+20
|\ \ \ \ \ \ \
| * | | | | | | move failedstorage to coreRobin Appelman2016-03-114-359/+2
| * | | | | | | dont break when there is an invalid shareRobin Appelman2016-03-112-6/+31
* | | | | | | | Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilde...Thomas Müller2016-03-152-4/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Correctly escape join statements and use selectAliasJoas Schilling2016-03-102-4/+4
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1516-12/+70
| |_|_|/ / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1420-14/+22