Commit Graph

10808 Commits

Author SHA1 Message Date
Bernhard Posselt 9ad03b61a3 Update share.js
Added HTML escaping
2013-03-08 17:29:05 +01:00
Michael Gapczynski 20828488bc Fix share hook for updater 2013-03-08 10:59:22 -05:00
Björn Schießle 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
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
Myles McNamara ef2e84026e remove php_value
php_value can only be used with mod_php, using it with FCGI will cause 500 Internal Server errors.  This needs to be set in php.ini manually or set using ini_set().
2013-03-07 23:30:56 -05:00
Michael Gapczynski 6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Michael Gapczynski 4826564344 Merge branch 'master' into shared-folder-etags
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05: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
Michael Gapczynski 4cb5cb9693 itemSource parameter should be fileSource 2013-03-07 10:00:03 -05: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
Michael Gapczynski 812e306e6e Update Shared folders ETags of users with reshares 2013-03-06 17:33:27 -05:00
Brice Maron 4994eaace1 Allow to load splited config files ref #946 2013-03-06 23:30:16 +01:00
Brice Maron a68cbb00e0 Preserve Debug flag accross config writes 2013-03-06 21:05:13 +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 771e01af35 Move hook connectors from shared storage to app.php, add post_unshare hook 2013-03-05 21:57:32 -05:00
Michael Gapczynski 4dcbaa1d7b Merge branch 'master' into shared-folder-etags
Conflicts:
	apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05: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