Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #23676 from owncloud/handle-null-return-getAppInfo | Morris Jobke | 2016-03-31 | 3 | -1/+19 |
|\ \ | |||||
| * | | Properly handle return values of OC_App::getAppInfo() | Morris Jobke | 2016-03-30 | 3 | -1/+19 |
* | | | Merge pull request #23694 from owncloud/add-cov-graph | Morris Jobke | 2016-03-31 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Adding coverage graph to see how we progress | Thomas Müller | 2016-03-31 | 1 | -0/+2 |
* | | | | Merge pull request #16857 from owncloud/printStylesheets | C. Montero Luque | 2016-03-31 | 4 | -12/+51 |
|\ \ \ \ | |||||
| * | | | | support print stylesheets | Hendrik Leppelsack | 2016-01-13 | 4 | -12/+51 |
* | | | | | 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 #23445 from owncloud/enc_small_improvement | Frank Karlitschek | 2016-03-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | no need to calculate the header size, if the first block contain a header we ... | Bjoern Schiessle | 2016-03-21 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set | Frank Karlitschek | 2016-03-31 | 2 | -7/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make sure that the encrypted version is set | Lukas Reschke | 2016-03-31 | 2 | -7/+26 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_s... | Frank Karlitschek | 2016-03-31 | 12 | -130/+310 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix creation of versions of encrypted files on external storages | Bjoern Schiessle | 2016-03-31 | 12 | -130/+310 |
| |/ / / / / / / | |||||
* | | | | | | | | 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 |
* | | | | | | | | | Merge pull request #23526 from owncloud/fix_23337 | Frank Karlitschek | 2016-03-31 | 10 | -3/+171 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add unit tests | Roeland Jago Douma | 2016-03-30 | 1 | -0/+93 |
| * | | | | | | | | | Move OCP\Share over to PSR-4 | Roeland Jago Douma | 2016-03-30 | 7 | -0/+0 |
| * | | | | | | | | | Add setId and setProviderID to the public interface | Roeland Jago Douma | 2016-03-30 | 4 | -3/+78 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #23702 from owncloud/emptycontent | Jan-Christoph Borchardt | 2016-03-31 | 4 | -4/+9 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | improve emptycontent styles | Jan-Christoph Borchardt | 2016-03-31 | 4 | -4/+9 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #23690 from owncloud/add-codecov-icon | Thomas Müller | 2016-03-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add codecov icon | Lukas Reschke | 2016-03-31 | 1 | -0/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | 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 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #15750 from owncloud/loading-feedback-email-usermanagement | Thomas Müller | 2016-03-31 | 3 | -10/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add loading feedback for email change in user management | Morris Jobke | 2016-03-16 | 3 | -10/+33 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-31 | 42 | -28/+492 |
* | | | | | | | | | 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 |
* | | | | | | | | | Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-again | Thomas Müller | 2016-03-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use the shipped cacerts.pem instead of the global one | Lukas Reschke | 2016-03-30 | 1 | -0/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #23628 from owncloud/avatar-remove | Thomas Müller | 2016-03-30 | 2 | -3/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | only remove avatars from the folder we store them in | Robin Appelman | 2016-03-30 | 2 | -3/+2 |
* | | | | | | | | | Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails | Thomas Müller | 2016-03-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | xcache.var_size with 64M should evaluate to isAvailable | Joas Schilling | 2016-03-30 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #23651 from owncloud/fix_23536 | Thomas Müller | 2016-03-30 | 2 | -1/+24 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Non moveable mount points should always be UPDATE+DELETE shareable | Roeland Jago Douma | 2016-03-30 | 2 | -1/+24 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #23630 from owncloud/upload-white | Thomas Müller | 2016-03-30 | 2 | -3/+1 |
|\ \ \ \ \ \ \ \ |