Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-10 02:11:09 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
36,321 Commits 387 Branches 1,017 Tags 5.4 GiB
e49088315e
Commit Graph

36321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukas Reschke
e49088315e Merge pull request #2615 from nextcloud/daita-sharecontroller 
Download a file in a subfolder in a sharedlink is not working
 2016-12-12 18:28:06 +01:00
Maxence Lange
43374292b1 update phpdoc 
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
 2016-12-12 16:15:13 -01:00
Lukas Reschke
e79cd27e5d Merge pull request #2629 from nextcloud/increase-v-1-again 
Increase version once again
 2016-12-12 18:13:13 +01:00
Lukas Reschke
3f5bbb22d2
Increase version once again 
For https://github.com/nextcloud/server/pull/2615

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-12 18:03:49 +01:00
Lukas Reschke
ab3ef8a44a Merge pull request #2627 from nextcloud/already-increase-version 
Increase version to 11.0.0
 2016-12-12 16:40:40 +01:00
Lukas Reschke
6cd421e603 Merge pull request #2620 from nextcloud/theming-externalfiles 
Show theming icons on external storage folders
 2016-12-12 16:04:48 +01:00
Lukas Reschke
7c1ffe231e
Increase version to 11.0.0 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-12 16:03:17 +01:00
Lukas Reschke
f46e02210e Merge pull request #2622 from nextcloud/improve-wording 
improve wording of admin settings to enable search on the public address book
 2016-12-12 14:49:19 +01:00
Bjoern Schiessle
91303469e0
improve wording of admin settings to enable search on the public address book 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-12 13:55:12 +01:00
Julius Haertl
b12db1b494
Show theming icons on external storage folders 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-12-12 12:18:38 +01:00
Nextcloud bot
0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Maxence Lange
9ef8d25e46 Download a file in a subfolder in a sharedlink is not working 
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
 2016-12-11 18:32:28 -01:00
Lukas Reschke
36717f564e
11.0 RC2 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-11 16:34:27 +01:00
Nextcloud bot
ea7a69f198
[tx-robot] updated from transifex 2016-12-11 01:07:18 +00:00
Lukas Reschke
4456fa57e0 Merge pull request #2274 from nextcloud/fix-invites-on-readonly-calendars 
Do not add invites into read-only calendars
 2016-12-10 12:22:15 +01:00
Lukas Reschke
aedd1fc9a0 Merge pull request #2598 from nextcloud/fix_2403 
Check for app updates on disabled page
 2016-12-10 12:21:20 +01:00
Nextcloud bot
7cb99e74db
[tx-robot] updated from transifex 2016-12-10 01:07:15 +00:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
d59ffb8bf1
Check for app updates on disabled page 
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>
 2016-12-09 22:30:54 +01:00
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
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
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
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