Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-19 | 84 | -90/+20 |
| | |||||
* | Merge pull request #12270 from owncloud/fix-search-label | Thomas Müller | 2014-11-18 | 1 | -1/+1 |
|\ | | | | | User management search just searches users - adjust label of input field... | ||||
| * | User management search just searches users - adjust label of input field - ↵ | Morris Jobke | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | fixes #10229 | ||||
* | | Merge pull request #12272 from owncloud/drop-var_dump | Thomas Müller | 2014-11-18 | 1 | -1/+0 |
|\ \ | |/ |/| | drop unneeded var_dump - fixes #9997 | ||||
| * | drop unneeded var_dump - fixes #9997 | Morris Jobke | 2014-11-18 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #12261 from oparoz/patch-1 | Morris Jobke | 2014-11-18 | 1 | -1/+1 |
|\ | | | | | Replace deprecated switches | ||||
| * | Replace deprecated switches | Olivier Paroz | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | Warning: -convert-to is deprecated. Use --convert-to instead. Warning: -outdir is deprecated. Use --outdir instead. | ||||
* | | Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculation | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
|\ \ | | | | | | | Use full path instead of only the filename | ||||
| * | | $file only contains the filename and not the absolute path, that means that ↵ | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
| |/ | | | | | | | | | | | files in a subdirectory will not get properly resolved and an empty filesize is returned. This feature only exists on master. | ||||
* | | Merge pull request #12224 from owncloud/fix_12211 | Björn Schießle | 2014-11-18 | 2 | -18/+74 |
|\ \ | |/ |/| | make sure that we don't find the wrong shares if a user and a group have the same ID | ||||
| * | only users can have a display name different from the id | Bjoern Schiessle | 2014-11-18 | 1 | -1/+4 |
| | | |||||
| * | use the new base class for unit tests | Bjoern Schiessle | 2014-11-18 | 1 | -10/+12 |
| | | |||||
| * | make sure that we only find the shares from the correct share type if users ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -2/+8 |
| | | | | | | | | and groups with the same ID exists | ||||
| * | make sure that we don't find the wrong shares if a user and a group have the ↵ | Bjoern Schiessle | 2014-11-18 | 2 | -6/+51 |
| | | | | | | | | same ID | ||||
* | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager | Lukas Reschke | 2014-11-18 | 1 | -4/+4 |
|\ \ | | | | | | | Fix type hinting for app manager | ||||
| * | | Fix type hinting for app manager | Robin Appelman | 2014-11-18 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #12242 from owncloud/fix-undefined-size | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
|\ \ | |/ |/| | Check if the size field is available | ||||
| * | Check if the size field is available | Lukas Reschke | 2014-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | In some cases the 'size' field is not available resulting in some PHP errors such as: ```json {"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"} ``` This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown. | ||||
* | | Merge pull request #12220 from owncloud/remove-unused-code | Morris Jobke | 2014-11-18 | 3 | -373/+0 |
|\ \ | | | | | | | Remove unused code | ||||
| * | | Remove unused code | Lukas Reschke | 2014-11-17 | 3 | -373/+0 |
| | | | | | | | | | | | | We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed. | ||||
* | | | Merge pull request #12237 from owncloud/fix-12236 | Morris Jobke | 2014-11-18 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Make declaration compatible | ||||
| * | | | Make declaration compatible | Lukas Reschke | 2014-11-17 | 1 | -5/+5 |
| | |/ | |/| | | | | | | | Fixes #12236 | ||||
* | | | 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 #9962 from owncloud/app-group-enable-remote | Lukas Reschke | 2014-11-18 | 3 | -2/+81 |
|\ \ \ \ | | | | | | | | | | | Fix remote.php routes for apps that are enabled for specific groups | ||||
| * | | | | Add sabredav plugin to check if a user has access to an app | Robin Appelman | 2014-11-17 | 3 | -2/+81 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-18 | 6 | -0/+24 |
| | | | | | |||||
* | | | | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Move CSRF check | ||||
| * | | | | Move CSRF check | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |
| | |_|/ | |/| | | | | | | | | | | Because we're closing the session now before controllers are executed there are cases where we cannot write the session. | ||||
* | | | | Merge pull request #11741 from owncloud/delete_all_children_preview_2 | Vincent Petry | 2014-11-17 | 1 | -16/+94 |
|\ \ \ \ | | | | | | | | | | | delete all children's previews when deleting a folder | ||||
| * | | | | delete all children's previews when deleting a folder | Georg Ehrke | 2014-10-30 | 1 | -16/+94 |
| | | | | | | | | | | | | | | | | | | | | add phpdoc | ||||
* | | | | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 48 | -415/+784 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | Issue/10991 Make unit tests pass on windows | ||||
| * | | | Correctly restore previous root mount point after testing | Joas Schilling | 2014-11-17 | 15 | -55/+203 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | Make it possible to cleanPath() absolute Windows paths | Joas Schilling | 2014-11-17 | 1 | -2/+11 |
| | | | | |||||
| * | | | Correctly close handle of directory when listing certificates | Joas Schilling | 2014-11-17 | 2 | -3/+4 |
| | | | | |||||
| * | | | Fix single run of encryption tests and usages of uniqid() and fopen() | Joas Schilling | 2014-11-17 | 12 | -259/+376 |
| | | | | |||||
| * | | | Skip some more tests on Windows which just can not work at all | Joas Schilling | 2014-11-17 | 7 | -10/+37 |
| | | | | |||||
| * | | | 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 | 5 | -0/+406 |
|\ \ \ \ | |_|_|/ |/| | | | Add \OC\App\Manager to handle enabling/disabling apps | ||||
| * | | | Add \OC\App\Manager to handle enabling/disabling apps | Robin Appelman | 2014-11-10 | 5 | -0/+406 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-17 | 40 | -60/+126 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-16 | 4 | -64/+64 |
| | | | | |||||
* | | | | Merge pull request #12186 from owncloud/fix-12182 | Morris Jobke | 2014-11-15 | 3 | -13/+31 |
|\ \ \ \ | | | | | | | | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182 | ||||
| * | | | | do not output DB information, and do not set header | Arthur Schiwon | 2014-11-14 | 3 | -7/+28 |
| | | | | |