92e28839ff
Improvements to code formatting & indentation
2013-05-09 18:16:59 +02:00
3003dd46d1
Implemented initial recoveryAdmin functionality in crypto file proxy
2013-05-09 18:09:20 +02:00
101e037529
Fixed bugs with pre_share hook usage
...
Made sure new user being shared to is added to array of sharing users
2013-05-09 14:43:06 +02:00
bda8187f3b
rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file
2013-05-08 23:00:13 +02:00
b9134dcd6a
touch file relative to users file folder, otherwise the hooks will be ignored
2013-05-08 22:59:49 +02:00
d69579f773
LDAP: fix display of numerical display names
2013-05-08 17:54:38 +02:00
796ee8c4c0
LDAP: Implement clear mappings functionality
2013-05-08 17:47:07 +02:00
28866de44b
Added pre_share hook
...
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
2013-05-08 16:22:08 +02:00
3f1717d3d5
LDAP: implement UUID and internal username override
2013-05-08 14:56:52 +02:00
c9b3da5bbc
LDAP: better variable name
2013-05-08 14:55:56 +02:00
bc23010670
LDAP: implement r+w for new settings
2013-05-08 14:05:08 +02:00
c18158906c
LDAP: add settings for UUID override
2013-05-08 13:57:21 +02:00
fdc49e7acb
added test for share folder
2013-05-07 22:56:59 +02:00
33fc830dd3
added test for re-share
2013-05-07 22:22:05 +02:00
175633d380
Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
...
Use === and !== in user_ldap app
2013-05-07 12:45:43 -07:00
498eae49b1
LDAP: prepare settings for internal username attribute and clearing user mappings
2013-05-07 19:31:51 +02:00
5b61c5d478
Merge pull request #3044 from owncloud/backgroundwatcher
...
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
68ecee9771
LDAP: Coypright info
2013-05-07 18:23:49 +02:00
763c8f78ed
Made code formatting of new methods more consistent
2013-05-07 17:16:16 +02:00
4b53f72d0d
Added facility to manually encrypt all files from personal settings
...
Added success/fail feedback to personal settings functions
Improved look/layout of personal settings page
Fixed misplaced plain text in ajax scripts
2013-05-07 16:17:38 +02:00
b535964006
test for share is now able to run with autotest.sh
2013-05-07 13:43:34 +02:00
8b54553872
fix for wrong file infos
2013-05-07 13:42:49 +02:00
a9649713d3
fix empty path
2013-05-07 13:42:08 +02:00
deb0885e46
Merge pull request #3246 from owncloud/newfile-mimetype
...
Files: set the proper mimetype when creating a new text file
2013-05-07 01:53:43 -07:00
8fcef41143
added test for share
2013-05-07 09:49:14 +02:00
fe6d12ddec
fix file info put on stream
2013-05-06 21:15:25 +02:00
3de40f7cfb
Files: set the proper mimetype when creating a new text file
2013-05-06 17:55:22 +02:00
db1e6b5f3b
Use $dir instead of $fullpath
2013-05-06 14:28:01 +03:00
b13b19c58b
Use the internal ownCloud view
2013-05-06 13:43:23 +03:00
d659d8e193
LDAP: do not reset UUID attribute setting when guid is detected
2013-05-06 10:17:52 +02:00
5610429a02
handling for re-share and re-unshare should work now
2013-05-05 23:41:42 +02:00
c8946ea608
Added support for user-specified password for adminRecovery account in admin settings page
...
Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema
2013-05-04 16:14:38 +02:00
9605d14a17
fixed re-share problems
2013-05-04 03:37:22 +02:00
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
d649f77898
make sure to find the correct path for shared files
2013-05-03 17:14:43 +02:00
050258f003
remove encryption keys if a file gets deleted permanently
2013-05-03 16:33:18 +02:00
8a1223181b
disable proxys before copying files to the trash bin
2013-05-03 15:18:05 +02:00
1e2b872160
LDAP: cachekey in set method needs to match with that one from get
2013-05-03 15:13:37 +02:00
e0f6d159d6
Merge pull request #3229 from owncloud/fix_3210
...
LDAP: remove restriction from group names to be in line with core behavi...
2013-05-03 06:04:24 -07:00
a541b80592
Merge pull request #3222 from owncloud/fix-3218
...
Fix retrieving of mount points for shared storage, fix #3218
2013-05-03 06:02:33 -07:00
22a8e7ad55
LDAP: remove restriction from group names to be in line with core behaviour again
2013-05-03 14:11:06 +02:00
a2516e549b
get original path in case of shared files when restoring file from trash bin
2013-05-03 14:03:42 +02:00
996a557475
get original path in case of shared files
2013-05-03 13:00:04 +02:00
4f6565d8e7
[tx-robot] updated from transifex
2013-05-03 02:05:10 +02:00
a204a46d50
Merge pull request #3212 from owncloud/stop-links
...
Don't display shared links if disabled
2013-05-02 15:29:00 -07:00
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
8a5e88b21c
Merge pull request #3211 from owncloud/fix-2816
...
Fix #2816 renaming shared files
2013-05-02 00:54:09 -07:00
274bf3c6bd
Don't display shared links if disabled
2013-05-01 20:39:02 -04:00
04b7a9902d
Fix #2816 renaming shared files
2013-05-01 20:29:07 -04:00
ee53e7b3d2
[tx-robot] updated from transifex
2013-05-02 02:19:04 +02:00
657ff34c6c
Merge pull request #3147 from owncloud/storage-mkdir-root
...
Dont task external storages with creating their own root
2013-05-01 16:35:44 -07:00
ba29147e34
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
...
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
db49b0aff8
Merge pull request #3202 from owncloud/swift_id
...
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
d3db4ee103
fixed re-share problems
2013-05-01 11:04:40 +02:00
3579ba1e41
Merge branch 'master' into files_encryption
...
Conflicts:
apps/user_ldap/l10n/nn_NO.php
core/l10n/es.php
core/l10n/et_EE.php
core/l10n/ja_JP.php
core/l10n/nn_NO.php
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_encryption.po
l10n/cy_GB/files_external.po
l10n/cy_GB/files_sharing.po
l10n/cy_GB/files_trashbin.po
l10n/cy_GB/lib.po
l10n/cy_GB/settings.po
l10n/de_DE/core.po
l10n/es/core.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/gl/core.po
l10n/it/core.po
l10n/ja_JP/core.po
l10n/ja_JP/settings.po
l10n/nn_NO/core.po
l10n/nn_NO/user_ldap.po
l10n/pt_BR/core.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/zh_TW/files_sharing.po
settings/l10n/et_EE.php
2013-05-01 09:31:26 +02:00
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
06a5cf70f7
fix duplicate login behavior if user not setup
2013-05-01 02:01:16 +02:00
9f8f052f0d
merged files_trashbin
2013-05-01 01:52:06 +02:00
04b0843bb4
fixed some tests
2013-05-01 01:43:56 +02:00
3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
4c980b1a14
Set storage id for openstack swift backend
2013-05-01 00:24:34 +02:00
5deba29bdf
fixed public-keys mount point error
2013-05-01 00:09:55 +02:00
b08179d406
fixed tests after merge against master
2013-04-30 23:58:53 +02:00
b2da07fe95
Merge branch 'master' into files_encryption to get the latest files_trashbin app
...
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php
2013-04-30 20:53:56 +02:00
fbbc76f281
fix for sharing files
2013-04-30 20:44:42 +02:00
4ab3614248
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master
...
Trashbin for encryption keys now against master
2013-04-30 11:39:21 -07:00
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
b1c4464eda
improved key length tests
2013-04-30 01:54:19 +02:00
27ce7845b4
fixed tests, now tests should work via autotest.sh
...
files_encryption app is now enabled in enable_all.php
2013-04-30 01:35:46 +02:00
882a747b47
rename folder to tests
2013-04-30 00:34:05 +02:00
d22795d68b
fixed test for crypt and keymanager
...
disabled encryption file proxy in test/lib/cache/file.php
2013-04-29 23:41:49 +02:00
c52fe12537
fixed missing parameter
2013-04-29 23:37:08 +02:00
cc9933be1c
Merge pull request #3160 from owncloud/remove-onclick
...
Remove onclick
2013-04-29 03:58:44 -07:00
4ecd62e58d
improvements for test testSymmetricStreamEncryptShortFileContent
...
this runs currently into an infinite loop
2013-04-29 09:12:43 +02:00
2b36ad292d
[tx-robot] updated from transifex
2013-04-29 02:00:26 +02:00
4a63faf64b
speed improvement
2013-04-29 01:43:59 +02:00
3a6e39b990
It's a class
2013-04-28 23:28:41 +02:00
003e6adb3f
Remove uneeded onclick handler
2013-04-28 23:26:07 +02:00
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +02:00
7a3ecd0429
delete and restore of versions and share-keys now works
...
fix restore of the same file name
2013-04-28 20:48:30 +02:00
5e11948598
added handling for share-keys
...
this works only with latest files_encryption branch up from 813641e6e8
2013-04-28 20:48:30 +02:00
26e5ef193d
restore fixed
2013-04-28 20:48:30 +02:00
228c501515
fixed some problems and broken code
2013-04-28 20:48:30 +02:00
680ba4bea1
restore encryption keys from trash bin (development snapshot)
2013-04-28 20:48:29 +02:00
cb65b7ca9d
move encryption keys to trash bin
2013-04-28 20:45:51 +02:00
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
f9760f6521
improved file size
2013-04-27 23:34:25 +02:00
7f1f0464a8
added self healing if file get remove from file cache
2013-04-27 23:02:42 +02:00
770aebfb9e
check if file exists before fixing file size
2013-04-27 20:22:38 +02:00
ba080e0d2e
removed preRename and moved postRename to hooks.php
...
added postWrite and postTouch to fix file size and sharing keys
2013-04-27 20:21:46 +02:00
05523b76c0
fix reusing keys
...
fix webdav part files
2013-04-27 20:18:57 +02:00
d40ffc5aac
added filesystem post rename hook
2013-04-27 20:18:05 +02:00
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
813641e6e8
improved file size
...
created new method fixFileSize in Util so it can be used with files_trashbin
2013-04-27 00:05:20 +02:00
c05195a46d
Dont task external storages with creating their own root
2013-04-26 17:40:31 +02:00
331ad15d9b
adding auth mode to ui and the url
2013-04-26 17:37:41 +02:00
884635557a
adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS
2013-04-26 17:05:10 +02:00
5474fea1f6
Merge pull request #3136 from owncloud/mount-cleanup
...
Separation of mount management
2013-04-26 06:55:21 -07:00
17ff5d486e
Merge branch 'master' into ext-fs-irods-master
2013-04-26 13:29:48 +02:00
7ea2f785f4
[tx-robot] updated from transifex
2013-04-26 01:58:21 +02:00
809b5f81f6
Further seperation of mount management logic
2013-04-26 00:01:36 +02:00
d017bbb065
fix share for renamed or moved files
2013-04-25 23:24:07 +02:00
8ee7959092
implement postRename
...
@samtuke no need anymore for fixPartialFilePath this is now handled by rename
share-keys are now handled properly
webdav .part files are handled properly
2013-04-25 22:49:47 +02:00
328dea93c7
webdav fix for file chunking
...
upload with big files should now work
@samtuke and @schiesbn we need a solution for the cache files created by webdav
2013-04-25 20:23:54 +02:00
11d0eef8cc
fixed webdav errors, now webdav up - and downloads are full working
2013-04-25 15:21:11 +02:00
fac288a4ad
added unencrypted file size to file cache
...
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
170d09203f
fixed file_proxy handling
2013-04-25 14:56:11 +02:00
a0df5903b0
[tx-robot] updated from transifex
2013-04-25 01:55:56 +02:00
1ee224d8cb
Merge pull request #3108 from owncloud/fileactions-order
...
Files: fix the order fileactions are computed for a file
2013-04-24 10:55:38 -07:00
62b9c88bb9
[tx-robot] updated from transifex
2013-04-24 18:31:36 +02:00
88fd3b088d
[tx-robot] updated from transifex
2013-04-24 17:46:20 +02:00
637dd685db
fix wrong shared icon description
...
fix #2928
translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 16:13:17 +02:00
ab7fcebeb3
Files: fix the order fileactions are computed for a file
2013-04-24 15:26:36 +02:00
a7b4469b2e
[tx-robot] updated from transifex
2013-04-24 02:01:20 +02:00
c5d3f09262
test case for iRODS storage added
2013-04-23 23:19:11 +02:00
f8819f54c2
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-23 19:09:01 +02:00
baa6fd639f
improved file size handling
2013-04-23 19:08:52 +02:00
99cb37a6d1
Merge pull request #3092 from guruz/external_storage_check_for_curl
...
External Storage: Check for curl in PHP
2013-04-23 09:48:04 -07:00
c357f7b8cd
Merge pull request #3082 from owncloud/ldap_confcache_opt
...
LDAP: reset user/group-config association only after exists-check, may p...
2013-04-23 09:44:38 -07:00
b7d8da87d0
Development snapshot
...
working on stream handling (large files) in Util->encryptAll()
2013-04-23 18:41:01 +02:00
c6bfc7315b
Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
...
.part file paths fixed in stream{}
2013-04-23 17:36:35 +02:00
4aa80d02be
Merge branch 'master' into files_encryption
2013-04-23 14:13:40 +02:00
a1d241783e
Updated buglist
2013-04-23 14:12:28 +02:00
6141b24d96
External Storage: Check for curl in PHP
...
If no curl is found, disable the storage that needs it.
2013-04-23 12:36:30 +02:00
05ab9d2de7
[tx-robot] updated from transifex
2013-04-23 02:00:31 +02:00
b066c0ff44
LDAP: reset user/group-config association only after exists-check, may performance in some cases
2013-04-23 01:00:27 +02:00
1507d1ef26
Files: Fix XSS when creating dropshadow
2013-04-22 21:55:54 +02:00
8ab9433fdf
fix wrong file path in proxy
2013-04-22 18:54:23 +02:00
2827004634
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 18:51:11 +02:00
37c7205941
fix wrong file path in util
2013-04-22 18:50:59 +02:00
a4364a93d0
delete all share keys if a file gets deleted
2013-04-22 15:29:58 +02:00
b5cb5dab51
fix encryption to owncloud user for public link shares
2013-04-22 14:30:10 +02:00
b57478fa27
fix comment, remove unused variable
2013-04-22 14:14:28 +02:00
bcb2e87846
check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases
2013-04-22 14:13:59 +02:00
1705938848
removed some leftover code; use already existing var for path to users file folder
2013-04-22 12:32:38 +02:00
eade87dc79
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-22 12:32:35 +02:00
f6ac34afea
improved handling for getSharingUsersArray
2013-04-22 12:25:55 +02:00
8a46e809f0
remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user
2013-04-22 12:22:07 +02:00
8790ceba25
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-04-22 11:59:26 +02:00
a2ba3c8a43
fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients
2013-04-22 11:58:39 +02:00
6b47da10be
improved rename and file size support
...
fix missing user_id on write
2013-04-22 04:40:49 +02:00
f6808617b3
[tx-robot] updated from transifex
2013-04-22 02:00:20 +02:00
7948341a86
Rework background job system
2013-04-20 23:27:46 +02:00
d6b13ccd12
Use !== and === in user_ldap app – Part 2
2013-04-20 22:46:37 +02:00
b8fe7025da
Use !== and === in user_ldap app – Part 1
2013-04-20 22:46:37 +02:00
15dae6198f
Cache: add a backgroundjob to check for external changes to the filesystem
2013-04-20 16:38:03 +02:00
9a0b73070c
Merge pull request #2992 from FlorinPeter/files_encryption
...
fix for trashbin
2013-04-20 05:35:29 -07:00
03c7a52bc5
[tx-robot] updated from transifex
2013-04-20 02:02:09 +02:00
802a5a331b
Fix displaying spinner on delete
2013-04-19 13:46:11 +02:00
a21885953f
No need to strip slashes, json_decode handles that for us
2013-04-19 13:45:40 +02:00
12785b93f1
make sure that all share keys get deleted if a file/folder gets unshared from a user/group
2013-04-19 13:17:08 +02:00
0e1970438b
fixed incorrect filesize, download via web is now possible
...
fixed broken file-info
2013-04-18 22:34:22 +02:00
cfbf81f978
checkbox in settings ui
2013-04-18 22:20:52 +02:00
e1f5f00ec3
in order to use the ownCloud login credentials we use a login hook to grab uid and password and store it in the session.
...
The stored credentials will be used for and interactions with the iRODS server.
Within the config UI a check box can be used to enable the credential reuse.
2013-04-18 22:12:53 +02:00
2bd338c49f
getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results
2013-04-18 20:02:27 +02:00
5a7a64df08
Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list
2013-04-18 20:00:45 +02:00
935d039860
necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() ( fe58e4b1a6)
2013-04-18 17:53:59 +02:00
39c717b24c
some fixes to the keymanager class to identify the file owner and the owner path correctly.
2013-04-18 17:52:27 +02:00
1df36e0c88
rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud
2013-04-18 16:39:00 +02:00
40905c8941
fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it
2013-04-18 16:34:23 +02:00
7892fddcb9
remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles
2013-04-18 15:44:57 +02:00
bd3024242f
always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change
2013-04-18 15:42:28 +02:00
a646a1169f
return filename relative to users file dir and not relative to data dir
2013-04-18 13:41:21 +02:00
fbd3445d22
Merge branch 'master' into ext-fs-irods-master
2013-04-18 09:27:43 +02:00
cbd8b792d9
[tx-robot] updated from transifex
2013-04-18 02:09:28 +02:00
2434739d69
fix for trashbin
2013-04-18 02:03:03 +02:00
6dd8c79461
Development snapshot
...
Working on stream{} write
2013-04-17 17:20:37 +02:00
ddde1b65db
adapt free space calculation to the way it is done for the trash bin
2013-04-17 10:43:12 +02:00
a3999036f7
improved free space calculation if no quota is set, discussed in #2936
2013-04-17 10:42:59 +02:00
37868818ff
[tx-robot] updated from transifex
2013-04-17 02:29:17 +02:00
f89a3604aa
Working on stream{} writing
...
Development snapshot
2013-04-16 18:29:22 +02:00
770dcbf663
Fixed stream{} reading of encrypted files (stream_read())
2013-04-16 14:53:54 +02:00
b4dd6ae36c
Merge pull request #2885 from FlorinPeter/files_encryption
...
fix performance issues
2013-04-16 04:25:59 -07:00
f378a7f572
Fixed proxy class handing of read / write files
...
Various work on other classes
2013-04-16 13:22:16 +02:00
606b672a3d
always connect file cache updater hooks first
2013-04-16 13:07:55 +02:00
01d203c773
add explenation of the expire function to the apps description
2013-04-16 12:31:33 +02:00
032c54273c
write a info message to the log if a file gets removed from the trash bin automatically
2013-04-16 12:31:22 +02:00
d0b3e8aceb
[tx-robot] updated from transifex
2013-04-16 02:17:30 +02:00
e13e4c412f
[tx-robot] updated from transifex
2013-04-15 02:12:43 +02:00
7d68cd4040
[tx-robot] updated from transifex
2013-04-14 02:20:35 +02:00
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +02:00
7dd3391117
initial integration with iRODS www.irods.org
...
The used PHP API is hosted at https://code.renci.org/gf/project/irodsphp/
2013-04-12 15:51:58 +02:00
854b920787
fix some more paths
2013-04-12 15:18:19 +02:00
02d1f86a53
fix some confusion about paths relative to the files dir and to the data dir
2013-04-12 14:30:02 +02:00
f87229ddaf
fix stream wrapper to make initial encryption work
2013-04-12 14:13:38 +02:00
33ee2e2f10
[tx-robot] updated from transifex
2013-04-12 02:11:02 +02:00
8f0bbdc5cb
fix performance issues
2013-04-11 22:55:48 +02:00
1b3b766244
cleanup the trash bin tables in the database after a user was deleted
2013-04-11 14:40:06 +02:00
544a46c690
remove used space for versions from db is a user was deleted
2013-04-11 14:39:56 +02:00
b02db643d0
[tx-robot] updated from transifex
2013-04-11 02:10:41 +02:00
c3a284569b
make sure that public-keys dir exists
2013-04-10 16:46:02 +02:00
4303d6318e
Session expect OC_FilesystemView()
2013-04-10 15:31:19 +02:00
fff979a590
add $view as parameter for getFileKey() call
2013-04-10 15:14:44 +02:00
98de385b8a
add $view as parameter for session constructor
2013-04-10 15:08:28 +02:00
48dabd2c14
size of the trash bin could be incorrect, remove it for all users to enforce a recalculation during next usage.
2013-04-10 10:09:37 +02:00
16b0855992
only add filesize to trashbin size if the file was moved to the trash bin successfully
2013-04-10 10:09:22 +02:00
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
109fe198c3
Added info about filesystem method access conventions
2013-04-09 19:19:27 +02:00
400cf5beb3
Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload
2013-04-09 19:11:38 +02:00
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
6d6dfffea7
Merge pull request #2279 from owncloud/refactor_upload_js
...
Refactor upload js
2013-04-06 15:44:08 -07:00
248e097f3c
Merge pull request #1974 from owncloud/use-rawurlencode
...
OC6- Just use rawurlencode in files list template
2013-04-06 11:55:44 -07:00
797b529da7
Merge pull request #2759 from owncloud/fix-2718
...
Set file perms to 0640 of mount.json - fixes #2718
2013-04-06 09:52:22 -07:00
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +02:00
6552996734
Set file perms to 0640 of mount.json - fixes #2718
2013-04-06 13:21:21 +03:00
6798b6dc34
[tx-robot] updated from transifex
2013-04-06 00:05:32 +02:00
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +02:00
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
e824c6cffa
Merge pull request #2611 from owncloud/filename-width
...
Adds a fixed width to the filename to prevent horizontal scroll.
2013-04-04 05:32:38 -07:00
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
40627a05a8
Merge pull request #2694 from owncloud/fix_2690
...
Typo, fixes #2690
2013-04-03 10:23:34 -07:00
d44b649d2a
Typo, fixes #2690
2013-04-03 17:52:34 +02:00
10e37e1553
[tx-robot] updated from transifex
2013-04-03 00:04:02 +02:00
29d33ff7c2
[tx-robot] updated from transifex
2013-04-02 00:04:27 +02:00
f8e48955b9
Merge pull request #2576 from owncloud/fixing-2125-master
...
fixes #2125 - the warning is now displayed with a disabled button
2013-03-31 09:53:07 -07:00
cfd8b911b6
[tx-robot] updated from transifex
2013-03-31 00:03:46 +01:00
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
14451bdaf0
Development snapshot;
...
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
2013-03-29 21:11:29 +01:00
5dd1f7d764
Using max-width instead of width for filename.
2013-03-30 00:13:47 +05:30
024b60decc
Adds a fixed width to the filename to prevent horizontal scroll.
2013-03-29 16:26:03 +05:30
7ecbaef16c
use css browser switch instead of deprecated jquery browser detection
2013-03-28 19:13:37 +01:00
dac875eb9c
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
2013-03-28 18:50:49 +01:00
ff6f52d5ec
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
9ecfd07f23
Added ajax scripts for setting pwd recovery preferences
2013-03-28 18:29:18 +01:00
e31d74037a
use local variable to walk DOM only once
2013-03-28 18:20:03 +01:00
868d7b956d
use === to compare empty string ''
2013-03-28 18:20:03 +01:00
831b7ca803
don't update progress bar in ie < 10
2013-03-28 18:20:03 +01:00
c1a944a655
return created table row, use as context in fileupload events
2013-03-28 18:17:18 +01:00
4dd4167f80
refactor files.js, make proper use of fileupload events
2013-03-28 18:17:18 +01:00
0968eb0a65
return original filename to fileupload
2013-03-28 18:03:52 +01:00
df31ee5a90
Merge pull request #2575 from owncloud/fixing-1461-master
...
Fix upload progressbar in IE8 and IE9
2013-03-28 10:01:39 -07:00
599778b153
Files External: show display names instead of internal user names in Settings UI
2013-03-27 19:07:33 +01:00
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
586a47b186
fixes #1463 - file size is now displayed correctly in IE8
2013-03-26 21:28:01 +01:00
e717f7150e
check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete
2013-03-26 16:52:58 +01:00
cf50e67e1b
prevent to fire delete ajax a second time.
...
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 16:27:56 +01:00
73157133e8
reuse function provided in util.php
2013-03-26 16:22:26 +01:00
6beeb2466f
also delete share keys if a different user than the owner deletes a shared file
2013-03-26 16:17:26 +01:00
3817922c93
fixes #2125 - the warning is now displayed with a disabled button
2013-03-26 15:44:35 +01:00
b1d620300e
delete share keys if file gets deleted
2013-03-26 14:22:18 +01:00
e0e5cb73bf
fixes #1461
2013-03-26 14:14:30 +01:00
5f233ee814
get the correct paths and owner to access shared files
2013-03-26 12:40:31 +01:00
a65d741a3f
move getUidAndFilename() tu util.php
2013-03-26 12:39:55 +01:00
890f0142a2
get shared keys from new location
2013-03-26 12:24:04 +01:00
5995b6996b
always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later
2013-03-26 12:23:28 +01:00
f10be4ea17
new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir)
2013-03-26 11:58:54 +01:00
d121180d46
Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
...
let public link download handle json encoded file lists [master]
2013-03-26 01:56:47 -07:00
c2a49b5c1f
the old path no longer exists after rename, update the parent folder instead
2013-03-25 14:21:06 +01:00
8b3dd87846
LDAP: fix wrong return value
2013-03-25 12:33:10 +01:00
abd48496d2
fix indention
2013-03-25 12:33:03 +01:00
102120f105
skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares
2013-03-25 12:32:56 +01:00
5924d1d95c
add backticks around table names
2013-03-25 12:29:13 +01:00
4f6e13e673
[tx-robot] updated from transifex
2013-03-23 00:06:16 +01:00
3b1c7de459
[tx-robot] updated from transifex
2013-03-21 00:04:36 +01:00
fd4e59b748
Added method for setting user keyfile recovery preference
...
Fixed method for checking if keyfile recovery is enabled for a user
Added unit test for above 2 methods
Made proxy{} always use sharing
Made proxy{} work regardless of sharing API enabled or not
Implemented proxy-based sharing to admin if user keyfile recovery is enabled
2013-03-20 19:26:59 +01:00
b91bcf5f60
Merge pull request #2324 from owncloud/html_video_tag
...
use html video tag to preview videos for public shares
2013-03-20 02:27:53 -07:00
63e3f978ab
[tx-robot] updated from transifex
2013-03-20 00:02:44 +01:00
c89fd49870
Improved folder creation code
...
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments
2013-03-19 19:53:15 +01:00
aa3973d365
LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup.
2013-03-19 14:40:36 +01:00
0f4e02b6fc
LDAP: avoid irritating log output
2013-03-19 14:40:30 +01:00
50d0f48ee4
LDAP: check whether user exists for before trying to determine displayname
2013-03-19 14:40:23 +01:00
18fccf6612
LDAP: check first whether group exists in this backend before doing other operations
2013-03-19 14:40:15 +01:00
504f5f229f
LDAP: remove unnecessary func call, was a leftover from earlier refactor
2013-03-19 14:40:05 +01:00
f38932fb80
LDAP: specify appid when selecting from appconfig
2013-03-19 14:39:56 +01:00
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
5b1f857907
Merge pull request #2363 from owncloud/uploadsize
...
Improve behaviour when max upload size is unknown
2013-03-18 08:18:27 -07:00
4a1a23ce1b
add some error logs to the trash bin app
2013-03-18 12:08:34 +01:00
2a48aa322d
[tx-robot] updated from transifex
2013-03-18 00:06:55 +01:00
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
ec45a8433d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/templates/settings.php
2013-03-15 17:50:02 +01:00
319e3f162c
Don't block uploads if the max upload size is unknown
2013-03-15 16:40:36 +01:00
32b8fd8fb7
Improve handeling of unlimited max upload size
2013-03-15 16:31:35 +01:00
d2b3a9fb3b
Update settings.php
...
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
2013-03-15 15:09:55 +01:00
418fb98c40
remove backticks around table names
2013-03-15 12:10:21 +01:00
e37e884d7a
add backtick for db queries to prevent postgresql errors
2013-03-15 12:10:07 +01:00
23fe98a562
Merge pull request #2336 from eMerzh/fix_trashpg
...
Add backtick for trash app to prevent pg errors
2013-03-15 03:17:54 -07:00
92a8676350
Merge pull request #2317 from owncloud/create_version_on_upload
...
create new version if the same file is uploaded again over the web interface
2013-03-15 01:18:20 -07:00
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
1631aa2434
Add backtick for trash app to prevent pg errors
2013-03-15 00:03:37 +01:00
285d328ef1
use html video tag to preview videos for public shares
2013-03-14 20:10:21 +01:00
f78594c0ae
fix var name
2013-03-14 17:09:48 +01:00
93b2ada6f6
fix var name
2013-03-14 17:08:16 +01:00
0cf50d63bf
create new version if the same file is uploaded again over the web interface
2013-03-14 16:47:59 +01:00
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
7d748a6b06
Merge pull request #2277 from owncloud/fix_sharing_hooks
...
listen to the pre delete hook in the sharing app [master]
2013-03-13 10:15:57 -07:00
c3ba49f384
Merge pull request #2265 from owncloud/no_share_option_for_shared_folder
...
don't add share action to the Shared folder
2013-03-13 08:23:35 -07:00
30831b6b55
we need to listen to the pre delete hook, otherwise the file is already gone
2013-03-13 15:39:39 +01:00
e5f40ddaae
only prevent shared action for the Shared folder in the root dir
2013-03-13 11:33:20 +01:00
f971ce0b66
let public link download handle json encoded file lists
2013-03-13 11:15:17 +01:00
f3a2daaa9d
[tx-robot] updated from transifex
2013-03-13 00:06:21 +01:00
43d15066f9
Merge pull request #2234 from owncloud/fix_ldap_edirectory
...
LDAP: compatibility with Novell eDirectory UUID
2013-03-12 10:21:49 -07:00
b2da2f769a
don't add share action to the Shared folder
2013-03-12 17:28:36 +01:00
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
1e07801c95
LDAP: compatibility with Novell eDirectory UUID
2013-03-11 13:30:06 +01:00
049a4df259
Merge pull request #1786 from owncloud/shared-folder-etags
...
Include etags for the root of the shared folder
2013-03-11 02:38:50 -07:00
07f88424c8
LDAP: fancy version for release, no code change
2013-03-10 18:34:56 +01:00
3c06020e3e
Merge pull request #2217 from owncloud/mountconfig-location
...
Store the global mount configuration file in the datadir
2013-03-10 00:25:10 -08:00
be4806d031
Store the global mount configuration file in the datadir
2013-03-10 02:25:03 +01:00
dfbf57207d
Merge pull request #1584 from owncloud/ocs_multiple_methods
...
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
c1f1fbda08
Fixed stream wrapper bugs
...
Switched encryptAll() to use stream-based instead of file-at-a-time encryption
Development snapshot
2013-03-09 19:18:34 +01:00
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
e743386acf
Fix correctFolders and retrieve the correct storage cache
2013-03-08 14:27:30 -05:00
546fb72b25
Merge pull request #2165 from owncloud/fix_2155
...
Offer download of whole shared dir only if it does not exceed zip input ...
2013-03-08 10:31:48 -08:00
02e2f7384e
not only files can be reshared but also folders
2013-03-08 17:32:04 +01:00
20828488bc
Fix share hook for updater
2013-03-08 10:59:22 -05:00
2d00d13a5d
use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
2013-03-08 15:13:00 +01:00
0525bbd73c
Merge pull request #2189 from owncloud/versioning_sync_client
...
fix versioning for the sync client - distinguish between touch and write operation
2013-03-08 03:05:28 -08:00
8d26400cb5
remove some debug output; move code to the right function
2013-03-08 11:27:25 +01:00
45869afa5a
remove debug output
2013-03-08 10:51:28 +01:00
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
4826564344
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
d6bb627a62
Merge pull request #2173 from owncloud/fix-shared-storage
...
Fix fetching source path of shared files
2013-03-07 09:37:36 -08:00
a5cab28bea
Fix fetching source path of shared files
2013-03-07 11:12:59 -05:00
19073e0711
Merge pull request #2167 from owncloud/input-type-fix
...
Input type fix
2013-03-07 07:28:22 -08:00
4cb5cb9693
itemSource parameter should be fileSource
2013-03-07 10:00:03 -05:00
48bb53030c
distinguish between touch and write
2013-03-07 15:51:44 +01:00
2ae1ad23b0
Offer download of whole shared dir only if it does not exceed zip input limit
2013-03-07 15:48:10 +01:00
70f0e0a8da
Merge pull request #2162 from owncloud/trash_bin_home
...
let the home icon link to the files view in the trash bin
2013-03-07 06:26:15 -08:00
ba9f5f5885
add dirlisting var to file list
2013-03-07 14:54:59 +01:00
3970d1f875
remove debug output
2013-03-07 14:18:27 +01:00
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
dda4c6bf4b
no dir parameter needed
2013-03-07 13:51:18 +01:00
7188303651
let the home icon link to the files view in the trash bin
2013-03-07 13:48:02 +01:00
97222b1de5
[tx-robot] updated from transifex
2013-03-07 00:16:59 +01:00
812e306e6e
Update Shared folders ETags of users with reshares
2013-03-06 17:33:27 -05:00
ab7dc76ff1
add type=text to ZIP size field, fix second part of #2097
2013-03-06 12:39:36 +01:00
d9a0d1d23b
Merge pull request #2119 from owncloud/fix_ldap_settings
...
LDAP: fix settings output thus make settings work again
2013-03-06 02:32:31 -08:00
82990b82a6
Merge pull request #2118 from owncloud/fix_1689
...
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
2013-03-06 00:38:06 -08:00
bce0c3c372
LDAP: move more settings stuff to template file
2013-03-06 08:26:33 +01:00
771e01af35
Move hook connectors from shared storage to app.php, add post_unshare hook
2013-03-05 21:57:32 -05:00
4dcbaa1d7b
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
1e5f8b0e20
LDAP: fix settings output thus make settings work again
2013-03-05 23:43:22 +01:00
b5dc8b9ca3
whitespace
2013-03-05 21:25:59 +01:00
72c293e834
LDAP: implementation of displayNamesInGroup
2013-03-05 21:23:58 +01:00
055fadd10d
LDAP: escape some more chars for proper search filter, fixes #1673
2013-03-05 14:33:20 +01:00
b08894ba77
LDAP: error codes can be negative, too
2013-03-05 13:47:03 +01:00
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
f2b86d0227
make sure that $this->userId is initialized before using it as a parameter
2013-03-04 17:58:56 +01:00
e65e6a12f1
define key size in constructor, otherwise the key size will depend on the servers openssl conf
2013-03-04 15:33:38 +01:00
ef70978524
Merge pull request #2073 from owncloud/trashbin_userHome
...
make trashbin work with different user homes
2013-03-04 04:38:24 -08:00
2a5d9ca9c5
damn copy&paste, fix wrong var name
2013-03-04 12:59:48 +01:00
d23702d324
make trashbin work with different user homes
2013-03-04 12:57:32 +01:00
2a9c3c1660
Merge pull request #2069 from owncloud/fix_sanitize_call
...
use p() for the output and not for the comparison
2013-03-04 03:41:47 -08:00
05aad21b99
Merge pull request #2070 from owncloud/fix_quota
...
fix quota calculation for trash and versions
2013-03-04 03:33:47 -08:00
21bad1fcc0
fix type in var name
2013-03-04 12:33:16 +01:00
94dab96dba
fix quota calculation for trash and versions
2013-03-04 12:17:57 +01:00
ccc4102cd9
fix p() call
2013-03-04 12:12:27 +01:00
52919fa94b
use p() for the output and not for the comparison
2013-03-04 12:01:45 +01:00
39a94a3edc
LDAP: orthograophy fix
2013-03-04 11:44:34 +01:00
0703065e2a
LDAP: typos in app description
2013-03-04 11:29:35 +01:00
de066beaaf
Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares
...
Fix file actions including permanent shares
2013-03-04 01:56:23 -08:00
d3ddf03687
Datepicker height fixed.
...
New id defined for files table for positioning.
2013-03-04 09:21:38 +05:30
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
0488968443
Merge pull request #2034 from owncloud/fix_bug47
...
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
f4411b0243
durhurrrhurrr
2013-03-03 13:01:25 +01:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
e466d680fe
Fix variable name in Shared_Updater
2013-03-02 13:11:57 -05:00
9b4d7d9925
Update ETag when file is shared
2013-03-02 12:57:29 -05:00
dbb9b68331
Fix quoting of query for user_ldap ref #1983
2013-03-02 16:26:15 +01:00
d3e88e6a8c
Remove uneeded sanitizeHTML
2013-03-02 12:44:53 +01:00
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
fdb37d191b
Merge pull request #2092 from owncloud/infieldlabels-placeholder
...
explicitly add empty placeholder to inputs which use infield labels
2013-03-04 13:31:21 -08:00
33c62bf110
Merge pull request #2090 from owncloud/fixing-2089-master
...
fixes #2089
2013-03-04 13:17:35 -08:00
07dee24cb2
explicitly add empty placeholder to inputs which use infield labels, fix #2049
2013-03-04 22:11:57 +01:00
10b108ed8a
Merge pull request #2030 from j-ed/master
...
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
a118906f26
fixes #2089
2013-03-04 21:45:21 +01:00
8c64484c5e
Merge pull request #2082 from owncloud/fix-permissions-class
...
Change remove() $user parameter to optional
2013-03-04 09:03:09 -08:00
b3df526ef2
Merge pull request #2079 from owncloud/fix_expire_function
...
fix expire function
2013-03-04 09:01:58 -08:00
ec2a9169b9
Change remove() $user parameter to optional
2013-03-04 11:44:09 -05:00
70014d37dc
fix expire function
2013-03-04 17:20:14 +01:00
d9c11a93c6
Corrects Files Layout in Trashbin
2013-03-04 21:34:50 +05:30
afe7ea8ca2
fix files table CSS specificity issue causing multiselect bar overlap, fix #2075
2013-03-04 16:10:11 +01:00
f96eef926e
Update app.php
...
replaced fixed path to app folder to support multiple apps pathes.
2013-03-02 12:33:38 +01:00
20a45d547a
Update app.php
...
suppress log messages like `include path for class \"OCA\\Files_Versions\\Storage\" starts with \"apps\/\"`.
2013-03-02 12:26:13 +01:00
4c03c3a31d
Update app.php
...
suppress log messages like `include path for class \"OCA\\Files_Trashbin\\Hooks\" starts with \"apps\/\"`.
2013-03-02 12:24:12 +01:00
5352f1e65b
Update app.php
...
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
2013-03-02 12:18:28 +01:00
d3e0a41dad
Update app.php
...
suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"`
2013-03-02 12:14:52 +01:00
2aaf38b5d3
Update app.php
...
suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
2013-03-02 12:12:33 +01:00
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
4b9863fa7d
Merge branch 'master' into from-insane-autoescape-to-p
...
Conflicts:
apps/files/templates/index.php
2013-03-01 23:09:20 +01:00
e3e4c28316
fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed
2013-03-01 21:43:34 +01:00
2e2cf28d30
Merge pull request #2005 from owncloud/trash_add_signals
...
add post_moveToTrash and post_restore signals to the trash bin
2013-03-01 09:41:07 -08:00
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
a01540a300
fix getVersions() call for the history view
2013-03-01 13:55:10 +01:00
e81b6395d4
make sure that the version app always work on the users real home folder and not on the mount point
2013-03-01 13:54:26 +01:00
df2a9a3c60
add additional parameter to signal
2013-03-01 12:44:43 +01:00
7c360c2491
add post_moveToTrash and post_restore signals to the trash bin
2013-03-01 12:20:29 +01:00
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
416607e559
Merge pull request #1979 from maelzx/patch-2
...
Fix window.location mistakes in previous code
2013-02-28 12:53:15 -08:00
301d065686
Sed was wrong
2013-02-28 20:21:14 +01:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
b5989c933f
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-02-28 10:39:23 -05:00
6d4b344f5d
Merge pull request #1397 from owncloud/trash_fileactions
...
Enable fileactions while viewing trash
2013-02-28 05:43:51 -08:00
12fd47af39
Trash: fix opening folders
2013-02-28 13:32:08 +01:00
a319fa8d47
Fix window.location mistakes in previous code
...
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);
However this is just tested in google chrome.
2013-02-28 11:26:42 +08:00
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
5f8bd07927
[Files] Use p() instead of echo
2013-02-27 23:40:30 +01:00
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
0b5b495535
[user_webdavauth] From echo to p
2013-02-27 22:06:50 +01:00
df1d90433d
[user_ldap] From echo to p
2013-02-27 22:04:57 +01:00
ab5e20a2c1
Just use rawurlencode in files list template
2013-02-27 21:53:46 +01:00
fc5331eaec
[files_versions] From echo to p
2013-02-27 21:50:22 +01:00
3ba8881bac
[files_trashbin] From echo to p
2013-02-27 21:46:37 +01:00
c9415e6529
[files] Unescape file size
2013-02-27 21:40:06 +01:00
221ecf63ab
[files_sharing] From echo to p
2013-02-27 21:37:14 +01:00
236507a19f
[files_external] From echo to p
2013-02-27 21:31:27 +01:00
7f8eddffe4
[files_encryption] Use p() instead of echo()
2013-02-27 21:20:37 +01:00
85209287bb
[Files] Use htmlspecialchars()
2013-02-27 21:19:11 +01:00
4860d03270
[Files] Use p() instead of echo
2013-02-27 21:14:15 +01:00
923c51773a
Trash: disable text editor from trash for now
2013-02-27 20:37:50 +01:00
f497970e30
Trash: fix download.php
2013-02-27 20:31:21 +01:00
d2fe600789
Trash: fix trash when default quota is used
2013-02-27 20:29:49 +01:00
429bf42e98
Merge master into trash_fileactions
2013-02-27 20:29:19 +01:00
0bc7d3bcf8
Added notes where to reuse old keys instead of generating new ones
2013-02-27 18:50:57 +00:00
953319a2c3
Made proxy class reuse existing keyfiles not gen new ones;
...
Added notes about reusing shareKeys
2013-02-27 18:46:44 +00:00
1f9551a382
Update apps/files/templates/part.list.php
...
prevent multiple slashes in a row when building URLs.
2013-02-27 19:09:37 +01:00
766a301a6b
Merge pull request #1031 from owncloud/external_storage_ui_feedback
...
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
69bc42f920
Deleting encrypted files with missing keyfiles/shareKeys now succeeds
2013-02-27 16:15:03 +00:00
14eae441eb
Unsharing a single file now works
2013-02-27 15:31:23 +00:00
f8bcd38d4d
remove admin settings from app.php
2013-02-27 15:53:08 +01:00
6cf147003f
Merge branch 'master' into versions_cleanup
2013-02-27 15:50:08 +01:00
9b220d0b93
rename History to Versions
2013-02-27 15:46:49 +01:00
d9e75c2b92
remove admin settings for versions
2013-02-27 15:44:02 +01:00
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
49f2a2d25d
Merge pull request #1953 from owncloud/escape_regular_expressions
...
escape regular expressions; fix typo in variable name
2013-02-27 04:29:17 -08:00
a54be4acc4
Merge pull request #1948 from owncloud/improve_user_sorting
...
Sort after display name + LDAP server side sorting
2013-02-27 02:39:22 -08:00
58b06c5c9a
Merge pull request #1905 from owncloud/fix-share-icons
...
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
5c7e3cf2e2
escape regular expressions; fix typo in variable name
2013-02-27 10:51:32 +01:00
f26c477433
Merge pull request #1949 from owncloud/fix-dropbox
...
Fix undefined root parameter in Dropbox storage
2013-02-26 16:14:45 -08:00
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
25cf18f614
Fix undefined root parameter in Dropbox storage
2013-02-26 17:52:06 -05:00
64551ee06f
LDAP: sort users on server-side
2013-02-26 22:27:09 +01:00
aae9b0b1bf
Started work on post unshare hook
...
Development snapshot
2013-02-26 18:33:31 +00:00
4550ae6a69
Shared encrypted files now readable by both sharer and sharee
2013-02-26 18:11:29 +00:00
07e9f8d0d3
remove general CSS from IE specific rules, displays Shared state permanently again
2013-02-26 18:49:20 +01:00
c94974cb97
Add missing echo
2013-02-26 16:10:52 +01:00
8c9d0d1f5b
cleanPath needs to be public
2013-02-26 12:24:52 +01:00
ea83acedeb
Fix target path and reuse mtime
2013-02-26 01:43:04 -05:00
8983465210
Correct parent folders' ETags for all users with access to a shared file
2013-02-26 01:21:48 -05:00
5b50bc8c0a
Fix Dropbox and Google ui
2013-02-25 19:45:01 -05:00
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
1d83d76b45
fixed bug that prevented a newly created file to be opened with registered files actions
2013-02-25 17:50:17 +01:00
f50be25704
Merge pull request #1864 from owncloud/fix_display_default
...
LDAP: simplify default for user home settings, fixes wrong display of de...
2013-02-25 08:23:32 -08:00
ede0e7d6bc
Merge pull request #1890 from owncloud/trashbin_fix
...
fix quota calculation for trash bin and versions
2013-02-25 07:59:09 -08:00
3ef8c0bda3
Merge pull request #1892 from owncloud/files_remove_row_on_delete
...
delete table row if file was deleted instead of just hide it
2013-02-25 07:44:35 -08:00
dbf2bfc8cd
delete table row if file was deleted instead of just hide it
2013-02-25 16:32:54 +01:00
b917646516
fix quota calculation
2013-02-25 16:12:44 +01:00
272f854ce6
fix getVersion call
2013-02-25 15:34:36 +01:00
664e7a3fc2
use distance option to delay dragging in sane browsers
2013-02-25 15:08:14 +01:00
e30b3f64e0
fix line endings
2013-02-25 14:29:31 +01:00
4c980a4851
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
2013-02-25 14:26:59 +01:00
a37577e007
Merge pull request #1810 from owncloud/trashbin_encryption
...
Trashbin file encryption support
2013-02-25 05:13:38 -08:00
7da97550df
some final code clean-up
2013-02-25 14:12:56 +01:00
7ebbecd81f
always use "==="
2013-02-25 14:09:20 +01:00
3f48bebe92
Merge pull request #1827 from owncloud/fix_getVersions
...
fix getVersions(), we need to get the correct user and filename
2013-02-25 04:59:47 -08:00
660670ec68
Merge pull request #1832 from owncloud/fix_1779
...
use :hover pseudo class to set opacity
2013-02-25 04:35:34 -08:00
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
ca1b94d890
make sure that home folders are mounted correctly before write/read keyfile
2013-02-25 12:29:07 +01:00
4dea6a6228
Merge branch 'master' into trashbin_encryption
...
Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
2013-02-25 12:14:51 +01:00
632ca9f06d
Merge branch 'master' into update-expire-function
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-02-25 11:14:06 +01:00
9ee5069f2a
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
...
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
8f65916904
Merge pull request #1882 from owncloud/required_version
...
Set required owncloud version to 4.93
2013-02-25 00:37:22 -08:00
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
36827d1549
Fix variable
2013-02-23 16:09:56 -05:00
00e28cf156
Return unknown free space for shared root folder so we can still upload partial files
2013-02-23 15:42:01 -05:00
b6a21cc4b5
Fix WebDAV uploading of partial shared files
2013-02-23 15:32:59 -05:00
09a2730f57
Include etag field for folder contents
2013-02-23 15:22:34 -05:00
a417028ccd
Merge pull request #1862 from owncloud/whitespace-cleanup
...
Whitespace cleanup
2013-02-23 11:39:13 -08:00
6aa0ecc9b8
[tx-robot] updated from transifex
2013-02-23 00:05:33 +01:00
e4e915fa3b
LDAP: simplify default for user home settings, fixes wrong display of default value in settings
2013-02-22 21:26:07 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
d8137fdf66
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
2013-02-22 16:43:11 +01:00
31c434b795
the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely
2013-02-22 16:08:08 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
40efeb9187
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
2013-02-22 16:02:27 +01:00
9edec542c5
mount users home before write/read file to it, necessary to deal with external homes
2013-02-22 13:15:47 +01:00
df76e0d1c3
use the same string lengths like the file cache
2013-02-22 10:05:08 +01:00
59582e0f3f
Fix review issues
2013-02-22 00:21:06 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
db8dbb9847
Style cleanup files_versions
2013-02-21 23:47:21 +01:00
fb7de77474
Style cleanup files_trashbin
2013-02-21 23:47:21 +01:00
59a3238d1a
Style cleanup files_sharing
2013-02-21 23:46:50 +01:00
629097bee7
increase db fileds for usernames
2013-02-21 22:44:44 +01:00
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
859caee66a
use :hover pseudo class to set opacity
2013-02-21 16:52:18 +01:00
89ef06cd79
rename app to 'deleted files'
2013-02-21 16:34:22 +01:00
0a5457c550
fix getVersions(), we need to get the correct user and filename
2013-02-21 14:40:16 +01:00
2436d01985
calculate trashbin size per user
2013-02-21 12:37:13 +01:00
c24ec867f9
calculate versions size per user
2013-02-21 12:20:29 +01:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
6aed7abfbe
Merge branch 'master' into trashbin_encryption
2013-02-21 00:05:30 +01:00
fc1fba2304
don't show empty trash bin message for sub folders
2013-02-21 00:02:52 +01:00
3eb9cd035f
Merge branch 'master' into trash_bin_delete_selected
2013-02-20 23:46:15 +01:00
c1847aaf51
change for loop to make it hopefully work with IE
2013-02-20 22:32:44 +01:00
2d6efae257
update path to deleted files
2013-02-20 22:19:23 +01:00
b685aa8bcb
some fixes for the keyfile handling
2013-02-20 22:17:04 +01:00
3b9d9eea09
replaced for in loops with normal enumerating loops to fix #1803
2013-02-20 21:57:50 +01:00
2d267501a1
Development snapshot
...
Added comments
Added methods
2013-02-20 19:18:00 +00:00
5329c9ea31
update script which copies all trash bin related files to user/files_trashbin
2013-02-20 19:18:34 +01:00
5ce6d1fb57
reuse delete() function in expire()
2013-02-20 18:00:15 +01:00
4b5a662e09
delete keyfiles if file in trash bin gets deleted permanently
2013-02-20 17:58:04 +01:00
383194cb44
Merge pull request #1753 from owncloud/Extra_info
...
Ability for the action handler to get more info on the current file
2013-02-20 08:33:57 -08:00
57fbfaf86a
Merge pull request #1787 from maelzx/patch-1
...
Update apps/files_versions/js/versions.js
2013-02-20 08:32:36 -08:00
273e1a146b
switch to json encoded file list
2013-02-20 16:33:45 +01:00
3a364639b7
use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names
2013-02-20 15:17:32 +01:00
c49e73d43c
restore filekeys from trash bin
2013-02-20 15:14:32 +01:00
4d0df9614b
put all trash bin content in user/files_trashbin
2013-02-20 13:34:32 +01:00
d426a09f90
Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api
...
Versioning app use new filesystem api
2013-02-20 03:38:37 -08:00
05a8766cbc
attach on() events to external storage table, dom events in the table will always bubble up here
2013-02-20 12:06:08 +01:00
94e5de8fd0
Update apps/files_versions/js/versions.js
...
Fix "All version..." button not clickable.
Reason is Google Chrome blocking inline javascript execution.
2013-02-20 11:14:24 +08:00
3dfb1628ce
Include etags for the root of the shared folder
2013-02-19 20:42:48 -05:00
702c27b0e6
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
2013-02-19 19:12:14 -05:00
3878203679
Merge pull request #1731 from owncloud/unknown-freespace
...
Give storage backends the option to define having no known free space
2013-02-19 15:18:12 -08:00
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
1b880f2f96
Moved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI)
...
Fixed bug preventing sharing with users other than 'ownCloud'
Added comments
Moved functionality into filterShareReadyUsers()
Other changes
2013-02-19 19:16:50 +00:00
686254ac11
move2trash() handles keyfiles
2013-02-19 18:45:46 +01:00
14ae373dfe
Fixed wrong array key reference
2013-02-19 17:42:37 +00:00
fd629983fa
remove debug output
2013-02-19 17:10:32 +01:00
109fee7673
remove todo, it is already solved
2013-02-19 14:47:45 +01:00
211e651d72
add timestamp to function call; fix trash.js to handle multiple delete operation at once
2013-02-19 12:38:00 +01:00
7bfbfe6562
initialize $result
2013-02-19 12:24:51 +01:00
f45b268b93
rebase to master
2013-02-19 12:16:54 +01:00
e6c39fc3e7
change $_REQUEST to $_POST; fix check if file was successfully deleted
2013-02-19 12:14:44 +01:00
95751874a1
Merge pull request #1740 from houqp/issue#1688
...
Bug fix for Issue#1688
2013-02-19 03:09:03 -08:00
ac1b2a74ef
add missing paramenter to post request
2013-02-19 11:50:29 +01:00
815e964362
use instead of
2013-02-19 11:49:41 +01:00
3d7545269b
Merge pull request #1764 from owncloud/Undelete_directory_fix
...
Fix for Undelete directory action
2013-02-19 01:34:49 -08:00
51cef9d8f0
allow user to delete selected files from the trash bin permanently
2013-02-19 10:24:21 +01:00
9a93db9642
remove obsolete variables
2013-02-19 10:23:34 +01:00
c56542c58d
Merge pull request #1771 from owncloud/mountconfig
...
JSON mount config: no pretty print
2013-02-18 22:15:56 -08:00
0e9b9f4f5f
no pretty print
2013-02-19 00:48:38 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
f343d9d247
files_versions no longer contains a personal settings page -> remove the call
2013-02-18 23:04:22 +01:00
e2f87e456f
Calculate size for existing directories only
2013-02-18 23:48:08 +03:00
37352bba96
close file handler after readdir()
2013-02-18 18:16:19 +01:00
0ab87204ec
Merge pull request #1759 from owncloud/redirect_fix_1737
...
fix redirect, use the new routing
2013-02-18 07:13:19 -08:00
c0ac98066e
check filename and timestamp in Trashbin's file_exists method
2013-02-18 09:49:50 -05:00
3bf9aa408e
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
2013-02-18 15:13:25 +01:00
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
4a3374ecf8
fix redirect, use the new routing
2013-02-18 14:38:29 +01:00
fde0a8b520
Add Ability to the app to detect more details on the file
2013-02-18 13:22:43 +03:00
efa024cc62
fix getUidAndFilename() function
2013-02-18 11:19:40 +01:00
79284b8e57
Sanitize HTML
2013-02-18 08:11:59 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
8e76a98d2f
Merge pull request #1709 from owncloud/style-cleanup-files_external
...
Style cleanup files_external
2013-02-17 11:53:51 -08:00
90939c8f12
Merge pull request #1708 from owncloud/style-cleanup-user_ldap
...
Style cleanup user_ldap
2013-02-17 07:02:45 -08:00
325746ae45
Merge branch 'master' into fix-googledrive
2013-02-17 09:41:37 +01:00
0f8058cb12
Merge pull request #1699 from owncloud/multiselect-bar-fix
...
fix multiselect bar offset on shared page, close #1339 finally
2013-02-17 00:39:16 -08:00
71472c21ed
Merge pull request #1730 from owncloud/ldap_fix_warnings
...
LDAP: check array with isset first to avoid warnings about undefined ind...
2013-02-17 00:25:40 -08:00
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
4b4b1f8692
Properly delete empty directories in Trashbin
...
Instead of checking delted file size, we do a real check.
this fixes #1688
2013-02-16 17:44:51 -05:00
50759607e4
add file_exists method to files_trashbin app
2013-02-16 17:42:06 -05:00
17d21a84b6
Merge pull request #1729 from owncloud/fix_1727
...
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
2013-02-16 05:48:18 -08:00
4708d4549d
Add missing requesttoken
...
This is a trivial fix for a regression caused by #1648
2013-02-16 13:28:49 +01:00
cad65915a7
look where you are typing ...
2013-02-16 12:55:36 +01:00
e1700c28fa
pretty print json
2013-02-16 12:10:54 +01:00
d96146a017
Give storage backends the option to define having no known free space
...
When this is the case only the configured max upload size is taking into account for uploading
2013-02-16 03:27:50 +01:00
a28df74ee5
LDAP: check array with isset first to avoid warnings about undefined index
2013-02-16 02:33:19 +01:00
bef48bad8b
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727
2013-02-16 02:06:45 +01:00
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
6c197227d0
Join split translated strings
2013-02-15 15:58:52 +01:00
5616690506
Style cleanup files_external
2013-02-15 15:58:52 +01:00
925de78cec
Join split translated strings
2013-02-15 15:51:55 +01:00
92a36ca8b8
Join short comment lines
2013-02-15 15:45:34 +01:00
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
08b68aac6c
check if glob() returns any results, fix for stable45 was already approved by pull request #1695
2013-02-15 12:29:52 +01:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
1ef2ecd6e8
Style cleanup user_ldap
2013-02-14 22:16:48 +01:00
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
d1dcb282cb
fix multiselect bar offset on shared page, close #1339 finally
2013-02-14 17:40:08 +01:00
8c35bbcba7
remove debug output, fix typo in file names
2013-02-14 16:33:57 +01:00
6a250c877f
fixing javascript errors IE8 in personal settings
2013-02-14 16:10:52 +01:00
f4c9d4c067
Merge pull request #1682 from owncloud/fix-ie8-master
...
Fix ie8 master
2013-02-14 06:10:00 -08:00
b05f05ec4a
make store function static
2013-02-14 14:26:49 +01:00
ae172ce7de
improved description of the trash bin app
2013-02-14 13:01:02 +01:00
bd22e948ca
call 'Trash bin' 'Deleted files'
2013-02-14 12:32:14 +01:00
a03d70209f
fixing undefined originalEvent
2013-02-14 12:19:50 +01:00
87b98dab25
use new filesystem to mount users home
2013-02-14 11:56:41 +01:00
b8a6bca2d3
always show checkbox when selected, also in IE8, fix #1621
2013-02-14 10:40:23 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
e1e77fe3be
Merge pull request #1598 from owncloud/fixing-1424-master
...
Fixing 1424 master
2013-02-13 12:59:30 -08:00
5005195db0
create keypair for ownCloud with empty passphrase, will be used for public link shares
2013-02-13 17:57:45 +01:00
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01:00
1e45453da2
LDAP: format dn before using it, not other way round. fixes #1605
2013-02-13 14:49:18 +01:00
bc43dd704f
Merge branch 'master' into fixing-1424-master
...
Conflicts:
settings/js/users.js
2013-02-13 01:18:01 +01:00
Sam Tuke
Björn Schießle
Arthur Schiwon
Florin Peter
Bart Visscher
icewind1991
Morris Jobke
Robin Appelman
Lukas Reschke
Jenkins for ownCloud
Michael Gapczynski
Frank Karlitschek
Florin Peter
Markus Goetz
kondou
Sam Tuke
Jörn Friedrich Dreyer
Bernhard Posselt
Jan-Christoph Borchardt
raghunayyar
Björn Schießle
sherbrecher
Brice Maron
Tom Needham
Tom Needham
j-ed
Georg Ehrke
maelzx
Victor Dubiniuk
Qingping Hou