Florin Peter
b535964006
test for share is now able to run with autotest.sh
2013-05-07 13:43:34 +02:00
Florin Peter
8b54553872
fix for wrong file infos
2013-05-07 13:42:49 +02:00
Florin Peter
a9649713d3
fix empty path
2013-05-07 13:42:08 +02:00
Morris Jobke
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
Björn Schießle
9b258929c6
allow to set quota to zero, issue #2696
2013-05-07 10:40:25 +02:00
Florin Peter
8fcef41143
added test for share
2013-05-07 09:49:14 +02:00
Florin Peter
fe6d12ddec
fix file info put on stream
2013-05-06 21:15:25 +02:00
Florin Peter
d3df80a078
merge my fix from master b464970142
2013-05-06 21:14:59 +02:00
Lukas Reschke
2208313e02
Merge pull request #3245 from owncloud/use-$view
...
Use the internal ownCloud view
2013-05-06 09:20:18 -07:00
Robin Appelman
3de40f7cfb
Files: set the proper mimetype when creating a new text file
2013-05-06 17:55:22 +02:00
Lukas Reschke
db1e6b5f3b
Use $dir instead of $fullpath
2013-05-06 14:28:01 +03:00
Lukas Reschke
b13b19c58b
Use the internal ownCloud view
2013-05-06 13:43:23 +03:00
Arthur Schiwon
d659d8e193
LDAP: do not reset UUID attribute setting when guid is detected
2013-05-06 10:17:52 +02:00
Bart Visscher
51a1f829b8
Merge pull request #3120 from owncloud/ocs_properties
...
Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
2013-05-05 23:20:25 -07:00
Florin Peter
5610429a02
handling for re-share and re-unshare should work now
2013-05-05 23:41:42 +02:00
Florin Peter
ee083c20e6
improved pre_unshare and post_unshare hook
2013-05-05 23:41:04 +02:00
Thomas Tanghus
83db2c83ad
Merge pull request #3177 from owncloud/outerHTML_compatibility
...
Add compatibility function for outerHTML
2013-05-04 12:27:24 -07:00
Sam Tuke
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
Pellaeon Lin
3409403893
Modify zh_* language codes
2013-05-04 20:27:40 +08:00
Florin Peter
9605d14a17
fixed re-share problems
2013-05-04 03:37:22 +02:00
Jenkins for ownCloud
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
Björn Schießle
d649f77898
make sure to find the correct path for shared files
2013-05-03 17:14:43 +02:00
Björn Schießle
050258f003
remove encryption keys if a file gets deleted permanently
2013-05-03 16:33:18 +02:00
Bart Visscher
a983697e5b
Merge pull request #3230 from owncloud/fix_ldap_cachekey
...
LDAP: cachekey in set method needs to match with that one from get
2013-05-03 06:58:24 -07:00
Björn Schießle
8a1223181b
disable proxys before copying files to the trash bin
2013-05-03 15:18:05 +02:00
Arthur Schiwon
1e2b872160
LDAP: cachekey in set method needs to match with that one from get
2013-05-03 15:13:37 +02:00
Bart Visscher
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
Bart Visscher
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
Bart Visscher
cc3f7ba7e1
Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages
...
Sort priorized languages as defined in the array
2013-05-03 05:56:56 -07:00
Bart Visscher
dcbbca1f89
Merge pull request #2972 from AndreasErgenzinger/master
...
Translations for themes
2013-05-03 05:41:28 -07:00
Bart Visscher
05a0b4533b
Merge pull request #2491 from riso/xsendfile_fix_zip
...
improved handling of xsendfile zip generation race condition
2013-05-03 05:37:01 -07:00
Arthur Schiwon
22a8e7ad55
LDAP: remove restriction from group names to be in line with core behaviour again
2013-05-03 14:11:06 +02:00
Björn Schießle
a2516e549b
get original path in case of shared files when restoring file from trash bin
2013-05-03 14:03:42 +02:00
Arthur Schiwon
9c3b83e28c
Fix retrieval of users with multiple backends
2013-05-03 13:50:14 +02:00
Björn Schießle
996a557475
get original path in case of shared files
2013-05-03 13:00:04 +02:00
Jenkins for ownCloud
4f6565d8e7
[tx-robot] updated from transifex
2013-05-03 02:05:10 +02:00
Tom Needham
cb5a69dd22
Merge pull request #3216 from owncloud/fix-api-3rdparty
...
fix bug that would only return error responses for 3rdparty apps
2013-05-02 15:40:10 -07:00
Thomas Müller
444a209a2a
Merge pull request #3183 from miicha/patch-1
...
fixing mimetype for "new" ms office formats
2013-05-02 15:39:10 -07:00
Morris Jobke
a204a46d50
Merge pull request #3212 from owncloud/stop-links
...
Don't display shared links if disabled
2013-05-02 15:29:00 -07:00
Michael Gapczynski
73d7cae6df
One more mount point fix
2013-05-02 18:22:43 -04:00
Michael Gapczynski
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
Frank Karlitschek
f47cecc651
Merge pull request #3220 from owncloud/gitignore-themes
...
ignore themes
2013-05-02 09:14:33 -07:00
Jan-Christoph Borchardt
8a2ac273eb
don't ignore themes README
2013-05-02 11:51:29 -04:00
Jan-Christoph Borchardt
371b0d9583
ignore themes
2013-05-02 11:47:38 -04:00
Bernhard Posselt
11afb2e5a8
respect format output
2013-05-02 14:51:53 +02:00
Bernhard Posselt
0f38e6ec9c
logout before output to not run into header already sent problems
2013-05-02 14:49:05 +02:00
Bernhard Posselt
ed0c23a9cc
fix bug that would only return error responses for 3rdparty apps
2013-05-02 14:36:16 +02:00
Frank Karlitschek
8a5e88b21c
Merge pull request #3211 from owncloud/fix-2816
...
Fix #2816 renaming shared files
2013-05-02 00:54:09 -07:00
Michael Gapczynski
274bf3c6bd
Don't display shared links if disabled
2013-05-01 20:39:02 -04:00
Michael Gapczynski
04b7a9902d
Fix #2816 renaming shared files
2013-05-01 20:29:07 -04:00
