Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12253 from owncloud/port-12154 | Vincent Petry | 2014-11-20 | 1 | -2/+6 |
|\ | | | | | Port 12154 | ||||
| * | Ignore port for trusted domains | Lukas Reschke | 2014-11-18 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php | ||||
* | | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword | Lukas Reschke | 2014-11-19 | 4 | -1/+199 |
|\ \ | | | | | | | Warn for password reset when files_encryption is enabled | ||||
| * | | Use correct route instead | Lukas Reschke | 2014-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | THX @schiesbn (I should setup a mail server on my local system...) | ||||
| * | | Fix scrutinizer issues | Lukas Reschke | 2014-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | Warn for password reset when files_encryption is enabled | Lukas Reschke | 2014-11-17 | 4 | -1/+199 |
| | | | | | | | | | | | | | | | | | | | | | | | | This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password. Furthermore I updated the code to use our new classes and added some unit tests for it :dancers: Fixes https://github.com/owncloud/core/issues/11438 | ||||
* | | | use the new base class for unit tests | Bjoern Schiessle | 2014-11-18 | 1 | -10/+12 |
| | | | |||||
* | | | make sure that we don't find the wrong shares if a user and a group have the ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -0/+41 |
| |/ |/| | | | | | same ID | ||||
* | | Merge pull request #12234 from owncloud/normalizepath-absolute-tests | Lukas Reschke | 2014-11-18 | 1 | -61/+102 |
|\ \ | |/ |/| | Add tests for normalizePath() with absolute paths on windows | ||||
| * | Add tests for absolute paths on windows | Joas Schilling | 2014-11-17 | 1 | -2/+32 |
| | | |||||
| * | Refactor tests to use a dataProvider method | Joas Schilling | 2014-11-17 | 1 | -62/+73 |
| | | |||||
* | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 32 | -149/+362 |
|\| | | | | | Issue/10991 Make unit tests pass on windows | ||||
| * | Correctly restore previous root mount point after testing | Joas Schilling | 2014-11-17 | 14 | -53/+191 |
| | | |||||
| * | Correctly refresh the apps list after removing the mock | Joas Schilling | 2014-11-17 | 1 | -0/+3 |
| | | |||||
| * | Fix Files\Storage\Home::testRoot() | Joas Schilling | 2014-11-17 | 1 | -1/+6 |
| | | |||||
| * | Correctly close handle of directory when listing certificates | Joas Schilling | 2014-11-17 | 1 | -3/+3 |
| | | |||||
| * | Skip some more tests on Windows which just can not work at all | Joas Schilling | 2014-11-17 | 5 | -7/+15 |
| | | |||||
| * | Windows does not support CHMOD, therefor we can not test not writable folders | Joas Schilling | 2014-11-10 | 2 | -0/+12 |
| | | |||||
| * | Test LargeFileHelperGetFileSize also with ascii only characters | Joas Schilling | 2014-11-06 | 1 | -18/+37 |
| | | | | | | | | And skip the UTF8 names on Windows as they are not supported | ||||
| * | Do not use uniqid in Group and User tests as it is not unique on windows | Joas Schilling | 2014-11-06 | 7 | -67/+62 |
| | | |||||
| * | Testcase base class | Joas Schilling | 2014-11-06 | 1 | -0/+33 |
| | | |||||
* | | Merge pull request #12031 from owncloud/app-manager | Robin Appelman | 2014-11-17 | 1 | -0/+195 |
|\ \ | | | | | | | Add \OC\App\Manager to handle enabling/disabling apps | ||||
| * | | Add \OC\App\Manager to handle enabling/disabling apps | Robin Appelman | 2014-11-10 | 1 | -0/+195 |
| | | | |||||
* | | | Check if app is enabled for user | Lukas Reschke | 2014-11-15 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps | ||||
* | | | Fail... | Lukas Reschke | 2014-11-14 | 1 | -1/+1 |
| | | | |||||
* | | | Mark skipped until #12085 is merged | Lukas Reschke | 2014-11-14 | 1 | -0/+6 |
| | | | | | | | | | See https://github.com/owncloud/core/pull/12175#issuecomment-63054620 | ||||
* | | | Merge pull request #12128 from owncloud/drop-formfactor | Jan-Christoph Borchardt | 2014-11-12 | 1 | -9/+7 |
|\ \ \ | | | | | | | | | Drop form_factor that is appended to JS, CSS and template filenames | ||||
| * | | | Drop form_factor that is appended to JS, CSS and template filenames | Morris Jobke | 2014-11-12 | 1 | -9/+7 |
| | | | | |||||
* | | | | Merge pull request #12093 from AdamWill/storage-test-touch | Morris Jobke | 2014-11-12 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | storage test: use new file for testTouchCreateFile() | ||||
| * | | | storage test: use new file for testTouchCreateFile() | Adam Williamson | 2014-11-10 | 1 | -3/+3 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | this test would never succeed, because the previous test - testFOpen() - creates the file 'foo', but testTouchCreateFile() starts out by asserting it doesn't exist. Change the test to use a file called 'touch' instead (which does not previously exist). | ||||
* | | | Merge pull request #11917 from owncloud/fix-11909 | Thomas Müller | 2014-11-11 | 1 | -0/+138 |
|\ \ \ | |/ / |/| | | Add checkbox to enforce SSL for subdomains | ||||
| * | | Migrate "setsecurity.php" to the AppFramework | Lukas Reschke | 2014-11-03 | 1 | -0/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add switch to enforce SSL for subdomains Add unit tests Add test for boolean values Camel-case Fix ugly JS | ||||
* | | | Also propagate etag changes when the watcher finds a changed file | Robin Appelman | 2014-11-07 | 1 | -0/+31 |
| | | | |||||
* | | | Add OCP\Security\IHasher | Lukas Reschke | 2014-11-06 | 1 | -0/+115 |
| | | | | | | | | | | | | | | | | | | | | | Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference. Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662 Requires https://github.com/owncloud/3rdparty/pull/136 | ||||
* | | | Merge pull request #11972 from owncloud/usermanager-remove-delete | Lukas Reschke | 2014-11-06 | 2 | -7/+13 |
|\ \ \ | | | | | | | | | Remove confusingly names \OC\User\Manager::delete and fix the automatic ... | ||||
| * | | | Remove confusingly names \OC\User\Manager::delete and fix the automatic ↵ | Robin Appelman | 2014-11-05 | 2 | -7/+13 |
| | |/ | |/| | | | | | | | cache cleanup instead | ||||
* | | | Merge pull request #11936 from owncloud/bower-jquery | Lukas Reschke | 2014-11-05 | 1 | -6/+6 |
|\ \ \ | | | | | | | | | Bower jquery | ||||
| * | | | migrate jQuery to bower | Morris Jobke | 2014-11-04 | 1 | -6/+6 |
| |/ / | |||||
* / / | fix typo in content type | Bernhard Posselt | 2014-11-05 | 1 | -1/+1 |
|/ / | |||||
* / | replace moment.js with bower version | Morris Jobke | 2014-11-03 | 1 | -0/+7 |
|/ | | | | * fix JS unit tests | ||||
* | remove unnecessary require calls - the ownCloud class loader is supposed to ↵ | Thomas Müller | 2014-10-30 | 6 | -18/+12 |
| | | | | take care of this | ||||
* | Merge pull request #11821 from owncloud/generic-response | Morris Jobke | 2014-10-30 | 4 | -24/+185 |
|\ | | | | | Add a generic data response | ||||
| * | add dataresponse | Bernhard Posselt | 2014-10-29 | 4 | -24/+185 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix docstrings adjust copyright date another copyright date update another header update implement third headers argument, fix indention, fix docstrings fix docstrings | ||||
* | | Merge pull request #11409 from owncloud/watcher-reuse | Vincent Petry | 2014-10-29 | 1 | -2/+3 |
|\ \ | | | | | | | Pass the cached data to the filesystem watcher | ||||
| * | | Better reuse of cache data for getFolderContents | Robin Appelman | 2014-10-24 | 1 | -2/+3 |
| | | | |||||
* | | | adding console command to generate javascript translation files based on ↵ | Thomas Müller | 2014-10-29 | 7 | -18/+21 |
| |/ |/| | | | | | | | | | existing php translation files read server side translations from json files | ||||
* | | use Composer autoloader not OC for non-Composer 3rdparty (#9643) | Adam Williamson | 2014-10-28 | 1 | -15/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Composer's autoloader is rather better than the OwnCloud autoloader's handling of non-OC classes. Plus we can rely on upstream Composer to maintain it and not worry about it ourselves. With this change, we drop the bits of OwnCloud's autoloader that handled non-OC classes, and register the classes that were being handled by that code with Composer's autoloader instead. As these dependencies are converted to actually being managed by Composer, the explicit registrations can be dropped as they won't be needed any more. Since OwnCloud's autoloader isn't going to handle non-OC classes any more, we no longer need to test to make sure it does it right. drop unneeded registerPrefix() and registerClass() from autoloader Now we're not handling anything but OC's own classes, these are unnecessary. error out if composer autoloader is not found (thanks bantu) We're never going to be able to work without the autoloader, if it's not there we should just throw our hands up and surrender. | ||||
* | | Merge pull request #11799 from owncloud/no-stable-etags-on-windows | Lukas Reschke | 2014-10-27 | 1 | -0/+8 |
|\ \ | | | | | | | On Windows platform we have no stable etag generation - yet | ||||
| * | | On Windows platform we have no stable etag generation - yet | Thomas Müller | 2014-10-27 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable | Lukas Reschke | 2014-10-27 | 1 | -0/+103 |
|\ \ \ | |/ / |/| | | Make supported DBs configurable within config.php |