| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-30 | 114 | -116/+2 |
| | | |||||
| * | Merge pull request #21149 from owncloud/quota-wording | Thomas Müller | 2015-12-29 | 1 | -1/+1 |
| |\ | | | | | shorten quota usage wording, fix overflow on mobile, fix #21129 | ||||
| | * | shorten quota usage wording, fix overflow on mobile, fix #21129 | Jan-Christoph Borchardt | 2015-12-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #21331 from switch-ch/fix_ms_log | Thomas Müller | 2015-12-29 | 1 | -1/+1 |
| |\ \ | |/ |/| | Fix owncloud logging with ms precision | ||||
| | * | When microtime(true) returns a whole number, then the parsing fails. | Christian Schnidrig | 2015-12-22 | 1 | -1/+1 |
| | | | | | | | | | This patch makes sure, that the value can always be parsed correctly. | ||||
| * | | Merge pull request #21364 from owncloud/bring_back_icons_filepicker | Thomas Müller | 2015-12-28 | 1 | -0/+1 |
| |\ \ | | | | | | | Get the icon in javascript for the filepicker | ||||
| | * | | Since the server no longer calculates the icon | Roeland Jago Douma | 2015-12-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | The server no longer calculates the icon. So we have the js side do it for us. | ||||
| * | | | Merge pull request #21291 from owncloud/refactor-call-check | Thomas Müller | 2015-12-28 | 6 | -27/+7 |
| |\ \ \ | | | | | | | | | Refactor OC_Util::callCheck | ||||
| | * | | | Refactor OC_Util::callCheck | Morris Jobke | 2015-12-22 | 6 | -27/+7 |
| | | | | | |||||
| * | | | | Merge pull request #21254 from owncloud/files-uploadcanceliconfix | Thomas Müller | 2015-12-28 | 2 | -23/+36 |
| |\ \ \ \ | | | | | | | | | | | Correctly render uploadtext indicator only on folders | ||||
| | * | | | | Use showBusyState for upload into folder | Vincent Petry | 2015-12-18 | 1 | -22/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the original icon will be restored properly in case it's not the default folder icon | ||||
| | * | | | | Correctly render uploadtext indicator only on folders | Vincent Petry | 2015-12-18 | 2 | -1/+16 |
| | | | | | | |||||
| * | | | | | Merge pull request #21216 from owncloud/fopen-statcache | Thomas Müller | 2015-12-28 | 2 | -2/+20 |
| |\ \ \ \ \ | | | | | | | | | | | | | Clear SMB statcache after fopen | ||||
| | * | | | | | clear statcache after fopen for smb | Robin Appelman | 2015-12-15 | 1 | -2/+7 |
| | | | | | | | |||||
| | * | | | | | test for statcache after fopen | Robin Appelman | 2015-12-15 | 1 | -0/+13 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #17333 from owncloud/php7-scalar-types-controllers | Thomas Müller | 2015-12-28 | 2 | -10/+35 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Prefer scalar type hints over phpdoc annotation | ||||
| | * | | | | | | Fix unit test | Roeland Jago Douma | 2015-12-24 | 1 | -2/+6 |
| | | | | | | | | |||||
| | * | | | | | | prefer scalar type hints over phpdoc annotation | Bernhard Posselt | 2015-12-24 | 2 | -10/+31 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | use method exists lookup to be safe and not break on old hhvm versions add test that checks if type hint is preferred over annotation | ||||
| * | | | | | | Merge pull request #20992 from owncloud/log-in-noselect | Thomas Müller | 2015-12-28 | 1 | -0/+16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | prevent selecting on log in page to solve ugliness on accidental selection | ||||
| | * | | | | | | prevent selecting on log in page to solve ugliness on accidental selection | Jan-Christoph Borchardt | 2015-12-24 | 1 | -0/+16 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-28 | 16 | -2/+86 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #21368 from owncloud/xenopathic-mailmap | Thomas Müller | 2015-12-27 | 2 | -1/+6 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update mailmap for myself | ||||
| | * | | | | | | | Add mention bot for Robin McCorkell | Robin McCorkell | 2015-12-24 | 1 | -0/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Correct mailmap for Robin McCorkell to robin@mccorkell.me.uk | Robin McCorkell | 2015-12-24 | 1 | -1/+2 |
| | |/ / / / / / | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-27 | 8 | -0/+32 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-25 | 6 | -0/+18 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #21093 from owncloud/migrate-no-user | Robin Appelman | 2015-12-24 | 3 | -13/+61 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Dont break the files_external migrator if no user is logged in | ||||
| | * | | | | | | Migrate files external for the user that the filesystem is being setup for | Robin Appelman | 2015-12-14 | 3 | -13/+61 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #21323 from owncloud/placeholder_sane_precission | Roeland Douma | 2015-12-24 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | [Avatars] Calculate 'sane' hue precissions | ||||
| | * | | | | | | [Avatars] Calculate 'sane' hue precissions | Roeland Jago Douma | 2015-12-24 | 1 | -2/+2 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to get the numeric value of the entrire md5 string which is a 128bit integer. We would then devide this by the maxval of a 128bit int. There is no need for such huge computations. As we just require a value between 0 and 255. Thus using two 16 bit values is more than enough to get the precision we need. By just taking the MSB we get nearly identical results. | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-24 | 10 | -0/+56 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #21347 from owncloud/fix-unit-tests-on-master | Thomas Müller | 2015-12-23 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix unit tests | ||||
| | * | | | | | | Fix unit tests | Lukas Reschke | 2015-12-23 | 1 | -6/+6 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/21345 | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-23 | 66 | -280/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #21318 from ryno83/target_blank_for_links_in_setupcheck | Thomas Müller | 2015-12-23 | 1 | -6/+6 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | add target="_blank" to href in setupcheck | ||||
| | * | | | | | add _blank to href | Renaud Fortier | 2015-12-21 | 1 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #21325 from owncloud/files-donotduplicatewebdavproperties | Thomas Müller | 2015-12-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Make a modifiable copy of the webdav properties in JS file list | ||||
| | * | | | | | | Make a modifiable copy of the webdav properties in JS file list | Vincent Petry | 2015-12-22 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugins can extend _getWebdavProperties to add custom properties. These should not be added to the original properties list, so now the FileList makes a copy of the array. | ||||
| * | | | | | | Merge pull request #21287 from owncloud/travis-dav-caldavtester | Thomas Müller | 2015-12-22 | 7 | -5/+3704 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Adding integration tests for CalDAV | ||||
| | * | | | | | Adding integration tests for CalDAV | Thomas Müller | 2015-12-21 | 7 | -5/+3704 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #21312 from owncloud/fed-handshake-logging | Thomas Müller | 2015-12-22 | 5 | -10/+37 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add error logging to federation handshake | ||||
| | * | | | | | Add error logging to federated sharing handshake | Robin Appelman | 2015-12-21 | 5 | -10/+37 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #21316 from owncloud/tests-fixtestcasetoallowfailure | Thomas Müller | 2015-12-21 | 1 | -2/+12 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Restore DB connection after failure | ||||
| | * | | | | Restore DB connection after failure | Vincent Petry | 2015-12-21 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of failure, PHPUnit seems to skip `tearDown`, so any useful assertion messages cannot be shown because `tearDownAfterClass` is throwing an error because of database usage. This commit makes sure we also restore the database in `tearDownAfterClass` to prevent the data root restoration to fail | ||||
| * | | | | | Merge pull request #21293 from owncloud/restructure-travis-dav-testing | Thomas Müller | 2015-12-21 | 8 | -58/+68 |
| |\ \ \ \ \ | | | | | | | | | | | | | Restructure travis tests | ||||
| | * | | | | | Sleep in carddavtester as well | Thomas Müller | 2015-12-21 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Restructure travis tests | Thomas Müller | 2015-12-21 | 8 | -58/+66 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #21195 from owncloud/test-carddav-sharing-plugin | Thomas Müller | 2015-12-21 | 5 | -64/+167 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Fix carddav sharing plugin + adding unit tests | ||||
| | * | | | | Fix failing unit tests | Thomas Müller | 2015-12-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix carddav sharing plugin + adding unit tests | Thomas Müller | 2015-12-18 | 5 | -63/+166 |
| | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |