aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23070 from eleith/complex-recurrance-importseleith2020-11-102-7/+25
|\ | | | | handle vcalander documents with multiple VEVENTS not in order
| * resolve review commentsleith abdulla2020-10-291-2/+2
| | | | | | | | | | | | | | | | update styling for conditionals and simplifying conditional by only relying on dtstart instead of also counting vevents (since they imply the same condition, assuming valid events) Signed-off-by: leith abdulla <online-nextcloud@eleith.com>
| * handle vcalander documents with recurrence with exemptions or editsleith abdulla2020-10-282-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when importing ics files from third party services (ex: google), long running recurrence vcalander objects can contain numerous vevents relating to past exemptions or edits. these objects are handled incorrectly, leading to incorrect first and/or last occurence dates from being inferred. as a result, a number of imported events are not rendered in the calendar. this PR makes use of EventIterator's constructor that takes in an array of VEVENTS to properly handle these complex cases. Also of note is that other parameter signatures of EventIterator's constructor, will be deprecated, according to comments in sabre dav EventIterator.php Signed-off-by: leith abdulla <online-nextcloud@eleith.com>
* | Merge pull request #24024 from nextcloud/enhancement/exception-page-full-traceMorris Jobke2020-11-103-5/+22
|\ \ | | | | | | Show the full trace of an exception
| * | Show the full trace of an exceptionChristoph Wurst2020-11-103-5/+22
|/ / | | | | | | | | | | | | | | Because often we catch the exception at some point and then the trace is misleading. What's really interesting is the trace of the *previous* exception. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #24019 from ↵Roeland Jago Douma2020-11-101-3/+0
|\ \ | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | Update psalm baselineNextcloud-PR-Bot2020-11-101-3/+0
|/ / | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | [tx-robot] updated from transifexNextcloud bot2020-11-1014-20/+70
| |
* | Merge pull request #23967 from ↵Roeland Jago Douma2020-11-091-1/+1
|\ \ | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/behat/behat-approx-3.8.0 Update behat/behat requirement from ~3.7.0 to ~3.8.0 in /build/integration
| * | Update behat/behat requirement in /build/integrationdependabot-preview[bot]2020-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [behat/behat](https://github.com/Behat/Behat) to permit the latest version. - [Release notes](https://github.com/Behat/Behat/releases) - [Changelog](https://github.com/Behat/Behat/blob/master/CHANGELOG.md) - [Commits](https://github.com/Behat/Behat/compare/v3.7.0...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #23981 from nextcloud/fix/sharing/undefined-in-searchMorris Jobke2020-11-093-5/+5
|\ \ \ | | | | | | | | Fix js search in undefined ocs response
| * | | Fix js search in undefined ocs responseJohn Molakvoæ (skjnldsv)2020-11-093-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | | Merge pull request #23999 from nextcloud/fix/old-legacy-scriptsMorris Jobke2020-11-092-2/+0
|\ \ \ \ | | | | | | | | | | Remove old legacy scripts references
| * | | | Removed config.jsJohn Molakvoæ2020-11-091-1/+0
| | | | |
| * | | | Remove old legacy search scriptJohn Molakvoæ2020-11-091-1/+0
| |/ / /
* | | | Merge pull request #23994 from nextcloud/fix/comment_searchRoeland Jago Douma2020-11-091-0/+1
|\ \ \ \ | | | | | | | | | | Update comment search to initFS
| * | | | Update comment search to initFSRoeland Jago Douma2020-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #23889 from ↵Morris Jobke2020-11-092-11/+14
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/fix/noid/shortcut-to-avoid-filesystem-setup Shortcut to avoid file system setup when generating the logo URL
| * | | | Shortcut to avoid file system setup when generating the logo URLMorris Jobke2020-11-092-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an SVG is requested and the app config value for logoMime is set then the logo is there. Otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which needs to be called then). Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #23937 from nextcloud/bugfix/noid/files-ocdbJohn Molakvoæ2020-11-093-26/+52
|\ \ \ \ \ | | | | | | | | | | | | Use query builder instead of OC_DB in OC\Files\*
| * | | | | Use query builder instead of OC_DB in OC\Files\*Joas Schilling2020-11-093-26/+52
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #23976 from nextcloud/enh/reduce_getAppPath_and_autoload_regMorris Jobke2020-11-091-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reduce the getAppPath and autoloader calls
| * | | | | | Reduce the getAppPath and autoloader callsRoeland Jago Douma2020-11-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getAppPath will always return the same data for the same appId. It is actually already cached. However we do some cleanup of the appId (again). Same for the autoloading it is actually already checked. This just removes the unneeded calls. Which can add up if you have a lot of incomming shares. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #23982 from nextcloud/fix/quota-storage-getsizeMorris Jobke2020-11-091-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make sure root storage is valid before checking its size
| * | | | | | | Make sure root storage is valid before checking its sizeJohn Molakvoæ (skjnldsv)2020-11-091-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #23741 from Ashod/lock-leakMorris Jobke2020-11-091-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Unlock when promoting to exclusive lock fails
| * | | | | | | Unlock when promoting to exclusive lock failsAshod Nakashian2020-11-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases changeLock to EXCLUSIVE fails and throws LockedException. This leaves the file locked as SHARED in file_put_contents, which prevents retrying (because on second call file_put_contents takes another SHARED lock on the same file, and changeLock doesn't allow more than a single SHARED lock to promote to EXCLUSIVE). To avoid this case, we catch the LockedException and unlock before re-throwing. Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
* | | | | | | | Merge pull request #23978 from nextcloud/enh/query_servercontainer_firstMorris Jobke2020-11-091-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | First query the server container
| * | | | | | | | First query the server containerRoeland Jago Douma2020-11-071-0/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the servercontainer wants to obtain something changes are very high this is something from the server container. Esp on setups with a lot of shares this can change quite a bit as it avoid a needless check on the strpos OCA\\ etc. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #23933 from nextcloud/bugfix/noid/user-ldap-ocdbMorris Jobke2020-11-0920-58/+60
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Use query builder instead of OC_DB in user_ldap
| * | | | | | | Test requires the DBJoas Schilling2020-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | fix insert valuesArthur Schiwon2020-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | only delete specified configArthur Schiwon2020-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Correctly place the array typeJoas Schilling2020-11-061-1/+1
| | | | | | | |
| * | | | | | | Use query builder to interact with member managementJoas Schilling2020-11-061-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Use query builder instead of OC_DB in user_ldapJoas Schilling2020-11-0619-46/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #23574 from nextcloud/fix/23569John Molakvoæ2020-11-093-4/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix link share label placeholder not showing
| * | | | | | | Fix link share label placeholder not showingGary Kim2020-11-073-4/+5
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-11-0928-38/+140
| | | | | | |
* | | | | | | Merge pull request #23983 from ↵Roeland Jago Douma2020-11-081-6/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | | | | | Update psalm baselineNextcloud-PR-Bot2020-11-081-6/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* / / / / / / [tx-robot] updated from transifexNextcloud bot2020-11-0854-66/+766
|/ / / / / /
* | | | | | Merge pull request #23923 from ↵Roeland Jago Douma2020-11-075-10/+77
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/bugfix/oci/fix-greatest-order-for-oracle Fix greatest/least order for oracle
| * | | | | Update parametersJoas Schilling2020-11-074-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Make sure Oracle always casts everything in the best wayJoas Schilling2020-11-061-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Use Query builder functionJoas Schilling2020-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix order of GREATEST for OracleJoas Schilling2020-11-061-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm Oracle uses the first value to cast the rest or the values. So when the first value is a plain int, instead of doing the math, it will cast the expression to int and continue with a potential 0. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #23956 from nextcloud/dependabot/npm_and_yarn/node-sass-5.0.0John Molakvoæ2020-11-078-89/+162
|\ \ \ \ \ | | | | | | | | | | | | Bump node-sass from 4.14.1 to 5.0.0
| * | | | | Bump node-sass from 4.14.1 to 5.0.0dependabot-preview[bot]2020-11-078-89/+162
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [node-sass](https://github.com/sass/node-sass) from 4.14.1 to 5.0.0. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.14.1...v5.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | | | Merge pull request #23961 from ↵dependabot-preview[bot]2020-11-074-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-2.4.1
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-15 07:53:48 +0000