Commit Graph

13125 Commits (6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d)
 

Author SHA1 Message Date
Georg Ehrke 6ffa2a28d0 Merge branch 'master' into oc_preview 12 years ago
Georg Ehrke 1dab076750 make it possible to disable previews 12 years ago
Jenkins for ownCloud 02b2b5a808 [tx-robot] updated from transifex 12 years ago
Thomas Müller 582b33bdf1 Merge pull request #4537 from owncloud/no-realpath 12 years ago
Thomas Müller fbc23c4a01 Merge branch 'master' of github.com:owncloud/core 12 years ago
Thomas Müller f1eec74f70 additional readdir check in mappedlocal 12 years ago
Arthur Schiwon 958130e8fe Sharing: only determine path root if owner is available 12 years ago
Arthur Schiwon c482512e23 LDAP: fix wrong hook name 12 years ago
Georg Ehrke 224b80f906 move isMimeSupported out of template files 12 years ago
Jenkins for ownCloud a89199cc7b [tx-robot] updated from transifex 12 years ago
Andreas Fischer 83afb46205 Use __DIR__ instead of dirname(__FILE__). 12 years ago
Andreas Fischer 85ac9572ce Also remove other unnecessary realpath() calls. 12 years ago
Andreas Fischer 9753e44ac2 Do not use realpath() on includes. 12 years ago
Christopher 90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou 12 years ago
Morris Jobke de949b1caa Merge pull request #4447 from owncloud/fix_4351_master 12 years ago
Thomas Müller 884c6b5a82 Merge pull request #4512 from owncloud/readdir-strict-equals 12 years ago
Jenkins for ownCloud e9644c2f52 [tx-robot] updated from transifex 12 years ago
Georg Ehrke cbeccb2fcd Merge branch 'master' into readdir-strict-equals 12 years ago
Thomas Müller 95e1b62940 Merge pull request #4510 from owncloud/f_e_webdav_urlencoding 12 years ago
Georg Ehrke d9e8ebabdc outsource sharing and deleted files previews to apps 12 years ago
icewind1991 d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota 12 years ago
Georg Ehrke 48f0c54261 style fixes for preview lib 12 years ago
Robin Appelman c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 12 years ago
Georg Ehrke f2702ff1ca Merge master into oc_preview 12 years ago
Jörn Friedrich Dreyer 89c928c3be replace ' ' with '%20' in urls for curl 12 years ago
Morris Jobke a1d5aba5fd Merge pull request #4509 from owncloud/add-odf-templates-master 12 years ago
Thomas Müller 0890a915b3 adding file templates for ods, odt and odp 12 years ago
Björn Schießle 9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 12 years ago
Christopher c620c5840a Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton 12 years ago
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 12 years ago
Thomas Tanghus 3366bbeb8a Port DAV groupMemberSet fix to master #4458 12 years ago
Kondou 141d2f67aa Merge pull request #4496 from owncloud/fixing-error-page-layout-master 12 years ago
Markus Goetz ba430a7dfa Merge pull request #4485 from guruz/class_autoloader_optimization 12 years ago
Markus Goetz aba64a0b81 Class Auto Loader: Cache paths in APC 12 years ago
Bart Visscher eb97818519 Merge pull request #4483 from owncloud/compare-true-false 12 years ago
Bart Visscher dda5eb2530 Merge pull request #4486 from owncloud/ldap_adjust_cache 12 years ago
Robin Appelman d8c71ba734 merge master in storage-wrapper-quota 12 years ago
Bjoern Schiessle d544a371bf revert changes to 3rdparty submodule reference 12 years ago
Jan-Christoph Borchardt dce7cdaaec remove unneeded extra ID selectors 12 years ago
Bjoern Schiessle 1be11bb03d don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again 12 years ago
Jan-Christoph Borchardt bf4efd5290 move upload progress bar near upload button, more contextual 12 years ago
Owen Winkler c427e256e1 Merge pull request #4493 from owncloud/fixing-initL10n-master 12 years ago
Owen Winkler 1793ec1d5d Fixed inconsistent spacing. 12 years ago
kondou 9e8a6b704d Add _many_ newlines at the end of files 12 years ago
Owen Winkler 9840363488 Break long lines into smaller ones. 12 years ago
Jan-Christoph Borchardt ce9103d522 Merge pull request #4426 from owncloud/ldap_settings_design 12 years ago
Thomas Müller 3d760222d4 fixing error page layout 12 years ago
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou 12 years ago
Andreas Fischer 4bb0e1567b Use boolean casting for bitwise and result. 12 years ago
Andreas Fischer 4f462e9b6f Add trailing comma for all touched array lines. 12 years ago