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

6612 commits

Author SHA1 Message Date
Joas Schilling
7293a4e5ec
Allow to reuse the same name when installing a new instance 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-12 17:28:57 +01: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
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
Joas Schilling
0d6134f512
Revert "Quote database and role in queries" 
This reverts commit 9ebd5d5bb2.
 2016-12-09 15:36:14 +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
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
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
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
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
Roeland Jago Douma
db6359d1e4 Merge pull request #2513 from nextcloud/fix-htaccess-checks 
Properly check the data dir
 2016-12-06 08:57:36 +01:00
Morris Jobke
7aa510b2f0
Document updater channel & check for correct PHP version in updater 
* see https://github.com/nextcloud/updater/issues/53

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-06 00:19:13 +01:00
Morris Jobke
a2867c0664
Properly check the data dir 
* fixes #1364

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-05 23:35:35 +01:00
Morris Jobke
572b078de7 Merge pull request #2520 from nextcloud/replace-string 
Check for nextcloud version as well
 2016-12-05 23:26:32 +01:00
Morris Jobke
a89b033869 Merge pull request #497 from nextcloud/postgres-setup-no-admin 
handle postgres setup when we cant connect as admin
 2016-12-05 23:25:41 +01:00
Morris Jobke
aac3024878 Merge pull request #2505 from nextcloud/sudo-mode-provisioning-api 
Require sudo mode on the provisioning API
 2016-12-05 22:29:29 +01:00
Lukas Reschke
60d1e8e63e
Check for nextcloud version as well 
The code checker didn't consider the "nextcloud" version before, resulting in fails such as https://travis-ci.org/nextcloud/richdocuments/jobs/181470760#L415-L416

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-05 22:18:24 +01:00
Roeland Jago Douma
e368a745aa
Set last-login-check on basic auth 
Else the last-login-check fails hard because the session value is not
set and thus defaults to 0.

* Started with tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-05 20:57:15 +01:00
Roeland Jago Douma
97d18b155b
Handle unavailable share providers more graceful 
If the sharebymail app (or the federatedshareprovider app) are disabled
this kills a lot of stuff. So we should handle a share provider not
begin available a bit more graceful.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-05 19:40:37 +01:00
Robin Appelman
5365c1a32f
handle postgres setup when we cant connect as admin 2016-12-05 16:00:05 +01:00
Morris Jobke
1253d1008a Merge pull request #2411 from nextcloud/fix-encryption-home-storage 
check if the file should really be encrypted before we update the file cache
 2016-12-05 15:38:12 +01:00
Lukas Reschke
1131338562 Merge pull request #2486 from nextcloud/shared-storage-mask 
apply permissions mask for shared storage
 2016-12-02 23:39:48 +01:00
Robin Appelman
02ee4f958c
apply permissions mask for shared storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 17:59:02 +01:00
Robin Appelman
efbe26f9c3
only update the cache if the storage operation succeeds 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 16:20:49 +01:00
Lukas Reschke
b7f866988e
Prevent endless loop in \OC\Files\View::createParentDirectories 
\OC\Files\View::createParentDirectories was previously prone to an endless loop. If a path such as /foo/existingfile.txt/bar/foo was passed and existingfile.txt existed in foo the loop was never left and running until the PHP process timed out.

This commit changes the logic to a foreach loop over an array and additionally additional error handling using is_file.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-01 16:57:12 +01:00
Lukas Reschke
a87638c6ab Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares 
Add share indicator for mail shares
 2016-12-01 12:17:56 +01:00
Lukas Reschke
a439b452eb Merge pull request #2415 from nextcloud/fix_encrypted_trash_previews 
Ignore AppData in encryption wrapper
 2016-11-30 14:32:04 +01:00
Roeland Jago Douma
542f1a7e0b Merge pull request #2405 from nextcloud/add-avatar-job-once 
Execute MoveAvatars repair step only once
 2016-11-30 11:36:01 +01:00
Morris Jobke
62ec31eb7b Merge pull request #2152 from nextcloud/preview_cleanupjob 
Adds background job to cleanup all previews.
 2016-11-30 10:39:21 +01:00
Joas Schilling
73007c401e
Also return the ShareByMail provider when getting all 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-30 09:21:58 +01:00
Roeland Jago Douma
2fd1cf2e92
Ignore AppData in encryption wrapper 
Fixes part of #2407

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-29 22:01:04 +01:00
Bjoern Schiessle
0f8fe77b3a
check if the file should really be encrypted before we update the file cache 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-29 20:34:45 +01:00
Morris Jobke
d86b29b42b Merge pull request #2066 from nextcloud/fix-redirect-double-encoding 
do not double encode the redirect url
 2016-11-29 17:21:43 +01:00
Morris Jobke
69db58250a
Execute MoveAvatars repair step only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-29 16:55:13 +01:00
Morris Jobke
734dd3a2e6
Use correct channel information 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-29 11:29:43 +01:00
Morris Jobke
a12d2e67e7 Merge pull request #2335 from nextcloud/grouping-for-activities 
Bring back grouping for activities
 2016-11-28 16:18:02 +01:00
Joas Schilling
6cd02a7f43 Merge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-downloads 
Keep the filemtime for files when downloading them in a zip/tar
 2016-11-28 14:56:18 +01:00
Joas Schilling
6b8c45d05a
Add doc block for $time 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-28 14:26:30 +01:00
Lukas Reschke
3950ce9223 Merge pull request #2351 from nextcloud/remember-session-default 
do not remember session tokens by default
 2016-11-28 14:05:04 +01:00
Lukas Reschke
0cc771ce19 Merge pull request #2353 from nextcloud/renew-session-token-remember 
copy remember-me value when renewing a session token
 2016-11-28 14:04:13 +01:00
Joas Schilling
d2ff6c569e
Keep the filemtime for files when downloading them in a zip/tar 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-28 11:36:10 +01:00
Arthur Schiwon
9f3031f58a
add missing phpdoc to HintException 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-11-28 11:34:23 +01:00
Morris Jobke
1887fd32f1 Merge pull request #2361 from nextcloud/2fa-backup-codes-undefined-index 
fix undefined index error when the backup codes provider is not active
 2016-11-28 10:23:30 +01:00
Christoph Wurst
ad610ae772 Merge pull request #2327 from nextcloud/exclude-pre-releases 
Exclude pre-release versions as per SemVer
 2016-11-28 09:55:24 +01:00
Christoph Wurst
2f36920ddf fix undefined index error when the backup codes provider is not active 
In users have not created backup codes yet the app is not enabled for that user
and therefore we got an undefined index error because the code assumed it was
always there. It now properly returns null.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-28 08:48:57 +01:00
Christoph Wurst
2183a1f3e6 copy remember-me value when renewing a session token 
On renew, a session token is duplicated. For some reason we did
not copy over the remember-me attribute value. Hence, the new token
was deleted too early in the background job and remember-me did
not work properly.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-27 14:19:57 +01:00
Christoph Wurst
9b808c4014 do not remember session tokens by default 
We have to respect the value of the remember-me checkbox. Due to an error
in the source code the default value for the session token was to remember
it.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-27 14:03:28 +01:00
John Molakvoæ (skjnldsv)
9528045178
Add jquery ui fixes js file 
+ fix autocomplete width (fix #2324)

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-25 16:44:51 +01:00
Joas Schilling
da9468522b
Add an event merger and use it for the files activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-25 15:36:11 +01:00