Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18777 from owncloud/locking-default | Morris Jobke | 2015-09-03 | 2 | -8/+6 |
|\ | | | | | enable transational locking by default | ||||
| * | update config sample | Robin Appelman | 2015-09-02 | 1 | -4/+2 |
| | | |||||
| * | enable transational locking by default | Robin Appelman | 2015-09-02 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #18780 from owncloud/isimage-fallback | Morris Jobke | 2015-09-03 | 2 | -15/+64 |
|\ \ | | | | | | | fallback for isimage | ||||
| * | | Fix sidebar thumbnail loading JS unit tests | Vincent Petry | 2015-09-03 | 2 | -15/+64 |
| | | | |||||
| * | | fallback for isimage | Robin Appelman | 2015-09-02 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #18787 from owncloud/encode-tags-in-json | Lukas Reschke | 2015-09-03 | 3 | -8/+22 |
|\ \ | | | | | | | Encode HTML tags in JSON | ||||
| * | | Encode HTML tags in JSON | Lukas Reschke | 2015-09-03 | 3 | -8/+22 |
| | | | | | | | | | | | | While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-03 | 6 | -16/+192 |
| | | | |||||
* | | | Merge pull request #18764 from owncloud/login-template-accessibility | Morris Jobke | 2015-09-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | add title attribute for the login button | ||||
| * | | | add title attribute for the login button | Christoph Wurst | 2015-09-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #18682 from owncloud/quota-select-style | Jan-Christoph Borchardt | 2015-09-03 | 3 | -2/+14 |
|\ \ \ \ | |_|/ / |/| | | | Makes settings quota select like multiselect. | ||||
| * | | | use proper triangle for multiselect dropdowns as well | Jan-Christoph Borchardt | 2015-09-03 | 3 | -2/+4 |
| | | | | |||||
| * | | | Makes settings select like multiselect | Raghu Nayyar | 2015-09-03 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #18783 from owncloud/revert-18773-fix-useless-deletes | Joas Schilling | 2015-09-02 | 1 | -4/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Revert "Soft fail when deleting and no entry found" | ||||
| * | | | Revert "Soft fail when deleting and no entry found" | Joas Schilling | 2015-09-02 | 1 | -4/+0 |
|/ / / | |||||
* | | | Merge pull request #18773 from owncloud/fix-useless-deletes | Robin McCorkell | 2015-09-02 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Soft fail when deleting and no entry found | ||||
| * | | | Soft fail when deleting and no entry found | Robin McCorkell | 2015-09-02 | 1 | -0/+4 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-02 | 6 | -0/+218 |
| | | | |||||
* | | | Merge pull request #18632 from owncloud/sidebad-image-preview | Jan-Christoph Borchardt | 2015-09-02 | 6 | -13/+154 |
|\ \ \ | | | | | | | | | larger preview for images in the sidebar | ||||
| * | | | larger preview for images in the sidebar | Robin Appelman | 2015-09-02 | 4 | -7/+81 |
| | | | | |||||
| * | | | allow handling thumbnail errors | Robin Appelman | 2015-09-02 | 1 | -1/+4 |
| | | | | |||||
| * | | | Allow creating previewss that cover the specified dimensions | Robin Appelman | 2015-09-02 | 2 | -6/+70 |
| | |/ | |/| | |||||
* | | | Merge pull request #18752 from owncloud/proper-setup-check | Morris Jobke | 2015-09-02 | 2 | -1/+29 |
|\ \ \ | |/ / |/| | | use config.php value instead of version string for appstore detection | ||||
| * | | use config.php value instead of version string | Morris Jobke | 2015-09-02 | 2 | -1/+29 |
| | | | |||||
* | | | Merge pull request #18744 from owncloud/fix-ocs-router | Morris Jobke | 2015-09-02 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | Delay adding OCS prefix to route collection until all is loaded | ||||
| * | | Delay adding OCS prefix to route collection until all is loaded | Robin McCorkell | 2015-09-01 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | ->addPrefix() iterates over all registered routes, so must be run after all apps have had a chance to load their OCS routes. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-01 | 34 | -2/+248 |
| | | | |||||
* | | | Merge pull request #18707 from owncloud/autotest-xdebug | Robin McCorkell | 2015-09-01 | 2 | -0/+12 |
|\ \ \ | | | | | | | | | Allow easy XDEBUG debugging with autotest | ||||
| * | | | Allow easy XDEBUG debugging with autotest | Robin McCorkell | 2015-08-31 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debugging scripts needs the environment variable XDEBUG_CONFIG to be set, which initiates a connection to a listening debugger. But if that env is set and one of the PHP setup steps occurs (e.g. occ install), the debugging session is 'completed' and the debugger no longer listens during the actual tests. This saves the XDEBUG_CONFIG env so it only applies during the PHPUnit execution, so only the real tests trigger the debugging. | ||||
* | | | | Merge pull request #18743 from owncloud/autoloader-check-log-path | Robin Appelman | 2015-09-01 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Show the path as part of the exception for not allowed autoloading paths | ||||
| * | | | | Show the path as part of the exception for not allowed autoloading paths | Robin Appelman | 2015-09-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #18234 from owncloud/ocs_api_for_sharees_list | Björn Schießle | 2015-09-01 | 3 | -0/+1417 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add OCS API for sharees list | ||||
| * | | | | Bring the coverage back to 100% | Joas Schilling | 2015-08-26 | 2 | -25/+169 |
| | | | | | |||||
| * | | | | Adjust tests | Joas Schilling | 2015-08-26 | 2 | -403/+348 |
| | | | | | |||||
| * | | | | Fix performance issues of the sharees api | Joas Schilling | 2015-08-26 | 2 | -179/+151 |
| | | | | | |||||
| * | | | | Manually query for the last id | Joas Schilling | 2015-08-26 | 1 | -1/+11 |
| | | | | | |||||
| * | | | | Fix wrong value for datetime field | Joas Schilling | 2015-08-26 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Rename file to match the class name | Joas Schilling | 2015-08-26 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Add tests for "getShareesForShareIds()" | Joas Schilling | 2015-08-26 | 1 | -0/+93 |
| | | | | | |||||
| * | | | | Do not return the current user himself | Joas Schilling | 2015-08-26 | 2 | -5/+44 |
| | | | | | |||||
| * | | | | Take a list of share IDs instead of the user and group names | Joas Schilling | 2015-08-26 | 3 | -67/+118 |
| | | | | | |||||
| * | | | | Inject the logger as well | Joas Schilling | 2015-08-26 | 3 | -31/+44 |
| | | | | | |||||
| * | | | | Add all possible links next, prev, first and last | Joas Schilling | 2015-08-26 | 2 | -16/+88 |
| | | | | | |||||
| * | | | | Make shareType an array | Joas Schilling | 2015-08-26 | 2 | -58/+144 |
| | | | | | |||||
| * | | | | Add tests for "search()" | Joas Schilling | 2015-08-26 | 2 | -7/+156 |
| | | | | | |||||
| * | | | | Do not use deprecated method in new code | Joas Schilling | 2015-08-26 | 3 | -12/+11 |
| | | | | | |||||
| * | | | | Split logic and global usage and add tests for "searchSharees()" | Joas Schilling | 2015-08-26 | 2 | -44/+217 |
| | | | | | |||||
| * | | | | Filter the sharees with the existing shares | Joas Schilling | 2015-08-26 | 1 | -30/+64 |
| | | | | | |||||
| * | | | | Use SearchResultSorter | Joas Schilling | 2015-08-26 | 1 | -16/+4 |
| | | | | |