Commit Graph

12699 Commits (93cdfc3e8a0f2da2ebcca5d5a18a52ba64389d26)
 

Author SHA1 Message Date
Georg Ehrke 93cdfc3e8a Merge branch 'master' into oc_preview 12 years ago
Georg Ehrke 640253fa31 fix code style of try catch blocks 12 years ago
Georg Ehrke d84d8f7108 fix merge conflicts 12 years ago
Georg Ehrke ac6a3133ec style fixes 12 years ago
Thomas Müller 10939b0bdf Updating to the latest 3rdparty master commit 12 years ago
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 12 years ago
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview 12 years ago
icewind1991 7c6246fa45 Merge pull request #4213 from owncloud/scanning-performance 12 years ago
Robin Appelman 74c54587ec better variable naming 12 years ago
Björn Schießle 7f9795cc3d Merge pull request #4203 from owncloud/trashbin_improvements 12 years ago
Bjoern Schiessle 4a9f5f64da remove whitespaces 12 years ago
Georg Ehrke b4a5239278 fix syntax in config.sample.php 12 years ago
Georg Ehrke 2ea8ee6139 add class='preview-icon' in trashbin app as well 12 years ago
Georg Ehrke 1e4ec2ac27 add class='preview-icon' to rows in file app that make use of previews 12 years ago
Georg Ehrke e01bc7de98 Revert "OC\Preview - outsource static methods" 12 years ago
Georg Ehrke 65affdc9b3 make previews in files app smaller 12 years ago
Thomas Müller 954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache 12 years ago
Jenkins for ownCloud 0fde473cb7 [tx-robot] updated from transifex 12 years ago
icewind1991 3d76530628 Merge pull request #4218 from owncloud/newdata 12 years ago
Michael Gapczynski c8e60900fc Move check so the variable will never be undefined 12 years ago
kondou 8cd671c207 Also clean PHP 5.5 opcache 12 years ago
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 12 years ago
Robin Appelman e1e7b6a940 Cache: don't check if the parent exists in the cache if we are already sure it does 12 years ago
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 12 years ago
Björn Schießle 0a9bb8ba73 reduce time for auto expire to 30 days by default 12 years ago
Björn Schießle efd8ad6696 found some more places where we can disable buttons while performing a action 12 years ago
Jörn Friedrich Dreyer 98e76b8978 Merge pull request #4199 from owncloud/login-cleanup 12 years ago
Björn Schießle 9d24b9c7e8 Hide Delete Permanently button when Restore happens 12 years ago
Bart Visscher e4132a61c9 Merge pull request #4093 from owncloud/storage-test-cleanup 12 years ago
Björn Schießle a5d9b985c3 make 'restored' extension translatable 12 years ago
Björn Schießle 3354249691 fix typo 12 years ago
Björn Schießle 0182a503a6 expire trash bin if trash bin exceeds max size after a new file was added to ownCloud 12 years ago
Björn Schießle a00cff7c05 disable "deleted files" button if trash bin is empty 12 years ago
Jörn Friedrich Dreyer a0f574ccd7 IE8 login/install screen cleartype fixes and input box borders 12 years ago
Björn Schießle 96e175ffbf don't move empty folders to the trash bin 12 years ago
Björn Schießle bf668eb14f nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored' 12 years ago
Robin Appelman 1b50154c95 functions in OCP should be static 12 years ago
blizzz 63d55fdde5 Merge pull request #4184 from owncloud/login_cleanup_oracle 12 years ago
Jörn Friedrich Dreyer 9762a4dd95 Merge pull request #4191 from owncloud/autotest-show-skipped-tests 12 years ago
Björn Schießle 9394fc5d4a new version drop down 12 years ago
Andreas Fischer 75e93d041d Merge pull request #3887 from owncloud/apc_user_cache 12 years ago
Andreas Fischer 763afa5064 Add verbose to autotest phpunit, so we see skipped and incomplete tests. 12 years ago
Bart Visscher 25003fb213 Add ACPu memory cache 12 years ago
icewind1991 ff86b6f134 Merge pull request #4183 from owncloud/fix-group-id 12 years ago
Jörn Friedrich Dreyer 284fb86258 show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids 12 years ago
Jörn Friedrich Dreyer 18c565666e force dbs to stay in one line 12 years ago
icewind1991 1986416248 Merge pull request #3898 from owncloud/sabre-objecttree 12 years ago
icewind1991 9f01d00c65 Merge pull request #4181 from owncloud/irods-ob 12 years ago
Jan-Christoph Borchardt 4b8e464f01 Merge pull request #4173 from owncloud/login-cleanup 12 years ago
Bart Visscher 4e3bfd8ddd Fix group id naming fid->gid 12 years ago