summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* always use numeric storage id in cacheentryRobin Appelman2016-12-133-6/+3
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* fix cacheentry return wrong storage idRobin Appelman2016-12-132-1/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* reuse cacheentryRobin Appelman2016-12-131-15/+19
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* also compare storage ids when checking for changed mountsRobin Appelman2016-12-131-1/+6
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2016-12-1214-10/+734
|
* 11.0 RC2v11.0RC2Lukas Reschke2016-12-111-2/+2
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2016-12-112-0/+16
|
* Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendarsLukas Reschke2016-12-102-0/+66
|\ | | | | Do not add invites into read-only calendars
| * Overwrite the schedule target calendar with the personal one and create it ↵Joas Schilling2016-12-092-0/+66
| | | | | | | | | | | | | | | | | | | | if missing Otherwise this leads to problems like events being added to the birthday calendar, if that one is the first calendar which was created for the user. See: https://github.com/nextcloud/server/pull/2274 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2598 from nextcloud/fix_2403Lukas Reschke2016-12-101-0/+9
|\ \ | | | | | | Check for app updates on disabled page
| * | Check for app updates on disabled pageRoeland Jago Douma2016-12-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2403 We need to check for updates of disabled apps so that if you update with incompatible apps you at least get a chance to upgrade. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2016-12-1014-14/+250
| | |
* | | Merge pull request #2590 from nextcloud/postgres-install-failingRoeland Jago Douma2016-12-091-5/+5
|\ \ \ | | | | | | | | Revert "Quote database and role in queries"
| * | | Lower the role name before using itJoas Schilling2016-12-091-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Revert "Quote database and role in queries"Joas Schilling2016-12-091-4/+4
| | | | | | | | | | | | | | | | This reverts commit 9ebd5d5bb20af9178e071c3c6f3b41d9a9bc8be0.
* | | | Merge pull request #2594 from nextcloud/dont-use-cached-infoRoeland Jago Douma2016-12-093-5/+12
|\ \ \ \ | | | | | | | | | | Don't use cached informations for app version when installing the app
| * | | | Don't use cached informations for app versionLukas Reschke2016-12-093-5/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing an app from the appstore the `\OC_App::getAppVersion` code is triggered twice: - First when the downloader tries to compare the current version to the new version on the appstore to check if there is a newer version. This protects against downgrade attacks and is implemented in `\OC\Installer::downloadApp`. - Second, when the app is actually installed the current version is written to the database. (`\OC\Installer::installApp`) This fails however when the version is actually cached. Because in step 1 the cached version will be set to "0" and then be reused in the second step. While this is probably not the cleanest version I assume this is an approach that is least invasive. Feedback and suggestions welcome :) Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2596 from nextcloud/nc11-dev-manual-linkJohn Molakvoæ2016-12-092-2/+2
|\ \ \ \ | |/ / / |/| | | Fix dev manual link for NC11
| * | | Fix dev manual link for NC11Christoph Wurst2016-12-092-2/+2
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #2587 from nextcloud/theming-app-not-loadedMorris Jobke2016-12-091-1/+1
|\ \ \ | | | | | | | | Check if the theming app is loaded
| * | | Check if the theming app is loadedJulius Haertl2016-12-091-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | Merge pull request #2588 from nextcloud/theming-check-emptyBjörn Schießle2016-12-092-1/+4
|\ \ \ \ | |_|/ / |/| | | Check if image files for theming are empty
| * | | Check if image files for theming are emptyJulius Haertl2016-12-092-1/+4
| |/ / | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #2584 from nextcloud/theming-filter-fixJoas Schilling2016-12-091-1/+6
|\ \ \ | | | | | | | | Add fallback to FILTER_LANCZOS for icon resizing
| * | | Add fallback to FILTER_LANCZOS for icon resizingJulius Haertl2016-12-091-1/+6
| | |/ | |/| | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #2582 from nextcloud/callback-alos-on-closeLukas Reschke2016-12-091-1/+15
|\ \ \ | |_|/ |/| | Fire callback also on pure closing of prompt dialog
| * | Fire callback also on pure closing of prompt dialogMorris Jobke2016-12-091-1/+15
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2561 from nextcloud/save-timezone-on-loginblizzz2016-12-094-4/+24
|\ \ \ | |/ / |/| | Save the timezone on login again
| * | Save the timezone on login againJoas Schilling2016-12-084-4/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2016-12-0914-28/+174
| |/ |/|
* | Merge pull request #2571 from ↵Morris Jobke2016-12-082-2/+3
|\ \ | | | | | | | | | | | | nextcloud/issue-2568-allow-non-subadmins-to-change-language Allow non subadmins to change language
| * | Allow non-subadmins to change their languageJoas Schilling2016-12-081-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to overwrite the message which we already do in SubadminMiddlewareJoas Schilling2016-12-081-2/+2
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2565 from nextcloud/direct-desktop-clientsRoeland Jago Douma2016-12-083-3/+3
|\ \ | | | | | | Change URL for desktop clients directly to pop-up
| * | Cahnge URL for desktop clients directly to pop-upFelix A. Epp2016-12-083-3/+3
| |/ | | | | | | | | | | by adding `/#install-clients` to the URL Signed-off-by: Felix A. Epp <work@felixepp.de>
* | Merge pull request #2515 from nextcloud/tag-rename-stylingJoas Schilling2016-12-082-3/+11
|\ \ | | | | | | fix styling of renaming system tags
| * | fix rename input positioning in ffRobin Appelman2016-12-061-0/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | float tooltip over select2 dropdownRobin Appelman2016-12-051-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | fix styling of renaming system tagsRobin Appelman2016-12-051-2/+8
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2545 from nextcloud/fix-popover-widthRoeland Jago Douma2016-12-083-10/+3
|\ \ \ | | | | | | | | Fix popover width
| * | | Fix popover federationScopeMenuJohn Molakvoæ (skjnldsv)2016-12-071-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix popover margin and widthJohn Molakvoæ (skjnldsv)2016-12-072-10/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2556 from Lartza/fix-setup-pgsql-quotesRobin Appelman2016-12-081-4/+4
|\ \ \ \ | | | | | | | | | | Quote database and role in queries
| * | | | Quote database and role in queriesLari Tikkanen2016-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1793 Signed-off-by: Lari Tikkanen <lartza@outlook.com>
* | | | | Merge pull request #2534 from nextcloud/fix-avatar-upload-buttonsRoeland Jago Douma2016-12-081-26/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix avatar delete button
| * | | | Fix #2473John Molakvoæ (skjnldsv)2016-12-061-26/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2016-12-0826-6/+88
| |/ / / |/| | |
* | | | Increase version string to 11,0,0,6Lukas Reschke2016-12-071-1/+1
| | | |
* | | | Merge pull request #2549 from nextcloud/increase-version-to-rcLukas Reschke2016-12-071-1/+1
|\ \ \ \ | | | | | | | | | | Increase versionto 11 RC1
| * | | | Increase versionto 11 RC1Lukas Reschke2016-12-071-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 03:33:13 +0000