summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-2812-162/+178
|
* Merge pull request #6245 from nextcloud/postgresRoeland Jago Douma2017-08-271-1/+1
|\ | | | | [Drone] Properly quote "7.0" in drone so it actually runs tests
| * Properly quote 7.0 so drone handles it rightRoeland Jago Douma2017-08-261-1/+1
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #6263 from nextcloud/scanner-exception-handlingMorris Jobke2017-08-262-69/+91
|\ | | | | Better handling of errors durring scanning
| * unlock file when an exception occurs during scanningRobin Appelman2017-08-261-69/+87
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Dont swallow exception when inserting mimetypes if we're inside a transactionRobin Appelman2017-08-261-0/+4
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #6255 from nextcloud/email-meta-dataMorris Jobke2017-08-266-4/+50
|\ | | | | Add meta information to emails for better customisation
| * Allow the expiration date to be set to nullMorris Jobke2017-08-262-2/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Also for reset passwordJoas Schilling2017-08-241-0/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add meta information to emails for better customisationJoas Schilling2017-08-244-4/+45
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6177 from nextcloud/properly-add-slo-urlMorris Jobke2017-08-268-38/+46
|\ \ | | | | | | Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
| * | Inject \OCP\IURLGenerator to make tests workLukas Reschke2017-08-184-5/+16
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Properly allow \OCP\Authentication\IApacheBackend to specify logout URLLukas Reschke2017-08-188-37/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string. This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result in `<a href="foo">`. This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with 054e161eb5f4a5c5c13ee322ae8e93ce66f01b13 inside the navigation manager where one cannot simply inject attributes. Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112, people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects you to the IdP and properly logs you out there as well. Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but I'm not aware of any and there's simply no way to fix this properly otherwise. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #6253 from nextcloud/update-synfony-componentsMorris Jobke2017-08-261-0/+0
|\ \ \ | | | | | | | | update symfony components to 3.3.6
| * | | update symfony componentsRobin Appelman2017-08-261-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6189 from nextcloud/circle-tokenMorris Jobke2017-08-261-0/+9
|\ \ \ \ | | | | | | | | | | link to getShareByToken
| * | | | link to getShareByTokenMaxence Lange2017-08-201-0/+9
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | Merge pull request #6182 from nextcloud/fixes-in-files-drop-jsRoeland Jago Douma2017-08-261-16/+14
|\ \ \ \ \ | | | | | | | | | | | | Fixes in files_drop.js
| * | | | | Do not iterate over the filesDaniel Calviño Sánchez2017-08-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As "singleFileUpload" is used the "add" callback (which in turn calls "addFileToUpload") will always be called with a single file. Therefore there is no need to iterate over the files (and it is not done in the other callbacks either, so this aligns the code with the rest of the callbacks). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Replace fileName variable with data.files[0].nameDaniel Calviño Sánchez2017-08-181-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to store the file name, as the "data" parameter given to all the callbacks provides a "files" attribute with all the files that the callback refers to; moreover, it will always be a single file due to the use of "singleFileUploads" in the jQuery File Upload plugin. This also fixes the loading icon not disappearing when several files were uploaded at once. "singleFileUploads" causes the "add" callback to be called once for each file to be uploaded, so "fileName" was overwritten with the name of each new file in the upload set; when "fileName" was later used in the "done" callback to find the file in the list whose loading icon replace with the MIME type icon "fileName" always had the name of the last file, and thus its icon was the only one replaced. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Update the whole file item instead of only its contentsDaniel Calviño Sánchez2017-08-181-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "done" and "fail" callbacks both update the item for the uploaded file using "setFileIcon". "setFileIcon" updates the contents of the "<li>" element for the file, but the "fail" callback was giving "setFileIcon" an element generated by the template, so the resulting HTML contained a "<li>" element nested in another "<li>" element. However, generating the HTML is better done through a template, so the template now receives the icon to show in order to be used by a successful upload and a failed one, and "setFileIcon" was changed to "updateFileItem". Note that the mimeTypeUrl does no longer need to be escaped, as Handlebars templates escape the needed characters automatically. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Remove "errorThrown" parameterDaniel Calviño Sánchez2017-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the "fail" callback is called, "errorThrown" is a property of the data object instead of a parameter. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #6250 from nextcloud/twofactor/provider-custom-cspRoeland Jago Douma2017-08-264-1/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow 2FA providers to specify their custom CSP
| * | | | | | Bump autoloaderRoeland Jago Douma2017-08-262-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Allow 2FA providers to specify their custom CSPChristoph Wurst2017-08-262-1/+45
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #6252 from nextcloud/only_show1_errorMorris Jobke2017-08-263-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't try the actual file upload if the checks already error out
| * | | | | | Don't try the actual file upload if the checks already error outRoeland Jago Douma2017-08-263-0/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #6157 from nextcloud/smb-2.0.2Morris Jobke2017-08-2613-52/+265
|\ \ \ \ \ \ | | | | | | | | | | | | | | update icewind/smb to 2.0.2
| * | | | | | update icewind/smb to 2.0.2Robin Appelman2017-08-1613-52/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #6262 from nextcloud/navigation-entries-sortMorris Jobke2017-08-262-6/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix sorting of entries in Files sidebar
| * | | | | | Fix sorting of entries in Files sidebarJan-Christoph Borchardt2017-08-252-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-266-4/+12
| | | | | | |
* | | | | | | Merge pull request #6260 from nextcloud/popover-border-radiusRoeland Jago Douma2017-08-251-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add standard border-radius to datepicker
| * | | | | | | Add standard border-radius to datepickerJan-Christoph Borchardt2017-08-251-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #6261 from nextcloud/fix-favorites-permanentRoeland Jago Douma2017-08-251-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix permanent display of favorite icon
| * | | | | | Fix permanent display of favorite iconJan-Christoph Borchardt2017-08-251-0/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-2560-108/+414
| | | | | |
* | | | | | Merge pull request #6244 from nextcloud/redis_clusterMorris Jobke2017-08-251-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [drone] Give redis a change to fireup
| * | | | | | Use a new phpredisRoeland Jago Douma2017-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Give redis a change to fireupRoeland Jago Douma2017-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #6249 from nextcloud/ignore-vscodeRoeland Jago Douma2017-08-241-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add Visual Studio Code to .gitignore
| * | | | | | | Add Visual Studio Code to .gitignoreJakob Sack2017-08-241-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #6251 from nextcloud/get_right_translationRoeland Jago Douma2017-08-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't fetch the translation from core but from files
| * | | | | | | Don't fetch the translation from core but from filesRoeland Jago Douma2017-08-241-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-247-28/+229
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | extend the identity proof manager to allow system wide key pairs
| * | | | | | | Update autoloaderRoeland Jago Douma2017-08-102-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Bump versionRoeland Jago Douma2017-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-104-8/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | | extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-103-23/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | | Merge pull request #6241 from nextcloud/integration_ramMorris Jobke2017-08-241-25/+25
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | [drone] Install intergration tests in RAM
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 13:37:48 +0000