Commit Graph

9707 Commits

Author SHA1 Message Date
Lukas Reschke d08a3bb46e Merge pull request #1590 from owncloud/fix_470
append .part to put files
2013-02-10 06:38:31 -08:00
Lukas Reschke 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
hkjolhede 513bf0b999 Update apps/files_external/lib/config.php
Corrected minor error
2013-02-10 15:37:05 +01:00
Lukas Reschke 32b1c7ad5d Merge pull request #1589 from owncloud/use-sanitizeHTML
Use sanitizeHTML instead of stripslashes + htmlspecialchars
2013-02-10 06:23:01 -08:00
Björn Schießle d8fee28b3b add switch to enable/disable the possibility to change the display name by the user 2013-02-10 14:43:31 +01:00
Jörn Friedrich Dreyer 1263511a17 append .part to put files 2013-02-10 14:16:45 +01:00
Lukas Reschke 46103e62d2 Coding style 2013-02-10 14:09:49 +01:00
Lukas Reschke 6f785e211b Merge pull request #1030 from hkjolhede/master
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
Lukas Reschke 1b10032556 Use sanitizeHTML instead of stripslashes + htmlspecialchars 2013-02-10 14:03:40 +01:00
Robin Appelman 121c1f2fc0 wrap etags in quotes when doing a propfind on a folder 2013-02-10 13:55:20 +01:00
Henrik Kjölhede 421bacc33a Final changes from icewind1991 2013-02-10 13:11:29 +01:00
Jörn Friedrich Dreyer bf4a073dca count divs in actions instead of action div itself (is set to 100%) 2013-02-10 12:38:16 +01:00
Henrik Kjölhede 1df8a5a774 Updated phpseclib from git + requested style changes 2013-02-10 12:35:49 +01:00
Jörn Friedrich Dreyer 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
Robin Appelman 0c05244f8b Mapper: use md5 hashes for database indexes
indexing the full path exeeds the maximum index length for MySQL
2013-02-10 11:49:37 +01:00
Robin Appelman b44c18d164 Don't run external storage tests on default 2013-02-10 11:39:32 +01:00
Jan-Christoph Borchardt 1ba44a3325 Merge pull request #1538 from raghunayyar/admin-password-toggle
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
Lukas Reschke 01fabd6c65 Merge pull request #1577 from owncloud/typo_catagory
Typo
2013-02-10 02:31:34 -08:00
Björn Schießle b7b50f8082 remove hascontrols from trash bin file list table 2013-02-10 11:14:03 +01:00
Bernhard Posselt 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
Michael Gapczynski c6985d6cd4 Merge branch 'master' into fix-shared-links 2013-02-10 00:54:20 -05:00
Michael Gapczynski 71affd528c Fix public links 2013-02-10 00:53:58 -05:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Henrik Kjölhede c6622301e5 Security bug 2013-02-09 23:49:21 +01:00
Lukas Reschke 2dde418e99 Remove uneeded lines 2013-02-09 23:43:48 +01:00
Lukas Reschke bd2f8980cd Typo 2013-02-09 23:37:42 +01:00
Henrik Kjölhede bcf98879cb Just a little cleaner in touch 2013-02-09 23:33:01 +01:00
Henrik Kjölhede 9e42a36fd8 Update to touch 2013-02-09 23:29:58 +01:00
Henrik Kjölhede 674955d1b6 Spelling mistake 2013-02-09 20:35:48 +01:00
Henrik Kjölhede 71d3903cfd Added unittest 2013-02-09 20:34:21 +01:00
Bernhard Posselt b2261c31eb added l10n for db error messages 2013-02-09 19:23:36 +01:00
Thomas Müller b9089fe8d9 Merge branch 'master' into fixing-1424-master 2013-02-09 19:15:23 +01:00
Henrik Kjölhede 96cfe37587 Update to conform to API changes 2013-02-09 19:08:39 +01:00
Thomas Müller 0222c589ac Merge pull request #1546 from owncloud/fix-loading-hooks
Fix loading hooks when going though the routing system
2013-02-09 09:59:41 -08:00
Thomas Müller e68cf72458 Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Thomas Müller 2a650bcbe9 Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir
extract common code
2013-02-09 09:57:23 -08:00
Thomas Müller 460faf3f97 Merge pull request #1569 from owncloud/clean-app-id
Remove invalid characters from app id to prevent loading of invalid reso...
2013-02-09 09:56:26 -08:00
Bernhard Posselt 73c44dfa1f Merge pull request #1575 from owncloud/exec_mimetype
added icons and mimetypes for .msi and .exe files
2013-02-09 09:14:40 -08:00
Bernhard Posselt 0664b98b4f added icons and mimetypes for .msi and .exe files 2013-02-09 18:09:03 +01:00
Sam Tuke 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
Thomas Müller 7f58e27495 cleanup - more to come after 2013-02-09 18:01:38 +01:00
Jörn Friedrich Dreyer bb656ca2fb Merge pull request #1561 from Raydiation/master
Moved the iframe height and width fix from js to css
2013-02-09 08:56:12 -08:00
Thomas Tanghus 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
Bernhard Posselt 62122148bf Revert "moved iframe height and width fix from js to css"
This reverts commit 842fc85b9a.
2013-02-09 17:46:23 +01:00
Bernhard Posselt 43981e62e2 Revert "added exe and msi filetypes and icon"
This reverts commit aa1adf42c7.
2013-02-09 17:46:07 +01:00
Bernhard Posselt aa1adf42c7 added exe and msi filetypes and icon 2013-02-09 17:41:17 +01:00
Bernhard Posselt 842fc85b9a moved iframe height and width fix from js to css 2013-02-09 17:41:17 +01:00
Thomas Müller 2b0b6bb63c Merge pull request #1566 from owncloud/fixing-1505-master
fixes zip download for folders containing a dot .....
2013-02-09 08:33:44 -08:00
Thomas Müller d67d9566ce Merge branch 'master' into clean-app-id 2013-02-09 17:28:30 +01:00
icewind1991 5a309c11ca Merge pull request #1572 from owncloud/fix_empty_path_handling
fix empty path handling
2013-02-09 08:25:25 -08:00