]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoadd missing backticks all over the place
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 07:53:29 +0000 (09:53 +0200)]
add missing backticks all over the place

Conflicts:
apps/files_encryption/lib/util.php
lib/files/cache/backgroundwatcher.php
lib/files/cache/cache.php

11 years agoshorten table identifiers in tests
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 09:44:04 +0000 (11:44 +0200)]
shorten table identifiers in tests

11 years agodb structure, allow null in columns for '' values
Jörn Friedrich Dreyer [Mon, 3 Jun 2013 16:28:48 +0000 (18:28 +0200)]
db structure, allow null in columns for '' values

11 years agoSquashed commit of the following:
Thomas Mueller [Fri, 14 Jun 2013 09:18:30 +0000 (11:18 +0200)]
Squashed commit of the following:

commit 1c7d5da4d1687183f8701336fc14636f61095f4e
Author: infoneo <infoneo@yahoo.pl>
Date:   Sat Jun 8 19:44:58 2013 +0300

    Update mapper.php

commit 37f1f034f776b084ac7e25be136ce64b5772a446
Author: infoneo <infoneo@yahoo.pl>
Date:   Sat Jun 8 18:39:25 2013 +0300

    Update mapper.php

    Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).

commit 4a5f872f1f55941d07992d7ac5e8f8b74ec8febc
Author: infoneo <infoneo@yahoo.pl>
Date:   Sun May 12 15:22:57 2013 +0300

    Fixed problems with a dots in a filenames

commit bc17f958349e36c1caacfc9263ae1de2df8e6a76
Author: infoneo <infoneo@yahoo.pl>
Date:   Sun May 12 01:47:48 2013 +0200

    Dots in a filenames fix

11 years agofix for path_hash not unique as reported at #3641
Florin Peter [Thu, 13 Jun 2013 18:52:34 +0000 (20:52 +0200)]
fix for path_hash not unique as reported at #3641

11 years agofix memory problems as reported at #3620
Florin Peter [Thu, 13 Jun 2013 18:51:22 +0000 (20:51 +0200)]
fix memory problems as reported at #3620

11 years agoimproved footer
Björn Schießle [Thu, 13 Jun 2013 14:10:33 +0000 (16:10 +0200)]
improved footer

11 years agoadd logo-claim
Björn Schießle [Wed, 12 Jun 2013 15:20:09 +0000 (17:20 +0200)]
add logo-claim

11 years agodon't show translation hints in enterprise edition
Björn Schießle [Wed, 12 Jun 2013 15:07:43 +0000 (17:07 +0200)]
don't show translation hints in enterprise edition

Conflicts:

settings/templates/personal.php

11 years agomove common settings footer fieldset out of conditional
Jan-Christoph Borchardt [Wed, 12 Jun 2013 14:59:23 +0000 (16:59 +0200)]
move common settings footer fieldset out of conditional

11 years agoshort explanation about OC_Defaults
Björn Schießle [Wed, 12 Jun 2013 14:33:09 +0000 (16:33 +0200)]
short explanation about OC_Defaults

11 years agomake pub link share footer aware of different owncloud editions
Björn Schießle [Wed, 12 Jun 2013 14:28:47 +0000 (16:28 +0200)]
make pub link share footer aware of different owncloud editions

11 years agomake main menu aware of the different owncloud editions
Björn Schießle [Wed, 12 Jun 2013 14:20:23 +0000 (16:20 +0200)]
make main menu aware of the different owncloud editions

11 years agoadd default doc url
Björn Schießle [Wed, 12 Jun 2013 14:19:28 +0000 (16:19 +0200)]
add default doc url

11 years agomake footer and urls aware of ownCloud editions
Björn Schießle [Wed, 12 Jun 2013 13:44:11 +0000 (15:44 +0200)]
make footer and urls aware of ownCloud editions

11 years agokeep all strings in one place to make it easier to change them
Björn Schießle [Wed, 12 Jun 2013 13:15:08 +0000 (15:15 +0200)]
keep all strings in one place to make it easier to change them

11 years agomake footer aware of ownCloud editions
Björn Schießle [Wed, 12 Jun 2013 12:49:30 +0000 (14:49 +0200)]
make footer aware of ownCloud editions

11 years agomage page title aware of ownCloud edition
Björn Schießle [Wed, 12 Jun 2013 12:33:24 +0000 (14:33 +0200)]
mage page title aware of ownCloud edition

Conflicts:

core/templates/layout.user.php

11 years agoonly check for recovery key if someone else than the user wants to change the password
Björn Schießle [Fri, 7 Jun 2013 18:17:48 +0000 (20:17 +0200)]
only check for recovery key if someone else than the user wants to change the password

Conflicts:

settings/ajax/changepassword.php

11 years agoadd a hint that the admin can recover your files; Don't let the user change the recov...
Björn Schießle [Wed, 5 Jun 2013 16:53:02 +0000 (18:53 +0200)]
add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set

11 years agoprint a warning if a user wants to reset his password and encryption is enabled
Björn Schießle [Wed, 5 Jun 2013 16:38:39 +0000 (18:38 +0200)]
print a warning if a user wants to reset his password and encryption is enabled

Conflicts:

core/lostpassword/templates/lostpassword.php

11 years agoallow to press enter to update the password
Björn Schießle [Wed, 5 Jun 2013 12:51:51 +0000 (14:51 +0200)]
allow to press enter to update the password

11 years agotell the user what he can do to regain access to his files
Björn Schießle [Wed, 5 Jun 2013 12:19:26 +0000 (14:19 +0200)]
tell the user what he can do to regain access to his files

11 years agoonly show personal settings if the recovery feature is enabled or if no private key...
Björn Schießle [Wed, 5 Jun 2013 11:51:28 +0000 (13:51 +0200)]
only show personal settings if the recovery feature is enabled or if no private key is set

11 years agoimproved error msg and removed duplicate string
Florin Peter [Tue, 4 Jun 2013 20:31:36 +0000 (22:31 +0200)]
improved error msg and removed duplicate string

11 years agoimproved label for the password recovery feature
Björn Schießle [Tue, 4 Jun 2013 19:19:42 +0000 (21:19 +0200)]
improved label for the password recovery feature

11 years agolink directly to the encryption settings
Björn Schießle [Tue, 4 Jun 2013 08:49:58 +0000 (10:49 +0200)]
link directly to the encryption settings

11 years agobetter handling for http post
Florin Peter [Mon, 3 Jun 2013 22:41:47 +0000 (00:41 +0200)]
better handling for http post

11 years agochanged redirect handling
Florin Peter [Mon, 3 Jun 2013 21:41:57 +0000 (23:41 +0200)]
changed redirect handling

11 years agofixed typo
Florin Peter [Mon, 3 Jun 2013 17:10:55 +0000 (19:10 +0200)]
fixed typo

11 years agofix password change when files_encryption app is disabled
Florin Peter [Mon, 3 Jun 2013 17:06:20 +0000 (19:06 +0200)]
fix password change when files_encryption app is disabled

Conflicts:

settings/ajax/changepassword.php

11 years agoreformat code
Florin Peter [Mon, 3 Jun 2013 16:42:13 +0000 (18:42 +0200)]
reformat code

Conflicts:

apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php

11 years agouse generated private key fro m setUp()
Björn Schießle [Mon, 3 Jun 2013 15:43:06 +0000 (17:43 +0200)]
use generated private key fro m setUp()

11 years agoadded test for decryptPrivateKey()
Björn Schießle [Mon, 3 Jun 2013 15:34:43 +0000 (17:34 +0200)]
added test for decryptPrivateKey()

11 years agolet user update private key password in case it was changed from outside, e.g. extern...
Björn Schießle [Mon, 3 Jun 2013 13:27:31 +0000 (15:27 +0200)]
let user update private key password in case it was changed from outside, e.g. external auth back-ends

11 years ago$session->setPrivateKey expects only one parameter
Björn Schießle [Mon, 3 Jun 2013 13:26:58 +0000 (15:26 +0200)]
$session->setPrivateKey expects only one parameter

11 years agocontrol files are no longer needed, remove them from the tests
Björn Schießle [Mon, 3 Jun 2013 12:21:30 +0000 (14:21 +0200)]
control files are no longer needed, remove them from the tests

11 years agointroduce decryptPrivateKey() method which also checks if the result is a valid priva...
Björn Schießle [Mon, 3 Jun 2013 12:19:31 +0000 (14:19 +0200)]
introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places

Conflicts:

apps/files_encryption/lib/session.php

11 years agocode optimized and cleaned up unused vars
Florin Peter [Fri, 31 May 2013 14:52:33 +0000 (16:52 +0200)]
code optimized and cleaned up unused vars

11 years agoallow the user to login but do not allow upload and show error message on the web
Florin Peter [Fri, 31 May 2013 13:57:18 +0000 (15:57 +0200)]
allow the user to login but do not allow upload and show error message on the web

Conflicts:

apps/files_encryption/appinfo/app.php

11 years agocheck if the decrypted private key is valid on login and on read/write files
Florin Peter [Fri, 31 May 2013 11:58:58 +0000 (13:58 +0200)]
check if the decrypted private key is valid on login and on read/write files

11 years agocleanup unused method legacyKeyRecryptKeyfile
Florin Peter [Fri, 31 May 2013 20:49:32 +0000 (22:49 +0200)]
cleanup unused method legacyKeyRecryptKeyfile

11 years agonormalize path to prevent following split to fail
Florin Peter [Thu, 30 May 2013 23:57:32 +0000 (01:57 +0200)]
normalize path to prevent following split to fail

11 years agofix legacy key in until test
Florin Peter [Thu, 30 May 2013 23:55:48 +0000 (01:55 +0200)]
fix legacy key in until test

11 years agofix re-encrypt legacy files
Florin Peter [Thu, 30 May 2013 23:36:49 +0000 (01:36 +0200)]
fix re-encrypt legacy files

Conflicts:

apps/files_encryption/lib/util.php

11 years agouse legacyDecrypt to decrypt key file like the previous files_encryption
Florin Peter [Thu, 30 May 2013 23:35:48 +0000 (01:35 +0200)]
use legacyDecrypt to decrypt key file like the previous files_encryption

11 years agofix for autoloader while user logged in and system is in maintenance
Florin Peter [Thu, 30 May 2013 20:41:30 +0000 (22:41 +0200)]
fix for autoloader while user logged in and system is in maintenance

Conflicts:

apps/files_encryption/appinfo/app.php

11 years agoadd comment to explain the helper function
Björn Schießle [Thu, 13 Jun 2013 08:35:30 +0000 (10:35 +0200)]
add comment to explain the helper function

11 years agofix typo in var name
Björn Schießle [Thu, 13 Jun 2013 08:11:23 +0000 (10:11 +0200)]
fix typo in var name

11 years agouse number of manipulated rows as idicator if it was possible to enter the migration...
Björn Schießle [Wed, 12 Jun 2013 10:21:11 +0000 (12:21 +0200)]
use number of manipulated rows as idicator if it was possible to enter the migration mode

Conflicts:

apps/files_encryption/lib/util.php

11 years agoadapt test to the code changes
Björn Schießle [Wed, 12 Jun 2013 12:00:53 +0000 (14:00 +0200)]
adapt test to the code changes

11 years agouse constants for different migration status
Björn Schießle [Tue, 11 Jun 2013 11:07:39 +0000 (13:07 +0200)]
use constants for different migration status

11 years agomake sure that only one process can enter the migration mode
Björn Schießle [Tue, 11 Jun 2013 10:03:50 +0000 (12:03 +0200)]
make sure that only one process can enter the migration mode

11 years agomove storage bar below clients showcase to make it more visible
Jan-Christoph Borchardt [Tue, 11 Jun 2013 14:05:02 +0000 (16:05 +0200)]
move storage bar below clients showcase to make it more visible

11 years agoMerge branch 'stable5' of github.com:owncloud/core into stable5
Björn Schießle [Wed, 12 Jun 2013 12:11:17 +0000 (14:11 +0200)]
Merge branch 'stable5' of github.com:owncloud/core into stable5

11 years agodisable proxys during ssl root cert upload to avoid encryption
Björn Schießle [Wed, 12 Jun 2013 08:37:09 +0000 (10:37 +0200)]
disable proxys during ssl root cert upload to avoid encryption

11 years agoMerge pull request #3470 from owncloud/fix_ssl_root_certs
Thomas Müller [Tue, 11 Jun 2013 21:15:05 +0000 (14:15 -0700)]
Merge pull request #3470 from owncloud/fix_ssl_root_certs

fix deletion of ssl root certificates

11 years agoIE doesn't like class as keyword, add quotation marks
Björn Schießle [Tue, 11 Jun 2013 21:07:33 +0000 (23:07 +0200)]
IE doesn't like class as keyword, add quotation marks

11 years agouse pre_setPassword hook to update the encryption keys if the back-end doesn't suppor...
Björn Schießle [Thu, 6 Jun 2013 11:32:02 +0000 (13:32 +0200)]
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened

11 years agoadd hint about what the recovery password field is for
Björn Schießle [Thu, 6 Jun 2013 10:26:05 +0000 (12:26 +0200)]
add hint about what the recovery password field is for

11 years agoBackport #2919
Michael Gapczynski [Fri, 7 Jun 2013 13:42:52 +0000 (09:42 -0400)]
Backport #2919

11 years agoremove html entities since this seems to be a problem only on my system
Björn Schießle [Thu, 6 Jun 2013 12:19:09 +0000 (14:19 +0200)]
remove html entities since this seems to be a problem only on my system

11 years ago5.0.7 v5.0.7
Frank Karlitschek [Thu, 6 Jun 2013 08:13:32 +0000 (10:13 +0200)]
5.0.7

11 years agoMerge pull request #3584 from owncloud/fix_ldap_port
blizzz [Tue, 4 Jun 2013 08:31:52 +0000 (01:31 -0700)]
Merge pull request #3584 from owncloud/fix_ldap_port

LDAP: append port when URL is passed in LDAP Host configuration, fixes #...

11 years agoLDAP: append port when URL is passed in LDAP Host configuration, fixes #2600
Arthur Schiwon [Mon, 3 Jun 2013 21:07:32 +0000 (23:07 +0200)]
LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600

11 years ago5.0.7 RC
Frank Karlitschek [Sun, 2 Jun 2013 21:02:52 +0000 (23:02 +0200)]
5.0.7 RC

11 years agoLDAP: sqlite compatibility for emptyiing tables
Arthur Schiwon [Fri, 31 May 2013 18:07:13 +0000 (20:07 +0200)]
LDAP: sqlite compatibility for emptyiing tables

11 years agoLDAP: fix possible recursion
Arthur Schiwon [Sat, 25 May 2013 09:03:58 +0000 (11:03 +0200)]
LDAP: fix possible recursion

11 years agoBackport bfa7157
Arthur Schiwon [Sat, 25 May 2013 09:02:51 +0000 (11:02 +0200)]
Backport bfa7157

11 years agoalso fix login errors while filesystem is not loaded in app.php
Florin Peter [Fri, 31 May 2013 10:56:08 +0000 (12:56 +0200)]
also fix login errors while filesystem is not loaded in app.php

11 years agofix login errors while filesystem is not loaded
Florin Peter [Fri, 31 May 2013 09:55:40 +0000 (11:55 +0200)]
fix login errors while filesystem is not loaded

11 years agoadded our own file extension .part will not work here if we use file_get_contents...
Florin Peter [Thu, 30 May 2013 20:07:36 +0000 (22:07 +0200)]
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'

11 years agoprevent files_versions from calling file proxy which calls files_encryption and do...
Florin Peter [Thu, 30 May 2013 20:05:52 +0000 (22:05 +0200)]
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations

11 years agofix share and un-share for single file
Florin Peter [Wed, 29 May 2013 23:38:11 +0000 (01:38 +0200)]
fix share and un-share for single file

11 years agofixed problems with file_get_contents and file_put_contents this problem was related...
Florin Peter [Wed, 29 May 2013 23:13:22 +0000 (01:13 +0200)]
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files

11 years agofixes for pgsql
Florin Peter [Wed, 29 May 2013 18:41:07 +0000 (20:41 +0200)]
fixes for pgsql

11 years agochanged deprecated class
Florin Peter [Wed, 29 May 2013 18:15:04 +0000 (20:15 +0200)]
changed deprecated class

11 years agofixed typo
Florin Peter [Wed, 29 May 2013 18:11:53 +0000 (20:11 +0200)]
fixed typo

11 years agofixes if cache returns false
Florin Peter [Wed, 29 May 2013 18:11:13 +0000 (20:11 +0200)]
fixes if cache returns false

11 years agofix $parent/$source typo
Florin Peter [Wed, 29 May 2013 17:58:05 +0000 (19:58 +0200)]
fix $parent/$source typo

11 years agobackport of #3527
Florin Peter [Wed, 29 May 2013 17:11:39 +0000 (19:11 +0200)]
backport of #3527

11 years agofix indention
Björn Schießle [Wed, 29 May 2013 13:37:27 +0000 (15:37 +0200)]
fix indention

11 years agoremove unnecessary variable
Björn Schießle [Wed, 29 May 2013 13:14:15 +0000 (15:14 +0200)]
remove unnecessary variable

11 years agouse public API for error handling; improved while condition
Björn Schießle [Wed, 29 May 2013 12:40:47 +0000 (14:40 +0200)]
use public API for error handling; improved while condition

11 years agofor external storages we never reach the path 'files', instead we need to leave the...
Björn Schießle [Wed, 29 May 2013 12:19:18 +0000 (14:19 +0200)]
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists

11 years agoif one public link share was found, we don't have to check it for the other folders
Björn Schießle [Wed, 29 May 2013 11:12:30 +0000 (13:12 +0200)]
if one public link share was found, we don't have to check it for the other folders

11 years agocheck list of users with access to the file from the bottom to the top. This way...
Björn Schießle [Wed, 29 May 2013 11:10:26 +0000 (13:10 +0200)]
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages

11 years agofixed if fopen returns false typically on external storage
Florin Peter [Tue, 28 May 2013 18:50:14 +0000 (20:50 +0200)]
fixed if fopen returns false typically on external storage

11 years agoMerge pull request #3543 from owncloud/fix_ldap_alternateintname
blizzz [Thu, 30 May 2013 14:54:48 +0000 (07:54 -0700)]
Merge pull request #3543 from owncloud/fix_ldap_alternateintname

Fix ldap alternateintname

11 years agoMerge branch 'stable5' into fix_ldap_alternateintname
Arthur Schiwon [Thu, 30 May 2013 12:15:38 +0000 (14:15 +0200)]
Merge branch 'stable5' into fix_ldap_alternateintname

11 years agoLDAP: fix generation of alternate internal name on conflicts. Use also smaller number...
Arthur Schiwon [Thu, 30 May 2013 12:14:43 +0000 (14:14 +0200)]
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links

11 years agoMerge pull request #3526 from owncloud/fix_ldap_doc_url
Morris Jobke [Thu, 30 May 2013 11:16:10 +0000 (04:16 -0700)]
Merge pull request #3526 from owncloud/fix_ldap_doc_url

LDAP: fix help (doc) URL. Old one works, but leads to an outdated versio...

11 years agobackport #3507
Florin Peter [Wed, 29 May 2013 22:40:30 +0000 (00:40 +0200)]
backport #3507

11 years agoOrganize conditionals in a better order
Michael Gapczynski [Wed, 29 May 2013 14:40:05 +0000 (10:40 -0400)]
Organize conditionals in a better order

11 years agoOnly update metadata that has changed
Michael Gapczynski [Wed, 29 May 2013 14:19:03 +0000 (10:19 -0400)]
Only update metadata that has changed

11 years agoStyle fixes
Michael Gapczynski [Wed, 29 May 2013 14:56:28 +0000 (10:56 -0400)]
Style fixes

11 years agoCache mimetype icons
Robin Appelman [Wed, 29 May 2013 13:43:41 +0000 (15:43 +0200)]
Cache mimetype icons

11 years agoLDAP: fix help (doc) URL. Old one works, but leads to an outdated version
Arthur Schiwon [Wed, 29 May 2013 12:07:47 +0000 (14:07 +0200)]
LDAP: fix help (doc) URL. Old one works, but leads to an outdated version

11 years agoThe "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD
zafi [Sat, 25 May 2013 07:03:07 +0000 (09:03 +0200)]
The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD

so it should only be visible for users with a supporting backend.

11 years agofix for undefined index
Florin Peter [Tue, 28 May 2013 07:36:14 +0000 (09:36 +0200)]
fix for undefined index