Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #364 from nextcloud/ca-bundle-tests | Björn Schießle | 2016-07-11 | 1 | -0/+92 |
|\ | |||||
| * | add test for needsRebundling() check | Bjoern Schiessle | 2016-07-11 | 1 | -0/+92 |
* | | Improve NodeTest | Roeland Jago Douma | 2016-07-11 | 1 | -123/+76 |
|/ | |||||
* | Merge pull request #347 from nextcloud/drop-windows-foo | Lukas Reschke | 2016-07-11 | 12 | -175/+9 |
|\ | |||||
| * | Fix some more tests | Joas Schilling | 2016-07-11 | 1 | -96/+1 |
| * | Remove unneeded checks if it runs on a Windows machine | Morris Jobke | 2016-07-08 | 11 | -79/+8 |
* | | Merge pull request #351 from nextcloud/improve_filetest_unittest | Morris Jobke | 2016-07-11 | 1 | -237/+153 |
|\ \ | |||||
| * | | Improve FileTest | Roeland Jago Douma | 2016-07-08 | 1 | -237/+153 |
| |/ | |||||
* | | Mock logger | Roeland Jago Douma | 2016-07-11 | 1 | -3/+3 |
* | | Fix phpunit-5.4 wargning | Roeland Jago Douma | 2016-07-11 | 13 | -116/+185 |
* | | Correction is no longer required in php7 | Roeland Jago Douma | 2016-07-08 | 1 | -1/+1 |
* | | Fix phpunit Trait warning | Roeland Jago Douma | 2016-07-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #314 from jernst/master | Lukas Reschke | 2016-07-07 | 1 | -1/+30 |
|\ | |||||
| * | Disallow certain malformed domain names even if they match the trusted domain... | Johannes Ernst | 2016-07-06 | 1 | -0/+4 |
| * | Trusted domain wildcard checking made shorter, supporting multiple * | Johannes Ernst | 2016-07-06 | 1 | -1/+26 |
* | | Revert "occ web executor (#24957)" | Morris Jobke | 2016-07-07 | 1 | -143/+0 |
* | | Merge branch 'master' into sync-master | Morris Jobke | 2016-07-07 | 11 | -37/+100 |
|\| | |||||
| * | Changed name of default logfile from owncloud.log to nextcloud.log. | Thomas Pulzer | 2016-07-04 | 3 | -6/+6 |
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-07-01 | 8 | -4/+1603 |
| |\ | |||||
| * | | Set content-type to "application/octet-stream" | Lukas Reschke | 2016-06-30 | 1 | -1/+5 |
| * | | Merge pull request #206 from nextcloud/ci-mysql | Morris Jobke | 2016-06-30 | 1 | -0/+8 |
| |\ \ | |||||
| | * | | mysql only works with 3 byte UTF-8 | Morris Jobke | 2016-06-29 | 1 | -0/+8 |
| * | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 3 | -18/+117 |
| |\ \ \ | |||||
| * | | | | verify user password on change | Bjoern Schiessle | 2016-06-27 | 1 | -1/+46 |
| * | | | | remove old hook, no longer needed | Bjoern Schiessle | 2016-06-27 | 1 | -19/+16 |
| * | | | | check password for link shares | Bjoern Schiessle | 2016-06-27 | 1 | -6/+14 |
| * | | | | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 4 | -107/+338 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 6 | -7/+313 |
| |\ \ \ \ | |||||
| * | | | | | fix unit tests | Morris Jobke | 2016-06-20 | 1 | -3/+3 |
| * | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 | Arthur Schiwon | 2016-06-14 | 1 | -3/+24 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 4 | -8/+514 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #19 from nextcloud/files-drop | Lukas Reschke | 2016-06-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | add hide file list option | Bjoern Schiessle | 2016-06-09 | 1 | -1/+0 |
| * | | | | | | | | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 9 | -56/+317 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Revert "Downstream 2016-06-08" | blizzz | 2016-06-09 | 6 | -173/+24 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Allow to cancel 2FA after login | Joas Schilling | 2016-06-09 | 1 | -4/+17 |
| * | | | | | | | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-09 | 1 | -0/+31 |
| * | | | | | | | | Allow to decrypt user '0' files only | Joas Schilling | 2016-06-09 | 1 | -12/+23 |
| * | | | | | | | | do not generate device token if 2FA is enable for user | Christoph Wurst | 2016-06-09 | 1 | -7/+33 |
| * | | | | | | | | Do not allow to store boolean configs, they behave unexpected on postgres | Joas Schilling | 2016-06-09 | 1 | -0/+19 |
| * | | | | | | | | allow deleting "ghost files" trough the View and Node api | Robin Appelman | 2016-06-09 | 1 | -1/+50 |
| * | | | | | | | | skip failing tests | Morris Jobke | 2016-06-07 | 3 | -0/+5 |
* | | | | | | | | | Set content type when downloading log file to force download in some browsers... | Vincent Petry | 2016-07-06 | 1 | -0/+3 |
* | | | | | | | | | fix swift primary object store test (#25281) | Thomas Müller | 2016-07-05 | 2 | -1/+55 |
* | | | | | | | | | Merge pull request #25276 from owncloud/delete-own-session-token | Vincent Petry | 2016-07-01 | 1 | -5/+36 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | prevent users from deleting their own session token | Christoph Wurst | 2016-06-28 | 1 | -5/+36 |
* | | | | | | | | | Various database migration fixes (#25209) | Thomas Müller | 2016-06-29 | 7 | -3/+1599 |
|/ / / / / / / / | |||||
* | | | | | | / | Login hooks (#25260) | Christoph Wurst | 2016-06-27 | 1 | -1/+4 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 2 | -18/+87 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Repair step to adjust link share delete permissions | Vincent Petry | 2016-06-24 | 1 | -0/+87 |