Thomas Tanghus
|
cb41a30b00
|
Add Compound property to avoid double escaping values.
|
2013-05-15 18:56:54 +02:00 |
Björn Schießle
|
12ebc5a1b3
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-15 17:57:18 +02:00 |
|
Björn Schießle
|
57c0a7ed69
|
add recovery key to all files if the user enabled the feature and removes them again on disable
|
2013-05-15 17:56:45 +02:00 |
Florin Peter
|
0916769f67
|
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
|
2013-05-15 17:00:01 +02:00 |
|
Björn Schießle
|
1a31dc036a
|
added missing file to enable the admin to change the recovery key password
|
2013-05-15 16:14:54 +02:00 |
|
Björn Schießle
|
1f5ed65b12
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-15 16:13:29 +02:00 |
|
Björn Schießle
|
64d94c540a
|
enable admin to change the recovery password
|
2013-05-15 16:12:20 +02:00 |
Michael Gapczynski
|
d91161186b
|
Fix finding mount in background watcher, fixes #3353
|
2013-05-15 09:33:38 -04:00 |
|
Michael Gapczynski
|
de2ccf4723
|
Merge pull request #3366 from owncloud/contributing_add_contacts
Add Contacts repo to CONTRIBUTING.md
|
2013-05-15 06:24:21 -07:00 |
|
Florin Peter
|
63a790b415
|
fix for broken tests
|
2013-05-15 14:33:08 +02:00 |
|
Florin Peter
|
1fbdc3ce8f
|
fix for previous workaround
|
2013-05-15 14:32:50 +02:00 |
|
Björn Schießle
|
5b160edebb
|
check if the user knows the correct recovery password before changing the recovery key settings
|
2013-05-15 14:02:13 +02:00 |
|
Thomas Tanghus
|
162da3ce4e
|
Add Contacts repo to CONTRIBUTING.md
|
2013-05-15 13:53:15 +02:00 |
|
Björn Schießle
|
335f2ca321
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-15 11:42:41 +02:00 |
|
Björn Schießle
|
d8ae2fa80d
|
only let the user change the recovery admin settings if a key passwords was entered.
|
2013-05-15 11:42:22 +02:00 |
|
Florin Peter
|
137039d35a
|
workaround for blank page need an other solution
|
2013-05-15 10:52:23 +02:00 |
|
Florin Peter
|
3d7534da74
|
improved files_encryption tests
|
2013-05-15 10:21:56 +02:00 |
|
Florin Peter
|
9b7f02f267
|
removed FileProxy from test
|
2013-05-15 10:20:52 +02:00 |
|
Florin Peter
|
751487ded7
|
merge changes for files_encryption
|
2013-05-15 10:20:19 +02:00 |
|
Florin Peter
|
807740a07a
|
fix for losing mount point "/"
|
2013-05-15 10:19:38 +02:00 |
|
Florin Peter
|
01f1153b08
|
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Conflicts:
apps/files/l10n/ar.php
apps/files/l10n/bn_BD.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/el.php
apps/files/l10n/es.php
apps/files/l10n/fa.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/id.php
apps/files/l10n/ko.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sl.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files_encryption/l10n/ca.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/sharedstorage.php
apps/user_ldap/l10n/tr.php
core/l10n/cs_CZ.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/ru.php
core/l10n/sk_SK.php
core/l10n/tr.php
core/l10n/vi.php
core/l10n/zh_CN.php
l10n/af_ZA/files.po
l10n/ar/files.po
l10n/be/files.po
l10n/bg_BG/files.po
l10n/bn_BD/files.po
l10n/ca/files.po
l10n/ca/files_encryption.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_encryption.po
l10n/de/files_external.po
l10n/de/files_sharing.po
l10n/de/files_trashbin.po
l10n/de/files_versions.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de/user_ldap.po
l10n/de_DE/files.po
l10n/de_DE/files_encryption.po
l10n/de_DE/files_external.po
l10n/de_DE/files_sharing.po
l10n/de_DE/files_trashbin.po
l10n/de_DE/lib.po
l10n/de_DE/settings.po
l10n/de_DE/user_ldap.po
l10n/el/files.po
l10n/eo/files.po
l10n/es/files.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/files.po
l10n/eu/files.po
l10n/fa/files.po
l10n/fi/files.po
l10n/fi_FI/files.po
l10n/fr/core.po
l10n/fr/files.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/core.po
l10n/he/files.po
l10n/he/user_ldap.po
l10n/hi/files.po
l10n/hr/files.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/hy/files.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_trashbin.po
l10n/ia/settings.po
l10n/id/files.po
l10n/is/files.po
l10n/it/files.po
l10n/ja_JP/files.po
l10n/ja_JP/user_ldap.po
l10n/ka/files.po
l10n/ka_GE/files.po
l10n/kn/files.po
l10n/ko/files.po
l10n/ko/files_trashbin.po
l10n/ko/settings.po
l10n/ku_IQ/files.po
l10n/lb/files.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lv/files.po
l10n/mk/files.po
l10n/ms_MY/files.po
l10n/my_MM/files.po
l10n/nb_NO/files.po
l10n/ne/files.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nn_NO/files.po
l10n/oc/files.po
l10n/pl/files.po
l10n/pl_PL/files.po
l10n/pt_BR/files.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ru/core.po
l10n/ru/files.po
l10n/si_LK/files.po
l10n/sk/files.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sq/files.po
l10n/sr/files.po
l10n/sr@latin/files.po
l10n/sv/files.po
l10n/sw_KE/files.po
l10n/ta_LK/files.po
l10n/te/files.po
l10n/th_TH/files.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/tr/user_ldap.po
l10n/uk/files.po
l10n/ur_PK/files.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/settings.po
l10n/zh_HK/files.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_versions.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
lib/base.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
settings/l10n/es.php
settings/l10n/pt_PT.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
|
2013-05-15 10:18:25 +02:00 |
|
Florin Peter
|
226aec8d56
|
Merge branch 'master' into files_encryption
|
2013-05-15 03:22:06 +02:00 |
|
Florin Peter
|
7461e9c2b5
|
improved tests and added new tests for file rename and move
|
2013-05-15 02:38:08 +02:00 |
|
Florin Peter
|
499fe6ca8e
|
disabled FileProxy in Keymanager::getPrivateKey
|
2013-05-15 02:36:23 +02:00 |
|
Florin Peter
|
ddedf20106
|
prevent of infinite loop with FileProxy
|
2013-05-15 02:34:36 +02:00 |
|
Florin Peter
|
791751b529
|
added setter for filesystem view
this is needed because there is no possibility to set $defaultInstance to false after filesystem::init
|
2013-05-15 02:32:27 +02:00 |
Jenkins for ownCloud
|
6a788d1a54
|
[tx-robot] updated from transifex
|
2013-05-15 02:02:45 +02:00 |
|
Florin Peter
|
8776000754
|
fix for move file to an empty folder
|
2013-05-14 23:19:16 +02:00 |
|
Florin Peter
|
0a7aa6e8cd
|
fix for Allowed memory size of xx bytes exhausted while reading big files
|
2013-05-14 22:32:39 +02:00 |
|
Thomas Müller
|
fdef2a373a
|
Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
fix allowed rename of folder in root directory to reserved name "Shared"
|
2013-05-14 13:13:16 -07:00 |
|
Florin Peter
|
84c56a5d56
|
fix for zero size files
|
2013-05-14 21:29:24 +02:00 |
|
Björn Schießle
|
96ff19a703
|
fix history template, print_unescaped() needs to include closing tags
|
2013-05-14 21:22:30 +02:00 |
|
Florin Peter
|
517105660d
|
fix for public link share
|
2013-05-14 20:11:07 +02:00 |
Raghu Nayyar
|
418503a4ad
|
Merge pull request #3338 from owncloud/button_color_fix
Keeping Font Colors Consistant on the headers.
|
2013-05-14 09:52:54 -07:00 |
Morris Jobke
|
784f117ec2
|
Merge pull request #3330 from owncloud/preselect_filename_on_rename
peselect filename without extension on rename
|
2013-05-14 06:16:30 -07:00 |
|
Morris Jobke
|
0d8fa2eb98
|
[files] add private declaration of $view
|
2013-05-14 12:49:23 +02:00 |
|
raghunayyar
|
18618c75aa
|
color change to crumb elements as well.
|
2013-05-14 11:07:12 +05:30 |
|
Jenkins for ownCloud
|
2b84da9793
|
[tx-robot] updated from transifex
|
2013-05-14 02:04:01 +02:00 |
|
Florin Peter
|
81ae4cb5d0
|
added test for public shared file via link
|
2013-05-14 00:00:20 +02:00 |
|
Florin Peter
|
a4e9e2fc79
|
added post_deleteUser hook for cleanup public key
|
2013-05-13 22:49:27 +02:00 |
|
Florin Peter
|
b2d021b2a5
|
added post_createUser hook
|
2013-05-13 22:34:11 +02:00 |
|
Florin Peter
|
61ed347d26
|
added handling for public file access via files_sharing link
|
2013-05-13 21:24:59 +02:00 |
|
Florin Peter
|
d92f6b887d
|
removed var_dump
|
2013-05-13 21:22:59 +02:00 |
|
raghunayyar
|
6d95d130e4
|
Keeping Font Colors Consistant on the headers.
|
2013-05-13 23:12:05 +05:30 |
|
Björn Schießle
|
aa3eb6bb5b
|
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
|
2013-05-13 17:40:57 +02:00 |
|
Björn Schießle
|
517efdf952
|
don't create a recovery user, only generate recovery key similar to the public link share key
|
2013-05-13 17:26:21 +02:00 |
|
Michael Gapczynski
|
71eed76dbe
|
Prevent backgroundScan() from looping if opendir() is failing for the same path
|
2013-05-13 11:17:08 -04:00 |
|
Morris Jobke
|
d980ee9d9f
|
Merge pull request #3303 from owncloud/update_etags_on_restore
Make sure that etags get updated once a file gets retored from the trash bin
|
2013-05-13 08:12:57 -07:00 |
Bernhard Posselt
|
1ec92b6377
|
Merge pull request #3329 from owncloud/increase_lock_timeout
Set the SQLite database lock timeout to 60 seconds which is the default ...
|
2013-05-13 06:56:07 -07:00 |
Jörn Friedrich Dreyer
|
591b383f2d
|
peselect filename without extension on rename
|
2013-05-13 15:54:45 +02:00 |