Commit Graph

16576 Commits (1cde17d60b0f6aec8e50e31f5db8c76c92f8d1e3)
 

Author SHA1 Message Date
Morris Jobke 079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php 11 years ago
Morris Jobke e549977d0e update 3rdparty submodule to current master 11 years ago
root 300b1131b4 replace spaces with tabs 11 years ago
Vincent Petry a2000a15f8 Merge pull request #7358 from owncloud/xmlfix-3rdparty 11 years ago
icewind1991 9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg 11 years ago
Robin Appelman df35929ed2 Merge branch 'master' into add-js-config-vars 11 years ago
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 11 years ago
Robin Appelman f1475671ab Merge branch 'master' into extstorage-configclass 11 years ago
icewind1991 fa7fa4a6d3 Merge pull request #7088 from owncloud/sharing-userspathbug 11 years ago
Robin Appelman 3487a95eab Remove fileid parameter for getFolderContent 11 years ago
Robin Appelman dd98e6333f Split getFolderContentById 11 years ago
Morris Jobke a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs 11 years ago
Robin Appelman 3980a7d9c6 Merge branch 'master' into folderid-reuse 11 years ago
Lukas Reschke fe44ac264b Add overwritehost config on setup and upgrade 11 years ago
icewind1991 aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport 11 years ago
Vincent Petry c0a6af8219 Updated submodule to include XML processing fixes 11 years ago
Björn Schießle 6bde602c09 Merge pull request #7292 from owncloud/sharing_tests 11 years ago
Jan-Christoph Borchardt 6f56fd99a6 fix too much distance between text and icon 11 years ago
Jan-Christoph Borchardt 877cfb963a use SVG icons from icons.css for New file menu 11 years ago
Robin Appelman 4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 11 years ago
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 11 years ago
Thomas Müller 27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 11 years ago
Robin Appelman 3f52eb073d Merge branch 'master' into mimeicons-svg 11 years ago
Thomas Müller 29c43ddb91 Merge pull request #7350 from owncloud/config-gitignore 11 years ago
Thomas Müller a40cedf507 Merge branch 'master' into McNetic-zipstreamer 11 years ago
Philipp Schmitt 43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 11 years ago
Björn Schießle 9f0fc30251 Merge pull request #7337 from owncloud/test_for_6935 11 years ago
Robin Appelman 37a228422c Merge branch 'master' into sharing-userspathbug 11 years ago
Bjoern Schiessle 0c0e4fced5 fix test so that it doesn't depend on the array order 11 years ago
Bjoern Schiessle 6ca4d3bfde fix usersPath and add unit tests 11 years ago
Morris Jobke 387cdc81dc Merge pull request #7309 from owncloud/mobile-header 11 years ago
Bjoern Schiessle cf7ef0d356 fix sharing unit tests 11 years ago
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 11 years ago
Morris Jobke fc209a5944 Merge pull request #7347 from owncloud/patch-headers-already-sent 11 years ago
Robin Appelman 292525d10b Merge branch 'master' into patch-headers-already-sent 11 years ago
icewind1991 c9ea8af3a6 Merge pull request #7348 from owncloud/remove-problematic-test 11 years ago
Morris Jobke 2f6639875e ignore optional additional config files 11 years ago
Thomas Müller 0e2ce33ab0 updating 3rdparty 11 years ago
Robin Appelman 2293563488 Remove unit tests which causes the filesystem tests to fail 11 years ago
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php 11 years ago
Jan-Christoph Borchardt b22d82f941 code style: else on same line 11 years ago
Lukas Reschke f7fa8662e2 Remove `session_id_regenerate` from here 11 years ago
Lukas Reschke 69325c5eeb Move session_regenerate_id to `login()` 11 years ago
Thomas Müller fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test 11 years ago
ringmaster 58be2eb955 Allow apps to add/modify config js output via hook. 11 years ago
Bjoern Schiessle 1ae6e9ec21 add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 11 years ago
Lukas Reschke 917a505af4 Merge pull request #7291 from owncloud/adminess-raghu 11 years ago
Lukas Reschke f11658698d Fix path to the mount file 11 years ago
Robin Appelman daf28225b7 fix viewport size on windows phone 11 years ago
Jan-Christoph Borchardt d5739e83d1 remove additional transition rule, reduce width of collapsed search bar 11 years ago