Commit Graph

16300 Commits (fa7fa4a6d32e2e9fb6731a7b2db2736ba769fd9b)
 

Author SHA1 Message Date
icewind1991 fa7fa4a6d3 Merge pull request #7088 from owncloud/sharing-userspathbug 11 years ago
Morris Jobke a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs 11 years ago
icewind1991 aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport 11 years ago
Björn Schießle 6bde602c09 Merge pull request #7292 from owncloud/sharing_tests 11 years ago
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 11 years ago
Thomas Müller 29c43ddb91 Merge pull request #7350 from owncloud/config-gitignore 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
Robin Appelman 2293563488 Remove unit tests which causes the filesystem tests to fail 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
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
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
Morris Jobke dde9193b2b Merge pull request #7332 from owncloud/IE10-viewport 11 years ago
Robin Appelman d9bb21146f fix IE10 viewport sizeing 11 years ago
Jan-Christoph Borchardt d466458469 restrict zooming in to not mangle layout accidentally 11 years ago
Thomas Müller ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root 11 years ago
Jan-Christoph Borchardt bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance 11 years ago
Jan-Christoph Borchardt 5cc4a47f4c Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix 11 years ago
icewind1991 d1b1ad0813 Merge pull request #7290 from owncloud/issue/5463 11 years ago
blizzz 984ea7b3ff Merge pull request #7205 from owncloud/fix_7153 11 years ago
Morris Jobke b946c0f08b Merge pull request #7319 from owncloud/remote-unneeded-if 11 years ago
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config 11 years ago
Björn Schießle 4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator 11 years ago
Lukas Reschke e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons 11 years ago
Robin Appelman d329049e53 Remove no longer needed if statement 11 years ago
Jan-Christoph Borchardt b8048866c7 Merge pull request #7315 from owncloud/Jakobud-core-css-logos 11 years ago
Thomas Müller 3219433e20 Merge pull request #7036 from LeBlaaanc/patch-1 11 years ago
Jörn Friedrich Dreyer 3f6d14be85 Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core 11 years ago
Lukas Reschke 0241ddc759 Merge pull request #6519 from nhirokinet/master 11 years ago
Arthur Schiwon d5690a174e LDAP: fix and extend tests 11 years ago
icewind1991 742f54b6d5 Merge pull request #7301 from owncloud/fix-fuckup 11 years ago
Jan-Christoph Borchardt 20b740f8e4 do not show display name on mobile when profile picture is present 11 years ago
Jan-Christoph Borchardt 92d57cb5a7 move avatar into clickable area of user menu 11 years ago
Lukas Reschke 169f4cf7ff Fix typo 11 years ago
Björn Schießle 16eb43c033 Merge pull request #7247 from owncloud/sharing_cleanup_step1 11 years ago
Lukas Reschke 719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix 11 years ago
Lukas Reschke 8114843973 Merge pull request #7287 from owncloud/subdirectory-harden 11 years ago