]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Sat, 29 Jun 2013 11:24:05 +0000 (13:24 +0200)]
Escape dropdown
Fixes #3241
Thomas Mueller [Wed, 26 Jun 2013 09:23:21 +0000 (11:23 +0200)]
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
Markus Goetz [Tue, 23 Apr 2013 09:06:28 +0000 (11:06 +0200)]
Fix ugly error style on install
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
blizzz [Sat, 22 Jun 2013 07:11:03 +0000 (00:11 -0700)]
Merge pull request #3816 from owncloud/fix_3815
LDAP: better check for emptiness, fixes #3815
blizzz [Fri, 21 Jun 2013 22:13:34 +0000 (15:13 -0700)]
Merge pull request #3814 from owncloud/fix-german-du-and-deine-stable5
In German we want uppercase 'Du' and 'Deine*'
Arthur Schiwon [Fri, 21 Jun 2013 21:58:44 +0000 (23:58 +0200)]
LDAP: even better check for emptiness, fixes #3815
Arthur Schiwon [Fri, 21 Jun 2013 21:58:27 +0000 (23:58 +0200)]
Revert "LDAP: better check for emptiness, fixes #3815"
This reverts commit
4797f9d7db8b48c977e34303a9c80eaea704af19 .
Arthur Schiwon [Fri, 21 Jun 2013 21:19:53 +0000 (23:19 +0200)]
LDAP: better check for emptiness, fixes #3815
Thomas Mueller [Fri, 21 Jun 2013 20:55:26 +0000 (22:55 +0200)]
In German we want uppercase 'Du' and 'Deine*'
Victor Dubiniuk [Mon, 17 Jun 2013 21:17:08 +0000 (00:17 +0300)]
Replace display name only
Georg Ehrke [Fri, 21 Jun 2013 12:39:04 +0000 (14:39 +0200)]
improve error handling of webdavauth
Björn Schießle [Fri, 21 Jun 2013 11:07:52 +0000 (13:07 +0200)]
encryption is LDAP compatible
Björn Schießle [Fri, 21 Jun 2013 08:37:51 +0000 (10:37 +0200)]
check openssl dependency for the encryption app
commit
1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:27:46 2013 +0200
add l10n support
commit
bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:19:10 2013 +0200
only init session if openssl extension is loaded
commit
cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:25:40 2013 +0200
first disable app and than show error page
commit
55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:17:34 2013 +0200
typo fixed
commit
1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:15:40 2013 +0200
move dependency check to the encryption app
commit
c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 11:13:11 2013 +0200
make sure that openssl is installed and loaded
Conflicts:
apps/files_encryption/appinfo/app.php
Thomas Mueller [Thu, 20 Jun 2013 08:47:37 +0000 (10:47 +0200)]
adding unit test for folder remove: testRemovedFolder()
Robin Appelman [Wed, 19 Jun 2013 22:42:34 +0000 (00:42 +0200)]
remove deleted files when re-scanning a folder
Robin Appelman [Wed, 19 Jun 2013 13:02:18 +0000 (15:02 +0200)]
use json to encode user list
Robin Appelman [Tue, 18 Jun 2013 23:26:08 +0000 (01:26 +0200)]
allow scanning files for multiple users
Björn Schießle [Wed, 19 Jun 2013 14:55:31 +0000 (16:55 +0200)]
always have a defined return value
Björn Schießle [Wed, 19 Jun 2013 13:58:34 +0000 (15:58 +0200)]
some more error messages
Björn Schießle [Wed, 19 Jun 2013 13:52:33 +0000 (15:52 +0200)]
add some more error messages, in case something went wrong
Björn Schießle [Wed, 19 Jun 2013 10:05:45 +0000 (12:05 +0200)]
fixed enghlish sentence, thanks to @MTGap
Robin Appelman [Tue, 18 Jun 2013 22:26:47 +0000 (00:26 +0200)]
fix updaters test cases
Robin Appelman [Mon, 17 Jun 2013 16:03:57 +0000 (18:03 +0200)]
add tests for reusing existing data in scanner
Robin Appelman [Fri, 14 Jun 2013 15:04:17 +0000 (17:04 +0200)]
reuse etag when doing a forced rescan
Robin Appelman [Fri, 14 Jun 2013 14:53:08 +0000 (16:53 +0200)]
scanner: give more percision about what data is reused during scanning
Robin Appelman [Fri, 14 Jun 2013 13:30:41 +0000 (15:30 +0200)]
split of scanning the childs of a folder
Jan-Christoph Borchardt [Mon, 17 Jun 2013 18:35:08 +0000 (20:35 +0200)]
hide the logo claim in case the theme is not loaded
Björn Schießle [Wed, 19 Jun 2013 09:54:56 +0000 (02:54 -0700)]
Merge pull request #3770 from owncloud/fix_theme_loading
getTheme() should also return the default theme if a empty theme is set in the config.php
Robin Appelman [Tue, 16 Apr 2013 23:08:27 +0000 (01:08 +0200)]
Fix OC_User::getDisplaynames when using numeric user id's
fixes #2948
Frank Karlitschek [Tue, 18 Jun 2013 21:06:00 +0000 (14:06 -0700)]
Merge pull request #3771 from owncloud/fix_lost_password_page
fix lost password page
Björn Schießle [Tue, 18 Jun 2013 09:43:11 +0000 (11:43 +0200)]
fix lost password page, don't show checkbox is encryption is not enabled
Björn Schießle [Tue, 18 Jun 2013 09:18:31 +0000 (11:18 +0200)]
use default value when we try to retrieve the theme from the config
Björn Schießle [Tue, 18 Jun 2013 08:57:37 +0000 (10:57 +0200)]
also use the default theme if the theme is set to an empty string in the config.php
Björn Schießle [Mon, 17 Jun 2013 12:42:18 +0000 (14:42 +0200)]
don't normalize absolute local path
Björn Schießle [Fri, 14 Jun 2013 13:07:06 +0000 (15:07 +0200)]
only escape glob pattern
Conflicts:
apps/files_trashbin/lib/trash.php
Björn Schießle [Mon, 17 Jun 2013 10:56:43 +0000 (03:56 -0700)]
Merge pull request #3753 from owncloud/fix_translation_link
fix link to translation
Björn Schießle [Mon, 17 Jun 2013 09:48:23 +0000 (11:48 +0200)]
fix link to translation, bug was introduced by https://github.com/owncloud/core/commit/
ca7699c8bdb85df9b69e3639f53d1b959287ba16 #settings/templates/personal.php
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 14:07:49 +0000 (07:07 -0700)]
Merge pull request #3725 from owncloud/oracle_stable5
Oracle stable5
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 11:43:50 +0000 (13:43 +0200)]
don't use sequence suffix, MDB2 handles that internally
Thomas Mueller [Fri, 14 Jun 2013 11:34:01 +0000 (13:34 +0200)]
Squashed commit of the following:
commit
85043af59846edd54b6f402829a698142fdb412f
Author: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat May 25 11:25:43 2013 -0400
Clear opcode caches after writing to the config file, fixes #3372
commit
e96ca0a217112a612e5018fb06115879be634f0b
Author: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri May 17 11:15:53 2013 -0400
Add undefined verision variables
commit
d7faeea0b8a79bcd84255120e396280fe62c8aa1
Author: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue May 14 09:34:01 2013 -0400
Turn off theme before update
commit
f620df4e88201a8d35ecb6173f258d5e5f67c7f9
Author: Bart Visscher <bartv@thisnet.nl>
Date: Tue Apr 16 08:07:44 2013 +0200
Also check for needed upgrade in the Sabre Maintenance connector
commit
223cfce8c89663beb95cf7438f47cea4bac6e0de
Author: Bart Visscher <bartv@thisnet.nl>
Date: Tue Apr 9 21:05:11 2013 +0200
Connect watcher failure function to the failure signal
commit
49b9a1e8af062c03ebc863e1139ca310944b784a
Author: Bart Visscher <bartv@thisnet.nl>
Date: Tue Apr 9 20:51:43 2013 +0200
Move start of the maintenance mode to the ajax call
Make sure the update page is shown in a browser. And not an ajax request
Jörn Friedrich Dreyer [Wed, 8 May 2013 14:29:15 +0000 (16:29 +0200)]
cleanup codestyle
Jörn Friedrich Dreyer [Wed, 8 May 2013 14:18:24 +0000 (16:18 +0200)]
use to_char only for oracle, whitespace
Jörn Friedrich Dreyer [Mon, 29 Apr 2013 10:25:27 +0000 (12:25 +0200)]
oracle fixes, missing backticks, LIMIT to param
Conflicts:
lib/files/cache/cache.php
Jörn Friedrich Dreyer [Wed, 8 May 2013 13:30:04 +0000 (15:30 +0200)]
allow install when only oracle is available
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 08:04:52 +0000 (10:04 +0200)]
convert LIMIT to parameter
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 09:07:41 +0000 (11:07 +0200)]
fix fetchRow checks to also work with MDB2
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
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 09:44:04 +0000 (11:44 +0200)]
shorten table identifiers in tests
Jörn Friedrich Dreyer [Mon, 3 Jun 2013 16:28:48 +0000 (18:28 +0200)]
db structure, allow null in columns for '' values
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
Florin Peter [Thu, 13 Jun 2013 18:52:34 +0000 (20:52 +0200)]
fix for path_hash not unique as reported at #3641
Florin Peter [Thu, 13 Jun 2013 18:51:22 +0000 (20:51 +0200)]
fix memory problems as reported at #3620
Björn Schießle [Thu, 13 Jun 2013 14:10:33 +0000 (16:10 +0200)]
improved footer
Björn Schießle [Wed, 12 Jun 2013 15:20:09 +0000 (17:20 +0200)]
add logo-claim
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
Jan-Christoph Borchardt [Wed, 12 Jun 2013 14:59:23 +0000 (16:59 +0200)]
move common settings footer fieldset out of conditional
Björn Schießle [Wed, 12 Jun 2013 14:33:09 +0000 (16:33 +0200)]
short explanation about OC_Defaults
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
Björn Schießle [Wed, 12 Jun 2013 14:20:23 +0000 (16:20 +0200)]
make main menu aware of the different owncloud editions
Björn Schießle [Wed, 12 Jun 2013 14:19:28 +0000 (16:19 +0200)]
add default doc url
Björn Schießle [Wed, 12 Jun 2013 13:44:11 +0000 (15:44 +0200)]
make footer and urls aware of ownCloud editions
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
Björn Schießle [Wed, 12 Jun 2013 12:49:30 +0000 (14:49 +0200)]
make footer aware of ownCloud editions
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
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
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
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
Björn Schießle [Wed, 5 Jun 2013 12:51:51 +0000 (14:51 +0200)]
allow to press enter to update the password
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
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
Florin Peter [Tue, 4 Jun 2013 20:31:36 +0000 (22:31 +0200)]
improved error msg and removed duplicate string
Björn Schießle [Tue, 4 Jun 2013 19:19:42 +0000 (21:19 +0200)]
improved label for the password recovery feature
Björn Schießle [Tue, 4 Jun 2013 08:49:58 +0000 (10:49 +0200)]
link directly to the encryption settings
Florin Peter [Mon, 3 Jun 2013 22:41:47 +0000 (00:41 +0200)]
better handling for http post
Florin Peter [Mon, 3 Jun 2013 21:41:57 +0000 (23:41 +0200)]
changed redirect handling
Florin Peter [Mon, 3 Jun 2013 17:10:55 +0000 (19:10 +0200)]
fixed typo
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
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
Björn Schießle [Mon, 3 Jun 2013 15:43:06 +0000 (17:43 +0200)]
use generated private key fro m setUp()
Björn Schießle [Mon, 3 Jun 2013 15:34:43 +0000 (17:34 +0200)]
added test for decryptPrivateKey()
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
Björn Schießle [Mon, 3 Jun 2013 13:26:58 +0000 (15:26 +0200)]
$session->setPrivateKey expects only one parameter
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
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
Florin Peter [Fri, 31 May 2013 14:52:33 +0000 (16:52 +0200)]
code optimized and cleaned up unused vars
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
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
Florin Peter [Fri, 31 May 2013 20:49:32 +0000 (22:49 +0200)]
cleanup unused method legacyKeyRecryptKeyfile
Florin Peter [Thu, 30 May 2013 23:57:32 +0000 (01:57 +0200)]
normalize path to prevent following split to fail
Florin Peter [Thu, 30 May 2013 23:55:48 +0000 (01:55 +0200)]
fix legacy key in until test
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
Florin Peter [Thu, 30 May 2013 23:35:48 +0000 (01:35 +0200)]
use legacyDecrypt to decrypt key file like the previous files_encryption
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
Björn Schießle [Thu, 13 Jun 2013 08:35:30 +0000 (10:35 +0200)]
add comment to explain the helper function
Björn Schießle [Thu, 13 Jun 2013 08:11:23 +0000 (10:11 +0200)]
fix typo in var name
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
Björn Schießle [Wed, 12 Jun 2013 12:00:53 +0000 (14:00 +0200)]
adapt test to the code changes
Björn Schießle [Tue, 11 Jun 2013 11:07:39 +0000 (13:07 +0200)]
use constants for different migration status
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
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