7cb99e74db
[tx-robot] updated from transifex
2016-12-10 01:07:15 +00:00
341265fbcb
Merge pull request #2590 from nextcloud/postgres-install-failing
...
Revert "Quote database and role in queries"
2016-12-09 22:46:03 +01:00
4f3f799e06
Merge pull request #2594 from nextcloud/dont-use-cached-info
...
Don't use cached informations for app version when installing the app
2016-12-09 22:43:21 +01:00
9dc29aa24f
Merge pull request #2596 from nextcloud/nc11-dev-manual-link
...
Fix dev manual link for NC11
2016-12-09 20:24:08 +01:00
fbc494234b
Fix dev manual link for NC11
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-09 19:32:16 +01:00
32bf8ec826
Don't use cached informations for app version
...
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>
2016-12-09 18:01:45 +01:00
a5a35cda7c
Lower the role name before using it
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-09 16:41:01 +01:00
0de83a3a01
Merge pull request #2587 from nextcloud/theming-app-not-loaded
...
Check if the theming app is loaded
2016-12-09 16:34:33 +01:00
d10be51d40
Merge pull request #2588 from nextcloud/theming-check-empty
...
Check if image files for theming are empty
2016-12-09 15:57:44 +01:00
0d6134f512
Revert "Quote database and role in queries"
...
This reverts commit 9ebd5d5bb2
2016-12-09 15:36:14 +01:00
de8908bf29
Merge pull request #2584 from nextcloud/theming-filter-fix
...
Add fallback to FILTER_LANCZOS for icon resizing
2016-12-09 14:53:34 +01:00
49473dee85
Merge pull request #2582 from nextcloud/callback-alos-on-close
...
Fire callback also on pure closing of prompt dialog
2016-12-09 13:44:53 +01:00
5fbadee95f
Check if image files for theming are empty
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:54:03 +01:00
ec52286a0f
Fire callback also on pure closing of prompt dialog
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-09 12:52:46 +01:00
086a5eb9d0
Check if the theming app is loaded
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:52:17 +01:00
366f14d7db
Add fallback to FILTER_LANCZOS for icon resizing
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 11:53:27 +01:00
e3b2832ee1
Merge pull request #2561 from nextcloud/save-timezone-on-login
...
Save the timezone on login again
2016-12-09 10:37:52 +01:00
88d90066ba
[tx-robot] updated from transifex
2016-12-09 01:07:18 +00:00
60e4299bcb
Merge pull request #2571 from nextcloud/issue-2568-allow-non-subadmins-to-change-language
...
Allow non subadmins to change language
2016-12-08 17:52:44 +01:00
10daad9346
Allow non-subadmins to change their language
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-08 16:24:21 +01:00
61e15988a0
Allow to overwrite the message which we already do in SubadminMiddleware
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-08 16:23:49 +01:00
402a07bfe0
Merge pull request #2565 from nextcloud/direct-desktop-clients
...
Change URL for desktop clients directly to pop-up
2016-12-08 14:33:08 +01:00
3472f70ffe
Merge pull request #2515 from nextcloud/tag-rename-styling
...
fix styling of renaming system tags
2016-12-08 14:05:06 +01:00
158cc9c261
Merge pull request #2545 from nextcloud/fix-popover-width
...
Fix popover width
2016-12-08 13:49:56 +01:00
880121d310
Merge pull request #2556 from Lartza/fix-setup-pgsql-quotes
...
Quote database and role in queries
2016-12-08 13:45:17 +01:00
ce707912b4
Merge pull request #2534 from nextcloud/fix-avatar-upload-buttons
...
Fix avatar delete button
2016-12-08 13:44:26 +01:00
98bdef8d83
Cahnge URL for desktop clients directly to pop-up
...
by adding `/#install-clients` to the URL
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-12-08 12:40:52 +01:00
924358ef96
Save the timezone on login again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-08 10:45:24 +01:00
74d1b0bada
[tx-robot] updated from transifex
2016-12-08 01:07:26 +00:00
9ebd5d5bb2
Quote database and role in queries
...
Fixes #1793
Signed-off-by: Lari Tikkanen <lartza@outlook.com>
2016-12-07 22:12:25 +02:00
737d9f3504
Increase version string to 11,0,0,6
2016-12-07 15:29:45 +01:00
635ef962f0
Merge pull request #2549 from nextcloud/increase-version-to-rc
...
Increase versionto 11 RC1
2016-12-07 15:26:17 +01:00
1ddc8286f4
Increase versionto 11 RC1
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-07 15:25:48 +01:00
efbbf4d865
Fix popover federationScopeMenu
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-07 11:29:55 +01:00
2eca4e65b3
Fix popover margin and width
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-07 10:50:54 +01:00
4bfd4bdd2d
Merge pull request #2542 from nextcloud/followup-2516-undefined-provider
...
Make sure $provider is defined when we use it
2016-12-07 10:34:19 +01:00
815d349afe
Make sure $provider is defined when we use it
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-07 07:11:32 +01:00
ea801d7d7c
[tx-robot] updated from transifex
2016-12-07 01:07:46 +00:00
c776aa9282
Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on-folder
...
fix change permission on mail shares of folders
2016-12-06 22:53:46 +01:00
7e2b866fd7
fix type in jsdoc
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-06 18:08:13 +01:00
73c4112770
Fix #2473
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-06 18:07:55 +01:00
0b0f27358f
Merge pull request #2532 from nextcloud/token-dropdown
...
Fix apppassword dropdown issues
2016-12-06 17:10:00 +01:00
ab993ad486
hide token configure menu when clicking outside it
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-06 15:43:37 +01:00
c2062a93a3
set different permissions if file or folder
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-06 15:41:10 +01:00
d9ae68eca6
fix rename input positioning in ff
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-06 15:32:46 +01:00
02f26751ce
set full edit permissions
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-06 15:22:33 +01:00
4f6993a15e
hide all other token dropdowns when showing one
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-06 14:11:54 +01:00
af6ee647da
center arrow for token dropdown
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-06 14:11:37 +01:00
9c249427d1
fix change permission on mail shares of folders
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-06 13:44:27 +01:00
b1901534be
Merge pull request #2524 from nextcloud/fix-db-selection
...
Fix db selection design and fix #2511
2016-12-06 12:02:11 +01:00
Nextcloud bot
Roeland Jago Douma
John Molakvoæ
Christoph Wurst
Lukas Reschke
Joas Schilling
Morris Jobke
Björn Schießle
Julius Haertl
blizzz
Robin Appelman
Felix A. Epp
Lari Tikkanen
John Molakvoæ (skjnldsv)