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
037c3ee4ec
fixing issues with UTF8 characters in translatable strings
2013-02-13 00:23:37 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
010c4c2891
adding spinner while talking to the backend
2013-02-12 23:27:31 +01:00
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
a692264fa4
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
2013-02-12 17:00:33 +01:00
d1bbb30385
also find users with access to the file if a folder above the actual file was already shared
2013-02-12 16:48:04 +01:00
318c0b3408
user name and password need to be encoded as well
...
fixes #1652
2013-02-12 15:56:31 +01:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
14e3d77d64
https://github.com/owncloud/core/pull/1598#discussion_r2976684
2013-02-12 13:10:26 +01:00
1e5d03da80
use right location of the file is the source and not the target it is shared to
2013-02-12 12:45:54 +01:00
b6ee118841
Merge pull request #1604 from owncloud/fix_ldap_internalname_generation
...
Improve generation of interal user names resp. group display names
2013-02-12 03:37:40 -08:00
8eef919a75
take group shares into account if we retrieve the list a all recipients
2013-02-12 12:08:34 +01:00
a9c77ebaf8
Check requesttoken
2013-02-12 11:35:16 +01:00
6b594c1eb8
fixing namespace
2013-02-12 11:05:12 +01:00
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
646d60ee83
fixing namespace
2013-02-12 11:00:38 +01:00
2507e0da1d
Merge pull request #1636 from owncloud/fixing-smb-master
...
Fixing smb master
2013-02-11 23:38:03 -08:00
ad6e133ca6
Replace another mount point placeholder
2013-02-11 20:35:40 -05:00
6eba790a75
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/dropbox.js
apps/files_external/js/google.js
apps/files_external/js/settings.js
apps/files_external/lib/amazons3.php
apps/files_external/lib/dropbox.php
apps/files_external/lib/google.php
apps/files_external/lib/smb.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
lib/filestorage.php
2013-02-11 20:27:05 -05:00
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
6f08b1f829
Change wordings
2013-02-11 18:04:54 -05:00
808a13922c
Remove the leading slash from the filename for opendir
2013-02-11 17:55:44 -05:00
5731a1b01c
introduce new virtual method hasUserListings() to determine if a user backend can list it's users.
2013-02-11 22:01:52 +01:00
037fcde133
Merge branch 'master' into fixing-1424-master
2013-02-11 21:42:27 +01:00
0c1174770d
use urlencode not rawurlencode
2013-02-11 21:25:29 +01:00
2cb2644254
Merge pull request #1613 from owncloud/multiselect-row-width
...
Files: fix width of table header when files are selected
2013-02-11 11:49:08 -08:00
392be78162
the path must be encoded because within the smb4pph code it's decoded again - pretty easy but still .....
2013-02-11 20:32:44 +01:00
ca99ff31dc
Merge pull request #1627 from owncloud/home-svg
...
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 08:02:14 -08:00
130f1006c1
Merge pull request #1626 from owncloud/share-indicator-position
...
Files: always show share action at the right
2013-02-11 07:43:04 -08:00
9c8f5de6c6
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 16:19:22 +01:00
37ea784294
Files: always show share action at the right
...
Fixes #1619
2013-02-11 16:09:04 +01:00
7776d047b2
[files_external] fix config gui for all users
...
backport of 9e05781ec2
2013-02-11 15:49:49 +01:00
f512dea3be
[files_external] fixing some undefined index
2013-02-11 15:45:10 +01:00
89bc26210a
[files_external] removing function as it's the same in the base class - THX Robin
...
Conflicts:
apps/files_external/lib/smb.php
2013-02-11 15:44:35 +01:00
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
5a64c96d06
go back to preUnshare hooks since sharing doesn't trigger post unshare hooks
2013-02-11 15:13:42 +01:00
eed48c8159
Merge pull request #1608 from owncloud/fix-shared-links
...
Fix shared links
2013-02-11 05:17:24 -08:00
9b49832090
unshare all should work the same like unshare single users
2013-02-11 13:50:11 +01:00
3e3cee98c8
- moved the enrcyption of the filekey ifg file gets shared from the post shared hook to
...
Crypt::encKeyfileToMultipleUsers() because this can be reused if files get unshared
- switch from preUnshare hook to postUnshare hook because afterward we can simply get the
updated list of users with access to the file and call Crypt::encKeyfileToMultipleUsers()
2013-02-11 13:28:37 +01:00
d0d6d973a9
Share: fix table head color for public shared folders
2013-02-11 12:35:39 +01:00
25b5b39e7a
Files: fix width of table header when files are selected
2013-02-11 12:23:53 +01:00
2787aafae6
added some TODOs
2013-02-11 12:12:21 +01:00
a1db280a46
Share: fix downloading selected files from public shared folder
2013-02-11 11:54:44 +01:00
7fa9181a26
Share: fix sorting of files in public shared folder
2013-02-11 11:50:41 +01:00
bbf672f453
Share: fix nested subfolders in public shared folders
2013-02-11 11:48:49 +01:00
7842b416d1
Share: fix breadcrumbs for public shared folder
2013-02-11 11:44:18 +01:00
762688762f
Share: fix downloading files from a public shared folder
2013-02-11 11:38:52 +01:00
d17d838ecc
Updated specfile
2013-02-11 10:34:23 +00:00
92f06243be
Implementing sharing support
...
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
2013-02-11 10:21:23 +00:00
d0a005ea97
Sharing: fix position of file list in public link view of folder
2013-02-11 11:20:51 +01:00
ad360296b9
Update tests and apps to the new \OC\Files\Filesystem::init signature
2013-02-11 11:06:09 +01:00
d7d9e2a15a
fix positioning of password label, add autofocus to password field
2013-02-11 10:20:31 +01:00
a6bd086867
Set permissions to read only
2013-02-10 20:01:25 -05:00
56df48b40f
Remove additional old compatibility code
2013-02-10 19:14:20 -05:00
0d3c58d6b6
Replace filename key with fileTarget in template
2013-02-10 19:13:13 -05:00
eeb409a6ec
Merge branch 'master' into fix-shared-links
2013-02-10 19:10:06 -05:00
8e3b8c7f47
Proper fix for shared links
2013-02-10 19:09:58 -05:00
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
afc9fe419a
adjust copyright
2013-02-10 21:53:27 +01:00
dbb4be903c
LDAP: change generation of internal names. Use UUID for users. Change to sequential numbers for groups as they are still used as display names
2013-02-10 21:52:57 +01:00
046ede8e46
Merge pull request #1558 from schiesbn/trashbin_sizelimit
...
Trashbin sizelimit
2013-02-10 09:02:05 -08:00
f58ed7a509
no need to implement createUser in web dav auth
2013-02-10 17:31:12 +01:00
980c197fbf
Merge pull request #1594 from hkjolhede/master
...
Corrected namespace path for files_external SFTP backend
2013-02-10 06:47:22 -08:00
72a33e01e6
Merge pull request #1585 from owncloud/fix_breadcrumb_resizing
...
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 06:38:19 -08:00
513bf0b999
Update apps/files_external/lib/config.php
...
Corrected minor error
2013-02-10 15:37:05 +01:00
f141f8b523
Add further capabilities to /cloud/capabilitites api call
2013-02-10 14:42:23 +01:00
ff09a1f37b
don't use OC_FilesystemView()
2013-02-10 14:17:18 +01:00
6f785e211b
Merge pull request #1030 from hkjolhede/master
...
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
421bacc33a
Final changes from icewind1991
2013-02-10 13:11:29 +01:00
e63c4e3ea8
Change capabilities exposure for files_versions since it extends files
2013-02-10 12:41:27 +01:00
bf4a073dca
count divs in actions instead of action div itself (is set to 100%)
2013-02-10 12:38:16 +01:00
1df8a5a774
Updated phpseclib from git + requested style changes
2013-02-10 12:35:49 +01:00
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
1c56539c01
Merge pull request #1551 from owncloud/fix_files_multiselect
...
Fix filelist shifting up one row on (multi)select
2013-02-10 02:54:12 -08:00
b44c18d164
Don't run external storage tests on default
2013-02-10 11:39:32 +01:00
b7b50f8082
remove hascontrols from trash bin file list table
2013-02-10 11:14:03 +01:00
76a6209c8e
Merge pull request #1564 from schiesbn/trash_bin_breadcrumbs
...
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
2013-02-10 01:56:11 -08:00
c6985d6cd4
Merge branch 'master' into fix-shared-links
2013-02-10 00:54:20 -05:00
71affd528c
Fix public links
2013-02-10 00:53:58 -05:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
c6622301e5
Security bug
2013-02-09 23:49:21 +01:00
bcf98879cb
Just a little cleaner in touch
2013-02-09 23:33:01 +01:00
9e42a36fd8
Update to touch
2013-02-09 23:29:58 +01:00
674955d1b6
Spelling mistake
2013-02-09 20:35:48 +01:00
71d3903cfd
Added unittest
2013-02-09 20:34:21 +01:00
b3e59ca1e3
Work on post_share hook for files_encryption
...
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
2013-02-09 18:39:32 +00:00
96cfe37587
Update to conform to API changes
2013-02-09 19:08:39 +01:00
2a650bcbe9
Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir
...
extract common code
2013-02-09 09:57:23 -08:00
9bf1f22d5f
Merge pull request #1383 from owncloud/files_encryption-style-fixes
...
first style fixes - @samtuke: I added some TODO regarding undefined vari...
2013-02-09 09:04:47 -08:00
7f58e27495
cleanup - more to come after
2013-02-09 18:01:38 +01:00
419eced65c
Remove hascontrols - use original positioning.
...
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
2013-02-09 17:54:56 +01:00
3b029d551c
corrected namespace
2013-02-09 15:57:33 +01:00
676f89bbdb
extract common code
2013-02-09 14:42:03 +01:00
81a281a140
Modified to new class structure
2013-02-09 14:12:17 +01:00
2b4823d62d
Deleted phpseclib/tests
2013-02-09 14:07:18 +01:00
41fa65e7be
Merge branch 'master' of https://github.com/owncloud/core
...
Conflicts:
apps/files_external/appinfo/app.php
2013-02-09 14:05:33 +01:00
60344bf1dd
Another attempt on the filelist heading.
2013-02-09 14:00:26 +01:00
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
1aba986d9f
Fixed bug causing nested file read over webdav to fail
2013-02-09 12:42:18 +00:00
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
0c73cae77b
Merge pull request #1565 from owncloud/fix_replacing
...
remove code properly to make @DeepDiver1975 happy ;)
2013-02-09 03:58:06 -08:00
5102596e6d
Add capabilities exposure to the versioning app
2013-02-09 11:53:54 +00:00
b95bc663af
Merge branch 'master' into files_encryption-style-fixes
...
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php
2013-02-09 11:52:11 +00:00
d5dc8ae726
initialize breadcrumbs array
2013-02-09 12:41:47 +01:00
2137bbe330
remove code properly
2013-02-09 12:38:40 +01:00
7507b1ddd3
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
2013-02-09 12:32:08 +01:00
ab4ae2b952
Merge pull request #1560 from owncloud/fix_replacing
...
remove (comment out) old code to fix replacing of files
2013-02-09 03:28:40 -08:00
c5fd9cc0c2
Merge pull request #1562 from schiesbn/fix_naming
...
rename trash to trash bin
2013-02-09 03:21:30 -08:00
ca243f3fac
Merge pull request #1521 from schiesbn/label_fixed
...
don't call the delete button unshare, unshare operation no longer available
2013-02-09 03:14:25 -08:00
6e9f434bda
rename trash to trash bin
2013-02-09 12:01:49 +01:00
8961e675c7
remove (comment out) old code to fix replacing of files
2013-02-09 11:28:13 +01:00
60cc7d0ba2
debug output removed
2013-02-09 11:11:07 +01:00
b24e3f1d32
comment added
2013-02-09 11:07:47 +01:00
5a15221910
Merge pull request #1550 from owncloud/fix-files-download-links
...
Fix files router download links
2013-02-09 01:28:25 -08:00
3918325520
Merge pull request #1541 from owncloud/fixing-1540-master
...
remove undefined function FileList.finishDelete
2013-02-09 01:17:11 -08:00
764409117a
Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
...
Fix ldap stored homedir
2013-02-11 02:20:03 -08:00
1c94ec71ef
LDAP: fix database cleanup in update script
2013-02-09 13:10:53 +01:00
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
680af2e6ca
Fix filelist shifting up one row on (multi)select
2013-02-08 22:30:27 +01:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +01:00
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01:00
40f6e1eba0
Merge pull request #1534 from owncloud/files_l10n
...
Add translation support back to move/rename
2013-02-08 03:58:17 -08:00
9bdc43e1fc
Files: explicitly define
2013-02-08 12:03:28 +01:00
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
f93f9dd50c
merge master into trash_fileactions
2013-02-08 00:11:54 +01:00
5ef9d96d10
Files: rename 'space' to 'storage' in upload.php
2013-02-07 23:59:14 +01:00
b67251b0ff
Files: add translation support back to move/rename
2013-02-07 23:57:18 +01:00
a93282ab16
Merge pull request #1507 from tripflex/master
...
remove float left from actions div class
fixes #1504
2013-02-07 12:49:14 -08:00
c0154558c7
Merge pull request #1526 from owncloud/l10n-support-master
...
L10n support master
2013-02-07 12:38:36 -08:00
808de17aeb
use never more that 50% of available disc space for the trash bin
2013-02-07 17:37:46 +01:00
e0212c1174
l10n support enhanced in files_versions
2013-02-07 16:34:57 +01:00
18a288a3c3
l10n support enhanced in files_trashbin
2013-02-07 16:31:04 +01:00
488ab0dba2
l10n support enhanced in files_version
2013-02-07 16:17:54 +01:00
6cff5418a7
Merge pull request #1524 from owncloud/fix_ldaps_tls_setting
...
LDAP: don't try to put TLS on top of already secure connection (will fail).
2013-02-07 07:06:35 -08:00
15e383fd01
Typo
2013-02-07 16:05:45 +01:00
ca43e09276
keep track of trash bin size
2013-02-07 15:16:29 +01:00
6299704dfd
Merge pull request #1518 from schiesbn/trash_layout_fix
...
add class hascontrols to trash bin file table
2013-02-07 04:40:51 -08:00
ce293b8efc
remove debug output
2013-02-07 13:16:15 +01:00
7e874af2c8
rename OCA_Trash to OCA\Files_Trashbin
2013-02-07 13:14:45 +01:00
c81d7b0b90
OCA_Versions is now known as OCA\Files_Versions
2013-02-07 12:45:27 +01:00
c72537cd85
don't call the delete button unshare, unshare operation no longer available
2013-02-07 12:42:09 +01:00
17384994d6
add class hascontrols to trash bin file table
2013-02-07 10:13:09 +01:00
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
93b1597395
Merge pull request #1506 from owncloud/files_encryption
...
Files encryption
2013-02-06 11:47:55 -08:00
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
faf6cb0868
Merge branch 'master' into files_encryption
2013-02-06 18:26:44 +00:00
954a627483
Added comment
2013-02-06 18:24:35 +00:00
cc19df22a1
Remove old OC4 link compatibility
2013-02-06 13:09:04 -05:00
2b07afc8ab
Removed debugging code
2013-02-06 17:59:47 +00:00
81792448ae
Merge pull request #1472 from owncloud/files_versions-cleanup
...
files_versions cleanup
2013-02-06 08:53:20 -08:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
fd171a4f34
copy&paste bug, no fetchAll() needed here
2013-02-06 16:50:16 +01:00
8cc7bab0e5
delete debug code
2013-02-06 16:25:10 +01:00
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
a3289d3991
Merge branch 'master' into files_encryption
2013-02-06 15:08:53 +00:00
6870add18f
Development snapshot
2013-02-06 15:08:36 +00:00
58a3a6a573
Merge pull request #1487 from owncloud/fix-1420-master
...
Replace OC_FileCache usage in files_versions
2013-02-06 06:45:01 -08:00
16a5ace434
Fixed bug causing encrypted files to be doubly encrypted at login
...
Added comments and docblocks
2013-02-06 14:30:40 +00:00
781d247b39
LDAP: better detect timeouts. do not try to reconnect. do not try to bind when connection failed. makes ownCloud more responsive, esp. with multiple server connections configured
2013-02-06 14:32:00 +01:00
e122fdbcb6
LDAP: when ldaps and tls are configured, disable the latter one - they do not work together. ldaps already creates a secure connection.
2013-02-06 14:30:17 +01:00
33ec26f6d6
LDAP: info string improved
2013-02-06 14:24:00 +01:00
af2acadc66
LDAP: fix settings handling of homeFolderNamingRule option
2013-02-06 13:04:35 +01:00
0e548283fc
Replace OC_FileCache usage in files_versions
2013-02-06 08:00:57 +01:00
993831b6df
LDAP: version bump -> clean up database
2013-02-06 02:29:55 +01:00
c6aa370604
code style
2013-02-06 02:29:03 +01:00
3cef8f1216
LDAP: do not store user home as it destroys configurability. always fetch it. use of cache is save however, it is cleared when settings are saved
2013-02-06 02:28:09 +01:00
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
3b9e2f1bab
Merge branch 'master' into files_encryption-style-fixes
...
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-02-05 18:43:55 +00:00
a528f96b84
Merge branch 'master' into files_encryption-style-fixes
2013-02-05 18:23:03 +00:00
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
20b1d12cbf
Fixed comment typo, wrapped return value conditional on var assignment in session{}
2013-02-05 17:28:26 +00:00
4ba0ab7f65
Added missing translation wrapping
2013-02-05 17:22:59 +00:00
b84e83261e
Added notice to personal settings indicating what filetypes are not encrypted
2013-02-05 17:06:15 +00:00
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
680c5b3dad
Removed debugging output
2013-02-05 16:11:50 +00:00
221b69dd0e
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
2013-02-05 16:09:01 +00:00
a1f200c1e5
Cleaned up path formatting with new method stripUserFilesPath()
2013-02-05 15:59:28 +00:00
53248a9b60
Recryption of legacy encrypted files now working on login
2013-02-05 15:35:29 +00:00
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
927d4c98a1
Fixed todos: undefined vars and unreachable code
2013-02-05 13:12:34 +00:00
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
68fe6d0077
Merge pull request #1432 from owncloud/add_requesttoken
...
[user_webdavauth] add requesttoken
2013-02-04 12:02:16 -08:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
fee3f80501
Merge pull request #1434 from owncloud/trashbin_CSRF
...
[files_trashbin] Add CSRF token
2013-02-04 02:14:52 -08:00
8add89ced1
OCP\JSON instead of OCP\User
2013-02-04 09:15:11 +01:00
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
5ceddabaa6
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
...
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
018c5f69c0
[files_trashbin] Add CSRF token
2013-02-03 22:49:12 +01:00
bce59c3945
[user_webdavauth] add requesttoken
2013-02-03 19:58:55 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
Björn Schießle
Björn Schießle
Arthur Schiwon
Jenkins for ownCloud
Sam Tuke
Bernhard Posselt
sherbrecher
Robin Appelman
Frank Karlitschek
Brice Maron
Lukas Reschke
Tom Needham
Tom Needham
Michael Gapczynski
Jan-Christoph Borchardt
Bart Visscher
raghunayyar
Jörn Friedrich Dreyer
j-ed
Georg Ehrke
maelzx
Victor Dubiniuk
Qingping Hou
hkjolhede
Sam Tuke
Thomas Tanghus
Myles McNamara