Commit Graph

16226 Commits (742f54b6d556797bbef2847e546861de0008a28a)
 

Author SHA1 Message Date
Thomas Müller 92560c5b86 Merge pull request #7243 from owncloud/core-sessionlifetimedefault 11 years ago
Thomas Müller 5d3fc03750 Merge pull request #7239 from owncloud/cbr-filetype-icon 11 years ago
Vincent Petry f9763e1fc5 Now using PHP session lifetime as default value for the JS config 11 years ago
Jan-Christoph Borchardt 323cc1166b Merge pull request #7235 from DavidVentura/master 11 years ago
icewind1991 617cbfed54 Merge pull request #7240 from owncloud/mimetype-fallback 11 years ago
Vincent Petry 5a80339b51 Merge pull request #7211 from mattcaron/master 11 years ago
Jörn Friedrich Dreyer 798dc2c39a Merge pull request #7231 from owncloud/proper-content-type 11 years ago
Jan-Christoph Borchardt c2adf033f2 use file icon as fallback instead of application icon, fix #7237 11 years ago
Jörn Friedrich Dreyer 7e94d98b57 Merge pull request #7233 from owncloud/fix_5567 11 years ago
Jan-Christoph Borchardt 0f434038a7 add cbr/cbz file type icon, fix #6953 11 years ago
Matthew Caron aa1a50f5b3 Consolidate two sections, per code review. Issue #1648 11 years ago
Vincent Petry 94b3296a71 Trashbin select all now doesn't send file list 11 years ago
David a282afcbbb small change for compatibility 11 years ago
Arthur Schiwon 54f9db403f LDAP: improve wizard strings, fixes #5567 11 years ago
Lukas Reschke 8a2cd0355d Use the proper content-type 11 years ago
Jan-Christoph Borchardt 84cd6e035e Merge pull request #7132 from owncloud/issue/6920 11 years ago
Lukas Reschke fe065f5114 Merge pull request #6892 from owncloud/issuetemplate-enhancements 11 years ago
Vincent Petry fe9c982081 Removed quota question 11 years ago
tomneedham a4b6d66703 Merge branch 'master' into migration_unit_tests 11 years ago
tomneedham 049e03c2b9 Finish basic testing of user export 11 years ago
Björn Schießle 5a8d37023a Merge pull request #7155 from owncloud/enc_improved_error_handling 11 years ago
Bjoern Schiessle 6778dc5a4a don't block login forever if we are stuck in the middle of the initial encryption 11 years ago
Bjoern Schiessle f2f5769df7 catch errors during decryption 11 years ago
Bjoern Schiessle 2ab062193a catch errors during initial encryption 11 years ago
Thomas Müller 750ffa8231 Merge pull request #7156 from owncloud/backgroundjob-public 11 years ago
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 11 years ago
Morris Jobke df282d9ef8 Merge pull request #7207 from owncloud/fileinfo-serializable 11 years ago
Matthew Caron 2887fb1f48 Fit shared videos to viewer, just like images. Issue #1648 11 years ago
Thomas Müller 41f0ad2d13 Merge pull request #7204 from owncloud/groupexists-duplicate 11 years ago
Robin Appelman 09502fcb36 remove the JsonSerializable interface from \OC\Files\FileInfo 11 years ago
blizzz e2c0c0e256 Merge pull request #7206 from owncloud/fix_enc_tests 11 years ago
Bjoern Schiessle 2933668355 fileinfo is no longer a array 11 years ago
icewind1991 2a7509ee50 Merge pull request #6748 from owncloud/fileinfo 11 years ago
Robin Appelman b35f679483 Fix test cases for group manager 11 years ago
Vincent Petry d7f4547717 Merge pull request #6726 from owncloud/fix_6630 11 years ago
Robin Appelman 0ba0596341 remove duplicate call to groupExists 11 years ago
Thomas Müller 595b908b74 Merge pull request #7183 from owncloud/remove-force-lowercase 11 years ago
Thomas Müller 4b603cd2f8 Merge pull request #7201 from owncloud/fix_error_msg_imagick_queryFormats 11 years ago
Vincent Petry afe133d5d1 Merge pull request #7168 from owncloud/issue/7152 11 years ago
Georg Ehrke f62f1658ce suppress error msg caused by php bug 11 years ago
Vincent Petry d5397d813c Do not send file list for select all on Download/delete 11 years ago
Robin Appelman 181bbd4325 Remove usage of legacy OC_Appconfig 11 years ago
Thomas Müller 4b84e3a7e8 Merge pull request #4624 from owncloud/convert-oc_appconfig 11 years ago
Robin Appelman 3b1df29318 sort expected result in tests 11 years ago
Jan-Christoph Borchardt 6e17d71a0d remove forced lowercase from extension, fix #4747, also coding style fixes 11 years ago
Thomas Müller 30662fa7ac Merge pull request #7178 from owncloud/issue/6277 11 years ago
Joas Schilling 658af627ce External FTP Storage should request hostname instead of URL 11 years ago
Bart Visscher 2c6411b897 $default of OC_Config::[gs]etValue can have more then string as type 11 years ago
Joas Schilling 9619459e37 Send correct path on file upload when using public app 11 years ago
icewind1991 7af456730e Merge pull request #6964 from owncloud/storagestatistics-reuse 11 years ago