Commit Graph

16381 Commits (37a2f8c6cbccce616ff44badba8a03cafbba9764)
 

Author SHA1 Message Date
Vincent Petry 37a2f8c6cb Merge pull request #7405 from owncloud/files-admin.js-style 13 years ago
Vincent Petry a1600a289c Merge pull request #7401 from owncloud/highlight_selected_app_settings 13 years ago
Vincent Petry 5c98e0c7c7 Merge pull request #7328 from owncloud/McNetic-zipstreamer 13 years ago
Jan-Christoph Borchardt 2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 13 years ago
Jan-Christoph Borchardt 1a561fced0 fix for coding style 13 years ago
kondou e32acf933d Highlight the selected app in app-settings 13 years ago
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333 13 years ago
Vincent Petry 9b4af31bac Merge pull request #7371 from owncloud/core-storagemovedeleteall 13 years ago
VicDeo ec9fe3f57f Merge pull request #6299 from leo-b/ldap_nested_groups 13 years ago
Björn Schießle e10ca7c2e9 Merge pull request #7374 from owncloud/enc_dont_overwrite_keys 13 years ago
Vincent Petry 432a42d846 Fix case where port is missing 13 years ago
Bjoern Schiessle d3a24e945b add test case if a file gets moved out from the shared folder 13 years ago
Bjoern Schiessle ebd73aee8f don't overwrite keys if rename was done by a stream copy 13 years ago
Morris Jobke 5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg 13 years ago
Morris Jobke 8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 13 years ago
icewind1991 ddb8cf32e9 Merge pull request #7344 from owncloud/add-js-config-vars 13 years ago
Robin Appelman 7c4f81bd78 rename url parameter 13 years ago
Thomas Müller 0d78d9c180 Merge branch 'master' into McNetic-zipstreamer 13 years ago
Vincent Petry a23ef25010 Removed unused deleteAll method on Common storage class 13 years ago
Vincent Petry c465835e85 Replace deleteAll call with unlink call 13 years ago
Vincent Petry 539ea0882b Fixed mount config path 13 years ago
Vincent Petry 80c61d480c Added oc_defaults stub in specHelper.js 13 years ago
Lukas Reschke 11ca014034 Merge pull request #7305 from owncloud/extstorage-configclass 13 years ago
Lukas Reschke c9ab11a9bd Merge pull request #7259 from owncloud/overwritehost-always 13 years ago
Morris Jobke 079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php 13 years ago
Morris Jobke e549977d0e update 3rdparty submodule to current master 13 years ago
root 300b1131b4 replace spaces with tabs 13 years ago
Vincent Petry a2000a15f8 Merge pull request #7358 from owncloud/xmlfix-3rdparty 13 years ago
icewind1991 9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg 13 years ago
Robin Appelman df35929ed2 Merge branch 'master' into add-js-config-vars 13 years ago
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 13 years ago
Robin Appelman f1475671ab Merge branch 'master' into extstorage-configclass 13 years ago
icewind1991 fa7fa4a6d3 Merge pull request #7088 from owncloud/sharing-userspathbug 13 years ago
Morris Jobke a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs 13 years ago
Lukas Reschke fe44ac264b Add overwritehost config on setup and upgrade 13 years ago
icewind1991 aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport 13 years ago
Vincent Petry c0a6af8219 Updated submodule to include XML processing fixes 13 years ago
Björn Schießle 6bde602c09 Merge pull request #7292 from owncloud/sharing_tests 13 years ago
Jan-Christoph Borchardt 6f56fd99a6 fix too much distance between text and icon 13 years ago
Jan-Christoph Borchardt 877cfb963a use SVG icons from icons.css for New file menu 13 years ago
Robin Appelman 4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 13 years ago
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 13 years ago
Thomas Müller 27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 13 years ago
Robin Appelman 3f52eb073d Merge branch 'master' into mimeicons-svg 13 years ago
Thomas Müller 29c43ddb91 Merge pull request #7350 from owncloud/config-gitignore 13 years ago
Thomas Müller a40cedf507 Merge branch 'master' into McNetic-zipstreamer 13 years ago
Björn Schießle 9f0fc30251 Merge pull request #7337 from owncloud/test_for_6935 13 years ago
Robin Appelman 37a228422c Merge branch 'master' into sharing-userspathbug 13 years ago
Bjoern Schiessle 0c0e4fced5 fix test so that it doesn't depend on the array order 13 years ago
Bjoern Schiessle 6ca4d3bfde fix usersPath and add unit tests 13 years ago