Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7169 from nextcloud/fix-user-search | Morris Jobke | 2017-11-14 | 1 | -0/+2 |
|\ | |||||
| * | Fix search in user managent when no group is selected | Morris Jobke | 2017-11-14 | 1 | -0/+2 |
* | | Merge pull request #7172 from nextcloud/improve-error-handling-on-preview-cle... | Morris Jobke | 2017-11-14 | 1 | -1/+12 |
|\ \ | |||||
| * | | check if the user still exists before we try to cleanup the previews | Bjoern Schiessle | 2017-11-14 | 1 | -1/+12 |
* | | | Merge pull request #7113 from nextcloud/s3-download-stream-fix | Björn Schießle | 2017-11-14 | 2 | -3/+9 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use non empty files for object store touch | Robin Appelman | 2017-11-08 | 1 | -2/+2 |
| * | | Fix contructing headers for s3 download | Robin Appelman | 2017-11-08 | 1 | -1/+7 |
* | | | Merge pull request #7166 from nextcloud/enhancement/crash-report-context | Morris Jobke | 2017-11-14 | 4 | -5/+9 |
|\ \ \ | |_|/ |/| | | |||||
| * | | add proper type hinting | Morris Jobke | 2017-11-14 | 1 | -0/+1 |
| * | | Pass the exception context to the crash reporter | Christoph Wurst | 2017-11-14 | 4 | -5/+8 |
* | | | Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpath | Morris Jobke | 2017-11-14 | 2 | -0/+12 |
|\ \ \ | |/ / |/| | | |||||
| * | | JSResourceLocator: re-use $app_path | Kyle Fazzari | 2017-11-12 | 1 | -7/+9 |
| * | | JSResourceLocator: account for symlinks in app path | Kyle Fazzari | 2017-11-07 | 1 | -3/+8 |
| * | | CSSResourceLocator: account for symlinks in app path | Kyle Fazzari | 2017-11-03 | 1 | -0/+5 |
* | | | Add a mechanism to register crach reporters | Christoph Wurst | 2017-11-14 | 7 | -5/+166 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-12 | 2 | -8/+8 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-11 | 12 | -36/+2606 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-10 | 12 | -0/+2588 |
* | | | Merge pull request #7117 from nextcloud/fix-welcome-string | Morris Jobke | 2017-11-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix welcome text for better grammar in themed instances | Morris Jobke | 2017-11-09 | 1 | -1/+1 |
* | | | | Merge pull request #7014 from nextcloud/rename-locks | Morris Jobke | 2017-11-09 | 1 | -83/+86 |
|\ \ \ \ | |||||
| * | | | | Unlock files even if an exception occurs | korelstar | 2017-11-03 | 1 | -83/+86 |
* | | | | | Merge pull request #7027 from nextcloud/Rello-patch-1 | Morris Jobke | 2017-11-09 | 1 | -5/+22 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add the return which is being used | Joas Schilling | 2017-10-31 | 1 | -6/+9 |
| * | | | | Mapping of m3u, m3u8, pls to audio streams | Rello | 2017-10-31 | 1 | -0/+14 |
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-09 | 48 | -46/+524 |
* | | | | | Merge pull request #6220 from nextcloud/cached-mount-info-filepath | Lukas Reschke | 2017-11-09 | 6 | -3/+111 |
|\ \ \ \ \ | |||||
| * | | | | | Allow getting the filepath when getting cached mounts by fileid | Robin Appelman | 2017-10-27 | 6 | -3/+111 |
| |/ / / / | |||||
* | | | | | Merge pull request #7109 from nextcloud/fix_6898 | Morris Jobke | 2017-11-08 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | If for some reason the json can't be decoded it is not cached | Roeland Jago Douma | 2017-11-08 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #6788 from staabm/master | Lukas Reschke | 2017-11-08 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Prevent XSS in links which open a new browser window | Markus Staab | 2017-10-19 | 2 | -2/+2 |
* | | | | | | Revert "Only allow colons in db host for IPv6 addresses" | Morris Jobke | 2017-11-08 | 1 | -16/+0 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #6552 from nextcloud/notifications-add-highlight-definition | Morris Jobke | 2017-11-07 | 1 | -0/+25 |
|\ \ \ \ \ | |||||
| * | | | | | Notifications: Add highlight type definition | Julius Härtl | 2017-10-03 | 1 | -0/+25 |
* | | | | | | Merge pull request #6988 from starypatyk/stable12-mount-cache-performance | Morris Jobke | 2017-11-07 | 1 | -1/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Improve performance of UserMountCache with external storage folders | Dariusz Olszewski | 2017-11-01 | 1 | -1/+5 |
* | | | | | | | Merge pull request #7075 from nextcloud/remove-unused-variables | Roeland Jago Douma | 2017-11-07 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused variables | Morris Jobke | 2017-11-06 | 2 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Run updated license header updater | Morris Jobke | 2017-11-07 | 7 | -7/+7 |
* | | | | | | | Merge pull request #7020 from Fiech/master | Morris Jobke | 2017-11-07 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into master | Johannes S | 2017-10-31 | 10 | -2/+207 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Extended list of sensitive configuration values | Johannes Schlichenmaier | 2017-10-31 | 1 | -0/+6 |
* | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-07 | 2 | -0/+516 |
* | | | | | | | | Change @georgehrke's email | Morris Jobke | 2017-11-06 | 30 | -29/+30 |
* | | | | | | | | Merge pull request #7083 from nextcloud/update-license-headers | Morris Jobke | 2017-11-06 | 413 | -246/+872 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update license headers | Morris Jobke | 2017-11-06 | 413 | -246/+872 |
* | | | | | | | | | Merge pull request #7076 from nextcloud/s3-valid-bucket-name | Morris Jobke | 2017-11-06 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Better error message for invalid bucket names | Morris Jobke | 2017-11-06 | 1 | -2/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure | Morris Jobke | 2017-11-06 | 3 | -3/+74 |
|\ \ \ \ \ \ \ \ |