03c7a52bc5
[tx-robot] updated from transifex
2013-04-20 02:02:09 +02:00
0701d0019b
Merge pull request #3020 from owncloud/cleaner-webdav-reason
...
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
2013-04-19 07:56:41 -07:00
e1c5b31d65
Test if we want a 3rdparty style/script before checking the 3rdparty root
2013-04-19 16:09:39 +02:00
25e7dc1ec5
Merge pull request #3024 from owncloud/file-delete-action
...
Fix #1164 and fix showing spinner on delete
2013-04-19 06:08:09 -07:00
10be42f5b7
Cache: only look for child entires when doing a move operation when moving a folder
2013-04-19 15:06:48 +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
7ac49dd52a
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
2013-04-19 12:44:54 +02:00
4ccc9d896a
Merge pull request #3010 from owncloud/fix-cookie_path
...
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-19 01:17:35 -07:00
938b12236a
modify password clone to password type right on submit to prevent the browser remind the content
2013-04-19 10:06:18 +02:00
1ad0c11136
[tx-robot] updated from transifex
2013-04-19 01:57:39 +02:00
7a2be0c5dc
Make divider not selectable
...
Very hacky
2013-04-19 00:39:42 +02:00
0e1970438b
fixed incorrect filesize, download via web is now possible
...
fixed broken file-info
2013-04-18 22:34:22 +02:00
e09c17de5b
Added explanation
2013-04-18 22:29:50 +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
e4876c9117
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-18 21:11:58 +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
fe58e4b1a6
we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again
2013-04-18 17:48:16 +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
79218be1d2
Priorize common languages.
2013-04-18 15:14:42 +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
9facb67fab
Let autoloader resolve paths under apps lib directory.
2013-04-18 08:30:09 +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
739d8eb152
Merge pull request #2986 from eMerzh/upgrade_warn
...
Warn when we do an upgrade
2013-04-17 12:43:15 -07:00
43d0f1fabf
Warn when we do an upgrade
2013-04-17 21:29:14 +02:00
a3e5da834b
Merge pull request #2925 from owncloud/navigation-icon-fix
...
fix navigation hover effect, documentation
2013-04-17 10:20:36 -07:00
d83adb8b84
remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px
2013-04-17 17:36:30 +02:00
3d47c62a20
apply navigation hover effect directly to img and span, cleaner code
2013-04-17 17:23:12 +02:00
6dd8c79461
Development snapshot
...
Working on stream{} write
2013-04-17 17:20:37 +02:00
c8cafcefe4
move password warning more relevant below password field, un-nest log in warning
2013-04-17 17:16:15 +02:00
21bcb95e2a
move warning and error states together in CSS, to be cleaned up
2013-04-17 17:15:34 +02:00
3b2a0523f8
Merge pull request #2978 from owncloud/displayname_can_be_null
...
Remove not null constraint. Fix #2976
2013-04-17 07:47:17 -07:00
9f58166339
make textarea inherit ownCloud font instead of using monospace
2013-04-17 16:30:42 +02:00
867a527148
Merge pull request #2975 from owncloud/log-date
...
use date and time instead of timestamp in log
2013-04-17 06:49:46 -07:00
4679e789e1
also adjust template properly for log date fix
2013-04-17 15:31:05 +02:00
44668b36a7
Remove not null constraint. Fix #2976
2013-04-17 14:08:45 +02:00
f7e29eabf2
fix admin log display and use a more readable format
2013-04-17 14:05:51 +02:00
8471340db9
use date and time instead of timestamp
2013-04-17 12:24:18 +02:00
ec280e6f9f
Merge pull request #2746 from owncloud/use-count-userexists
...
Use count SQL to check for user existance
2013-04-17 03:06:50 -07:00
ca323e56c2
correct primary color to #1d2d44 where slightly wrong
2013-04-17 11:55:27 +02:00
Jenkins for ownCloud
Bart Visscher
Robin Appelman
Björn Schießle
Thomas Tanghus
Morris Jobke
kondou
Florin Peter
Bernhard Posselt
Brice Maron
Raghu Nayyar
Jan-Christoph Borchardt
Sam Tuke