Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4935 from owncloud/webdav-depth-fix-master | Frank Karlitschek | 2013-10-17 | 2 | -1/+236 |
|\ | |||||
| * | adding : | Thomas Müller | 2013-09-30 | 1 | -1/+1 |
| * | Merge branch 'webdav-depth-fix-master' of github.com:owncloud/core into webda... | Thomas Müller | 2013-09-30 | 0 | -0/+0 |
| |\ | |||||
| | * | adding copyright and PHPDocs | Thomas Müller | 2013-09-23 | 1 | -8/+22 |
| | * | Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ... | Thomas Müller | 2013-09-20 | 2 | -1/+222 |
| * | | adding copyright and PHPDocs | Thomas Müller | 2013-09-30 | 1 | -8/+22 |
| * | | Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ... | Thomas Müller | 2013-09-30 | 2 | -1/+222 |
* | | | Merge pull request #5375 from owncloud/fix-api-documentation | Thomas Müller | 2013-10-17 | 12 | -167/+166 |
|\ \ \ | |||||
| * | | | Public API documentation fixes | Morris Jobke | 2013-10-17 | 12 | -167/+166 |
|/ / / | |||||
* | | | Merge pull request #5276 from owncloud/fixing-5170-master | Morris Jobke | 2013-10-16 | 1 | -23/+12 |
|\ \ \ | |||||
| * | | | accept text/markdown as well | Thomas Müller | 2013-10-16 | 1 | -1/+1 |
| * | | | Merge branch 'master' into fixing-5170-master | Thomas Müller | 2013-10-16 | 969 | -21161/+19536 |
| |\ \ \ | |||||
| * | | | | implement previews for markdown | Georg Ehrke | 2013-10-14 | 1 | -0/+10 |
| * | | | | remove php and js previews | Georg Ehrke | 2013-10-11 | 1 | -20/+0 |
| * | | | | only text/plain is now used to generate text previews | Thomas Müller | 2013-10-11 | 1 | -11/+10 |
* | | | | | Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix | Morris Jobke | 2013-10-16 | 2 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed conflict dialog in IE8 | Vincent Petry | 2013-10-10 | 2 | -2/+6 |
* | | | | | | Merge pull request #5157 from owncloud/fixing-appframework-master | Thomas Müller | 2013-10-16 | 24 | -466/+216 |
|\ \ \ \ \ \ | |||||
| * | | | | | | re-enable test in SecurityMiddlewareTest | Thomas Müller | 2013-10-16 | 1 | -5/+0 |
| * | | | | | | Merge branch 'master' into fixing-appframework-master | Thomas Müller | 2013-10-16 | 1013 | -21948/+20262 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #5067 from owncloud/urlParams_fix | Thomas Müller | 2013-10-16 | 6 | -19/+27 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Get urlParams registered before Request is instantiated | Thomas Tanghus | 2013-10-01 | 6 | -19/+27 |
* | | | | | | | Merge pull request #5353 from owncloud/files-dndtodirbroken | Morris Jobke | 2013-10-16 | 1 | -14/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed drag and drop upload to breadcrumb | Vincent Petry | 2013-10-15 | 1 | -26/+22 |
| * | | | | | | | Fixed drag and drop onto folders | Vincent Petry | 2013-10-15 | 1 | -5/+17 |
* | | | | | | | | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend | Thomas Müller | 2013-10-16 | 1 | -5/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | there shall be tabs | Thomas Müller | 2013-10-14 | 1 | -1/+1 |
| * | | | | | | | | file system is now initialized with apache authentication as well | Thomas Müller | 2013-10-14 | 1 | -6/+2 |
* | | | | | | | | | Merge pull request #5329 from owncloud/enc_fix_unencrypted_size | Björn Schießle | 2013-10-16 | 1 | -2/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revert last changes | Bjoern Schiessle | 2013-10-16 | 1 | -3/+1 |
| * | | | | | | | | | added another test, if unencrypted size and encrypted size are equal we can a... | Bjoern Schiessle | 2013-10-15 | 1 | -1/+3 |
| * | | | | | | | | | fix array key | Bjoern Schiessle | 2013-10-14 | 1 | -1/+1 |
| * | | | | | | | | | try to fix unencrypted file size if it doesn't look plausible | Bjoern Schiessle | 2013-10-14 | 1 | -2/+19 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #5354 from owncloud/enc_tests | Morris Jobke | 2013-10-16 | 1 | -216/+106 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix comment | Bjoern Schiessle | 2013-10-15 | 1 | -1/+1 |
| * | | | | | | | | | added simple test for getFileSize proxy | Bjoern Schiessle | 2013-10-15 | 1 | -216/+106 |
* | | | | | | | | | | 6.0 alpha 2v6.0.0alpha2 | Frank Karlitschek | 2013-10-16 | 1 | -2/+2 |
* | | | | | | | | | | Merge pull request #5333 from owncloud/avater_with_encryption | Björn Schießle | 2013-10-16 | 2 | -6/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix avatar unittest | kondou | 2013-10-15 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'master' into avater_with_encryption | Bjoern Schiessle | 2013-10-15 | 12 | -40/+135 |
| |\| | | | | | | | | | |||||
| * | | | | | | | | | | test should work now | Bjoern Schiessle | 2013-10-15 | 1 | -1/+0 |
| * | | | | | | | | | | avatars should also work with encryption after pr #5332 was merged | Bjoern Schiessle | 2013-10-14 | 1 | -4/+0 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-16 | 387 | -3453/+3676 |
* | | | | | | | | | | Merge pull request #5334 from owncloud/files-sharing-actionsafterupload | Morris Jobke | 2013-10-15 | 3 | -23/+29 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Disabled ajax mode for public files view | Vincent Petry | 2013-10-14 | 2 | -21/+27 |
| * | | | | | | | | | | Fixed file permissions after public upload | Vincent Petry | 2013-10-14 | 1 | -2/+2 |
* | | | | | | | | | | | Merge pull request #5350 from owncloud/files-preventdeletemountpoint | Vincent Petry | 2013-10-15 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Prevent renaming/deleting mount points | Vincent Petry | 2013-10-15 | 1 | -1/+2 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #5295 from owncloud/show-eye-in-personal | Raghu Nayyar | 2013-10-15 | 2 | -10/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Removes Bogus showpassword js. thx @PVince81 | raghunayyar | 2013-10-15 | 1 | -3/+1 |