Commit Graph

16435 Commits (61bc76fdd6fea722d8f77dd48ae66c294a1fe322)
 

Author SHA1 Message Date
Bjoern Schiessle cf7ef0d356 fix sharing unit tests 13 years ago
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 13 years ago
Morris Jobke fc209a5944 Merge pull request #7347 from owncloud/patch-headers-already-sent 13 years ago
Robin Appelman 292525d10b Merge branch 'master' into patch-headers-already-sent 13 years ago
icewind1991 c9ea8af3a6 Merge pull request #7348 from owncloud/remove-problematic-test 13 years ago
Morris Jobke 2f6639875e ignore optional additional config files 13 years ago
Thomas Müller 0e2ce33ab0 updating 3rdparty 13 years ago
Robin Appelman 2293563488 Remove unit tests which causes the filesystem tests to fail 13 years ago
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php 13 years ago
Jan-Christoph Borchardt b22d82f941 code style: else on same line 13 years ago
Lukas Reschke f7fa8662e2 Remove `session_id_regenerate` from here 13 years ago
Lukas Reschke 69325c5eeb Move session_regenerate_id to `login()` 13 years ago
Thomas Müller fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test 13 years ago
ringmaster 58be2eb955 Allow apps to add/modify config js output via hook. 13 years ago
Bjoern Schiessle 1ae6e9ec21 add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 13 years ago
Lukas Reschke 917a505af4 Merge pull request #7291 from owncloud/adminess-raghu 13 years ago
Lukas Reschke f11658698d Fix path to the mount file 13 years ago
Robin Appelman daf28225b7 fix viewport size on windows phone 13 years ago
Jan-Christoph Borchardt d5739e83d1 remove additional transition rule, reduce width of collapsed search bar 13 years ago
Morris Jobke dde9193b2b Merge pull request #7332 from owncloud/IE10-viewport 13 years ago
Lukas Reschke 6cb64a4fce Fix code to search for mount.json in custom data folders 13 years ago
Robin Appelman d9bb21146f fix IE10 viewport sizeing 13 years ago
Jan-Christoph Borchardt d466458469 restrict zooming in to not mangle layout accidentally 13 years ago
Robin Appelman f710205ee7 Make unit tests expect the svg icons 13 years ago
Robin Appelman 0624476aa1 Merge branch 'master' into mimeicons-svg 13 years ago
Thomas Müller ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root 13 years ago
Jan-Christoph Borchardt bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance 13 years ago
Thomas Müller b35cd54e87 Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer 13 years ago
Jan-Christoph Borchardt 5cc4a47f4c Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix 13 years ago
icewind1991 d1b1ad0813 Merge pull request #7290 from owncloud/issue/5463 13 years ago
blizzz 984ea7b3ff Merge pull request #7205 from owncloud/fix_7153 13 years ago
Morris Jobke 658758c3f7 fix intendation 13 years ago
Morris Jobke b946c0f08b Merge pull request #7319 from owncloud/remote-unneeded-if 13 years ago
Vincent Petry 44441b56d6 Fixed trashbin title 13 years ago
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config 13 years ago
Björn Schießle 4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator 13 years ago
Vincent Petry 476444ab1a Fixed title format 13 years ago
Lukas Reschke e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons 13 years ago
Robin Appelman d329049e53 Remove no longer needed if statement 13 years ago
Vincent Petry 6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 13 years ago
Jan-Christoph Borchardt b8048866c7 Merge pull request #7315 from owncloud/Jakobud-core-css-logos 13 years ago
Thomas Müller 3219433e20 Merge pull request #7036 from LeBlaaanc/patch-1 13 years ago
Jörn Friedrich Dreyer 3f6d14be85 Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core 13 years ago
Lukas Reschke 0241ddc759 Merge pull request #6519 from nhirokinet/master 13 years ago
Thomas Müller fbea02bebb kill $coreStyles and $coreScripts 13 years ago
Thomas Müller 01929096fe revert wrong change to .htaccess 13 years ago
Thomas Müller a0e790227e remove unused functions - have been introduced with the old minimizer approach 13 years ago
Arthur Schiwon d5690a174e LDAP: fix and extend tests 13 years ago
Lukas Reschke 2955d9b483 Indentation 13 years ago
Thomas Müller 31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 13 years ago