wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
36563 commits 157 branches 562 tags 714 MiB
Commit graph

36563 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ
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
Christoph Wurst
fbc494234b Fix dev manual link for NC11 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-09 19:32:16 +01:00
Lukas Reschke
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
Joas Schilling
a5a35cda7c
Lower the role name before using it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-09 16:41:01 +01:00
Morris Jobke
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
Björn Schießle
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
Joas Schilling
0d6134f512
Revert "Quote database and role in queries" 
This reverts commit 9ebd5d5bb2.
 2016-12-09 15:36:14 +01:00
Joas Schilling
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
Lukas Reschke
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
Julius Haertl
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
Morris Jobke
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
Julius Haertl
086a5eb9d0
Check if the theming app is loaded 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-12-09 12:52:17 +01:00
Julius Haertl
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
blizzz
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
Joas Schilling
474720ff1c
Overwrite the schedule target calendar with the personal one and create it 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>
 2016-12-09 09:34:25 +01:00
Nextcloud bot
88d90066ba
[tx-robot] updated from transifex 2016-12-09 01:07:18 +00:00
Morris Jobke
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
Joas Schilling
10daad9346
Allow non-subadmins to change their language 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-08 16:24:21 +01:00
Joas Schilling
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
Roeland Jago Douma
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
Joas Schilling
3472f70ffe Merge pull request #2515 from nextcloud/tag-rename-styling 
fix styling of renaming system tags
 2016-12-08 14:05:06 +01:00
Roeland Jago Douma
158cc9c261 Merge pull request #2545 from nextcloud/fix-popover-width 
Fix popover width
 2016-12-08 13:49:56 +01:00
Robin Appelman
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
Roeland Jago Douma
ce707912b4 Merge pull request #2534 from nextcloud/fix-avatar-upload-buttons 
Fix avatar delete button
 2016-12-08 13:44:26 +01:00
Felix A. Epp
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
Bjoern Schiessle
16bbd3fd7c
fix password reset if encryption is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-08 12:08:05 +01:00
Joas Schilling
924358ef96
Save the timezone on login again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-08 10:45:24 +01:00
Arthur Schiwon
f29f4d9c3a
fix rendering for mail shares 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
3ac8d422de
disable checkboxes during save op to avoid race conditions 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
056e59af7e
fix some coding style and stricter comparisons, makes scrutinizer happier 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
39c2d9e663
also handle can-edit change 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon
2514176e41
flicker-free permission change in share dialog 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Nextcloud bot
74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
Lari Tikkanen
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
Robin Appelman
b5401adc00
Fix order of parameters when getting notified of smb renames 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-07 16:25:10 +01:00
Lukas Reschke
737d9f3504 Increase version string to 11,0,0,6 2016-12-07 15:29:45 +01:00
Lukas Reschke
635ef962f0 Merge pull request #2549 from nextcloud/increase-version-to-rc 
Increase versionto 11 RC1
 2016-12-07 15:26:17 +01:00
Lukas Reschke
1ddc8286f4
Increase versionto 11 RC1 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-07 15:25:48 +01:00
John Molakvoæ (skjnldsv)
efbbf4d865
Fix popover federationScopeMenu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-07 11:29:55 +01:00
John Molakvoæ (skjnldsv)
2eca4e65b3
Fix popover margin and width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-07 10:50:54 +01:00
Lukas Reschke
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
Joas Schilling
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
Nextcloud bot
ea801d7d7c
[tx-robot] updated from transifex 2016-12-07 01:07:46 +00:00
blizzz
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
Arthur Schiwon
7e2b866fd7
fix type in jsdoc 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 18:08:13 +01:00
John Molakvoæ (skjnldsv)
73c4112770
Fix #2473 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-06 18:07:55 +01:00
Björn Schießle
0b0f27358f Merge pull request #2532 from nextcloud/token-dropdown 
Fix apppassword dropdown issues
 2016-12-06 17:10:00 +01:00
Robin Appelman
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
Arthur Schiwon
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
Robin Appelman
d9ae68eca6
fix rename input positioning in ff 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-06 15:32:46 +01:00