Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23501 from owncloud/alarms_for_birthdayevents | Thomas Müller | 2016-04-06 | 1 | -0/+5 |
|\ | |||||
| * | Merge branch 'master' into alarms_for_birthdayevents | Achim Königs | 2016-03-26 | 156 | -236/+656 |
| |\ | |||||
| * | | add VALARM for birthday events | Achim Königs | 2016-03-23 | 1 | -0/+5 |
* | | | Merge pull request #23777 from owncloud/ldap-null-user | Lukas Reschke | 2016-04-06 | 1 | -5/+7 |
|\ \ \ | |||||
| * | | | Handle case where the user is not known - fixes #23759 | Thomas Müller | 2016-04-04 | 1 | -5/+7 |
* | | | | Use proper shortcut methods in templates | Morris Jobke | 2016-04-06 | 4 | -6/+6 |
* | | | | Merge pull request #23793 from owncloud/hard-code-dav-endpoints | Thomas Müller | 2016-04-06 | 1 | -11/+0 |
|\ \ \ \ | |||||
| * | | | | All webdav endpoints within remote.php are now hardcoded - helps to prevent m... | Thomas Müller | 2016-04-05 | 1 | -11/+0 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-06 | 90 | -434/+6 |
* | | | | | Remove any stray socket files before creating new ones | Robin McCorkell | 2016-04-05 | 2 | -0/+2 |
|/ / / / | |||||
* / / / | Add capability to show if group sharing is enabled | Roeland Jago Douma | 2016-04-04 | 2 | -0/+20 |
|/ / / | |||||
* | | | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page | Thomas Müller | 2016-04-04 | 6 | -2/+217 |
|\ \ \ | |||||
| * | | | Add magical regex to catch browsers | Lukas Reschke | 2016-03-24 | 1 | -1/+7 |
| * | | | In case of exception we return an html page in case the client is a browser | Thomas Müller | 2016-03-24 | 6 | -2/+211 |
* | | | | Merge pull request #23743 from owncloud/issue-23686-files-transferownership-s... | Björn Schießle | 2016-04-04 | 2 | -3/+13 |
|\ \ \ \ | |||||
| * | | | | Inject the Mount Manager | Joas Schilling | 2016-04-04 | 2 | -6/+10 |
| * | | | | Unmount the share before deleting it, so we don't try to use it later on | Joas Schilling | 2016-04-01 | 1 | -0/+6 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-02 | 6 | -2/+42 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-01 | 8 | -0/+60 |
* | | | | Merge pull request #22834 from owncloud/webdav_property_for_share_permissions | Thomas Müller | 2016-03-31 | 3 | -0/+120 |
|\ \ \ \ | |||||
| * | | | | Fix unit tests | Roeland Jago Douma | 2016-03-31 | 2 | -3/+14 |
| * | | | | Correct share permissions for external storages | Roeland Jago Douma | 2016-03-31 | 1 | -0/+9 |
| * | | | | Add sharePermissions webdav property | Roeland Jago Douma | 2016-03-31 | 3 | -0/+100 |
* | | | | | Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp | Thomas Müller | 2016-03-31 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add urlencode to username part of ftp and sftp links | Senorsen | 2016-03-16 | 2 | -2/+2 |
* | | | | | | Merge pull request #23564 from owncloud/public-ajaxbasicauth | Morris Jobke | 2016-03-31 | 2 | -2/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enforce type | Lukas Reschke | 2016-03-31 | 1 | -2/+5 |
| * | | | | | | Return 401 DummyBasicAuth in case of ajax call | Vincent Petry | 2016-03-31 | 2 | -2/+17 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #23655 from owncloud/better-ldap-design | Morris Jobke | 2016-03-31 | 1 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Design LDAP wizard to better integrate into the design | Morris Jobke | 2016-03-30 | 1 | -0/+18 |
* | | | | | | | Merge pull request #23517 from owncloud/gdrive-stream-download | Frank Karlitschek | 2016-03-31 | 1 | -4/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | GDrive stream download with RetryWrapper | Vincent Petry | 2016-03-30 | 1 | -4/+5 |
* | | | | | | | | Merge pull request #23397 from paurisa/Fixed_23316 | Frank Karlitschek | 2016-03-31 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed hidden settings and delete icons | Pau | 2016-03-18 | 2 | -4/+4 |
* | | | | | | | | | Merge pull request #23516 from owncloud/dropbox-stream-download | Thomas Müller | 2016-03-31 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Dropbox stream download with RetryWrapper | Vincent Petry | 2016-03-23 | 1 | -4/+6 |
* | | | | | | | | | improve emptycontent styles | Jan-Christoph Borchardt | 2016-03-31 | 1 | -0/+2 |
* | | | | | | | | | Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftp | Thomas Müller | 2016-03-31 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use RetryWrapper for SFTP storage | Lukas Reschke | 2016-03-30 | 1 | -1/+3 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-31 | 26 | -26/+194 |
* | | | | | | | | | Merge pull request #23642 from stweil/master | Thomas Müller | 2016-03-30 | 11 | -14/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | apps/files_external: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-30 | 5 | -6/+6 |
| * | | | | | | | | | apps/files_trashbin: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-30 | 2 | -3/+3 |
| * | | | | | | | | | apps/dav: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-30 | 4 | -5/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #23508 from owncloud/text-columns-should-have-length | Thomas Müller | 2016-03-30 | 2 | -1/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Text columns should really have a length :see_no_evil: | Thomas Müller | 2016-03-23 | 2 | -1/+22 |
* | | | | | | | | | | Merge pull request #23663 from owncloud/share-displayownerfix | Thomas Müller | 2016-03-30 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix displaying owner before share icon in file list | Vincent Petry | 2016-03-30 | 2 | -3/+4 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* / | | | | | | | | Use the shipped cacerts.pem instead of the global one | Lukas Reschke | 2016-03-30 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-30 | 6 | -2/+8 |