summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23501 from owncloud/alarms_for_birthdayeventsThomas Müller2016-04-061-0/+5
|\
| * Merge branch 'master' into alarms_for_birthdayeventsAchim Königs2016-03-26156-236/+656
| |\
| * | add VALARM for birthday eventsAchim Königs2016-03-231-0/+5
* | | Merge pull request #23777 from owncloud/ldap-null-userLukas Reschke2016-04-061-5/+7
|\ \ \
| * | | Handle case where the user is not known - fixes #23759Thomas Müller2016-04-041-5/+7
* | | | Use proper shortcut methods in templatesMorris Jobke2016-04-064-6/+6
* | | | Merge pull request #23793 from owncloud/hard-code-dav-endpointsThomas Müller2016-04-061-11/+0
|\ \ \ \
| * | | | All webdav endpoints within remote.php are now hardcoded - helps to prevent m...Thomas Müller2016-04-051-11/+0
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0690-434/+6
* | | | | Remove any stray socket files before creating new onesRobin McCorkell2016-04-052-0/+2
|/ / / /
* / / / Add capability to show if group sharing is enabledRoeland Jago Douma2016-04-042-0/+20
|/ / /
* | | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-pageThomas Müller2016-04-046-2/+217
|\ \ \
| * | | Add magical regex to catch browsersLukas Reschke2016-03-241-1/+7
| * | | In case of exception we return an html page in case the client is a browserThomas Müller2016-03-246-2/+211
* | | | Merge pull request #23743 from owncloud/issue-23686-files-transferownership-s...Björn Schießle2016-04-042-3/+13
|\ \ \ \
| * | | | Inject the Mount ManagerJoas Schilling2016-04-042-6/+10
| * | | | Unmount the share before deleting it, so we don't try to use it later onJoas Schilling2016-04-011-0/+6
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-026-2/+42
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-018-0/+60
* | | | Merge pull request #22834 from owncloud/webdav_property_for_share_permissionsThomas Müller2016-03-313-0/+120
|\ \ \ \
| * | | | Fix unit testsRoeland Jago Douma2016-03-312-3/+14
| * | | | Correct share permissions for external storagesRoeland Jago Douma2016-03-311-0/+9
| * | | | Add sharePermissions webdav propertyRoeland Jago Douma2016-03-313-0/+100
* | | | | Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftpThomas Müller2016-03-312-2/+2
|\ \ \ \ \
| * | | | | Add urlencode to username part of ftp and sftp linksSenorsen2016-03-162-2/+2
* | | | | | Merge pull request #23564 from owncloud/public-ajaxbasicauthMorris Jobke2016-03-312-2/+20
|\ \ \ \ \ \
| * | | | | | Enforce typeLukas Reschke2016-03-311-2/+5
| * | | | | | Return 401 DummyBasicAuth in case of ajax callVincent Petry2016-03-312-2/+17
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #23655 from owncloud/better-ldap-designMorris Jobke2016-03-311-0/+18
|\ \ \ \ \ \
| * | | | | | Design LDAP wizard to better integrate into the designMorris Jobke2016-03-301-0/+18
* | | | | | | Merge pull request #23517 from owncloud/gdrive-stream-downloadFrank Karlitschek2016-03-311-4/+5
|\ \ \ \ \ \ \
| * | | | | | | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
* | | | | | | | Merge pull request #23397 from paurisa/Fixed_23316Frank Karlitschek2016-03-312-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed hidden settings and delete iconsPau2016-03-182-4/+4
* | | | | | | | | Merge pull request #23516 from owncloud/dropbox-stream-downloadThomas Müller2016-03-311-4/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Dropbox stream download with RetryWrapperVincent Petry2016-03-231-4/+6
* | | | | | | | | improve emptycontent stylesJan-Christoph Borchardt2016-03-311-0/+2
* | | | | | | | | Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftpThomas Müller2016-03-311-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-3126-26/+194
* | | | | | | | | Merge pull request #23642 from stweil/masterThomas Müller2016-03-3011-14/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apps/files_external: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-305-6/+6
| * | | | | | | | | apps/files_trashbin: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-302-3/+3
| * | | | | | | | | apps/dav: Fix typos in comments (found and fixed by codespell)Stefan Weil2016-03-304-5/+5
| |/ / / / / / / /
* | | | | | | | | Merge pull request #23508 from owncloud/text-columns-should-have-lengthThomas Müller2016-03-302-1/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Text columns should really have a length :see_no_evil:Thomas Müller2016-03-232-1/+22
* | | | | | | | | | Merge pull request #23663 from owncloud/share-displayownerfixThomas Müller2016-03-302-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix displaying owner before share icon in file listVincent Petry2016-03-302-3/+4
| | |/ / / / / / / | |/| | | | | | |
* / | | | | | | | Use the shipped cacerts.pem instead of the global oneLukas Reschke2016-03-301-0/+1
|/ / / / / / / /
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-306-2/+8