Commit graph

10317 commits

Author SHA1 Message Date
Lukas Reschke
0fa12f8d85 Merge pull request #2214 from riso/fix_xsendfile
Fixed typo that broke xsendfile
2013-03-09 08:20:09 -08:00
Valerio Ponte
99c873ea29 fixed typo that broke xsendfile 2013-03-09 15:35:36 +01:00
Frank Karlitschek
4763c4616f Merge pull request #2213 from owncloud/fix_2208
remove remaining br-tags that do not belong here
2013-03-09 05:30:12 -08:00
Arthur Schiwon
988a67fc9a remove remaining br-tags that do not belong here 2013-03-09 13:45:37 +01:00
Jenkins for ownCloud
0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Lukas Reschke
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
Arthur Schiwon
f4a326173e fix foldersize check to validate zip input size 2013-03-08 19:21:06 +01:00
Frank Karlitschek
f9c24a0368 5.0.0 RC3 2013-03-08 10:01:22 +01:00
Bernhard Posselt
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
Björn Schießle
8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Björn Schießle
45869afa5a remove debug output 2013-03-08 10:51:28 +01:00
Jenkins for ownCloud
308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Florian Hülsmann
0aa6c1b163 fixed header content padding 2013-03-07 19:28:17 +01:00
Bernhard Posselt
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
Michael Gapczynski
ef2eb10ea4 Change findById to findByStorageId in mount test 2013-03-07 11:47:24 -05:00
blizzz
99914a44a5 Merge pull request #2174 from owncloud/fix_printed_brs
Remove <br> from error messages, because they will be escaped and the us...
2013-03-07 08:39:29 -08:00
Arthur Schiwon
47d176ae69 Remove <br> from error messages, because they will be escaped and the used template has it's own <br> already 2013-03-07 17:28:28 +01:00
Michael Gapczynski
a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Frank Karlitschek
19073e0711 Merge pull request #2167 from owncloud/input-type-fix
Input type fix
2013-03-07 07:28:22 -08:00
Björn Schießle
48bb53030c distinguish between touch and write 2013-03-07 15:51:44 +01:00
Arthur Schiwon
2ae1ad23b0 Offer download of whole shared dir only if it does not exceed zip input limit 2013-03-07 15:48:10 +01:00
Jan-Christoph Borchardt
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
Björn Schießle
ba9f5f5885 add dirlisting var to file list 2013-03-07 14:54:59 +01:00
Björn Schießle
7c16c2c9ae Merge pull request #2163 from owncloud/fix_file_download
json encode list of files
2013-03-07 05:45:19 -08:00
Björn Schießle
ce9942331e create a meanigful file name if files are from the root folder 2013-03-07 14:24:18 +01:00
Björn Schießle
3970d1f875 remove debug output 2013-03-07 14:18:27 +01:00
Björn Schießle
4a4f705adc json encode list of files 2013-03-07 14:15:02 +01:00
Björn Schießle
dda4c6bf4b no dir parameter needed 2013-03-07 13:51:18 +01:00
Björn Schießle
7188303651 let the home icon link to the files view in the trash bin 2013-03-07 13:48:02 +01:00
Jenkins for ownCloud
97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
blizzz
e5a497c924 Merge pull request #2134 from owncloud/fix_2127
return 403 when mkdir failed on webDAV, fixes #2127
2013-03-06 06:57:45 -08:00
Arthur Schiwon
6acbadf418 return 403 when mkdir failed on webDAV, fixes #2127 2013-03-06 15:21:12 +01:00
Thomas Müller
a2aebbd742 Merge pull request #2130 from owncloud/fix_2128
fix #2128
2013-03-06 05:05:40 -08:00
Bernhard Posselt
3213331f73 Merge pull request #2129 from owncloud/don't-sanitize-error-message
Don't sanitize error message hint
2013-03-06 04:19:55 -08:00
Lukas Reschke
cfb10dc58c Add warning about sanitization 2013-03-06 13:05:22 +01:00
Georg Ehrke
a83a5aa900 fix #2128 2013-03-06 13:02:44 +01:00
Lukas Reschke
630ee644db Don't sanitize error message hint 2013-03-06 12:56:27 +01:00
Jan-Christoph Borchardt
ab7dc76ff1 add type=text to ZIP size field, fix second part of #2097 2013-03-06 12:39:36 +01:00
Jan-Christoph Borchardt
114c6457a3 add email input type to styled inputs, fix #2097 2013-03-06 12:38:43 +01:00
Bernhard Posselt
145fb18042 Merge pull request #2120 from owncloud/clear-caches
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-06 02:53:16 -08:00
Bernhard Posselt
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
Björn Schießle
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
Arthur Schiwon
bce0c3c372 LDAP: move more settings stuff to template file 2013-03-06 08:26:33 +01:00
Michael Gapczynski
5300d6ad55 Clear the CSS and JS cache earlier to make sure update goes smoothly 2013-03-05 21:13:07 -05:00
Jenkins for ownCloud
c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Arthur Schiwon
1e5f8b0e20 LDAP: fix settings output thus make settings work again 2013-03-05 23:43:22 +01:00
Arthur Schiwon
b5dc8b9ca3 whitespace 2013-03-05 21:25:59 +01:00
Arthur Schiwon
72c293e834 LDAP: implementation of displayNamesInGroup 2013-03-05 21:23:58 +01:00
Arthur Schiwon
5da9223d1c make getDisplayNames optional feature for Group Backends, fall back to internal names 2013-03-05 21:22:34 +01:00
Frank Karlitschek
4830ba8035 Merge pull request #2112 from owncloud/fix_1673
LDAP: escape some more chars for proper search filter, fixes #1673
2013-03-05 06:03:25 -08:00