Commit Graph

13081 Commits (f2702ff1ca45d72300eed5dfa58ebc19aa6e9910)
 

Author SHA1 Message Date
Georg Ehrke f2702ff1ca Merge master into oc_preview 13 years ago
Björn Schießle 9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 13 years ago
Christopher c620c5840a Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton 13 years ago
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 13 years ago
Thomas Tanghus 3366bbeb8a Port DAV groupMemberSet fix to master #4458 13 years ago
Kondou 141d2f67aa Merge pull request #4496 from owncloud/fixing-error-page-layout-master 13 years ago
Markus Goetz ba430a7dfa Merge pull request #4485 from guruz/class_autoloader_optimization 13 years ago
Markus Goetz aba64a0b81 Class Auto Loader: Cache paths in APC 13 years ago
Bart Visscher eb97818519 Merge pull request #4483 from owncloud/compare-true-false 13 years ago
Bart Visscher dda5eb2530 Merge pull request #4486 from owncloud/ldap_adjust_cache 13 years ago
Bjoern Schiessle d544a371bf revert changes to 3rdparty submodule reference 13 years ago
Jan-Christoph Borchardt dce7cdaaec remove unneeded extra ID selectors 13 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 13 years ago
Jan-Christoph Borchardt bf4efd5290 move upload progress bar near upload button, more contextual 13 years ago
Owen Winkler c427e256e1 Merge pull request #4493 from owncloud/fixing-initL10n-master 13 years ago
Owen Winkler 1793ec1d5d Fixed inconsistent spacing. 13 years ago
kondou 9e8a6b704d Add _many_ newlines at the end of files 13 years ago
Jan-Christoph Borchardt ce9103d522 Merge pull request #4426 from owncloud/ldap_settings_design 13 years ago
Thomas Müller 3d760222d4 fixing error page layout 13 years ago
Andreas Fischer 4bb0e1567b Use boolean casting for bitwise and result. 13 years ago
Andreas Fischer 4f462e9b6f Add trailing comma for all touched array lines. 13 years ago
Andreas Fischer d38929fb10 Fix spacing of all touched lines. 13 years ago
Thomas Müller 15c9a0f405 fixing undefined js error 13 years ago
Thomas Müller 12f4494de0 Merge pull request #4339 from owncloud/mimetype-defaults 13 years ago
Arthur Schiwon f41c4312ff LDAP: use memcache if available 13 years ago
Morris Jobke 6ae6dc00e5 Merge pull request #4427 from owncloud/fix_4425 13 years ago
Kondou a1128aadd0 Merge pull request #4482 from owncloud/remove_cancel_button_filepicker 13 years ago
Bjoern Schiessle f28f528431 switched to dirname() 13 years ago
Bjoern Schiessle db8fdd5032 added missing parameter documentation 13 years ago
Morris Jobke 3e88430840 Merge pull request #4475 from owncloud/brighter-font-color 13 years ago
Björn Schießle 1af2ec1724 Merge pull request #4481 from owncloud/fix_versioning_size_check 13 years ago
Bjoern Schiessle f71794f0d5 added createMissingDirectories() method 13 years ago
Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again 13 years ago
Björn Schießle d3e2f31ada Merge pull request #4352 from owncloud/encryption_clean_up 13 years ago
Bart Visscher 29b6dd53a0 Compare result are already true/false 13 years ago
Arthur Schiwon c538ac3081 LDAP: only connect to LDAP once on login 13 years ago
Thomas Müller 69350c4e0d Merge pull request #4471 from owncloud/password-icon 13 years ago
Thomas Müller 264ee9df9a Merge pull request #4476 from owncloud/doc-on-master 13 years ago
Thomas Müller e761cba808 Merge pull request #4480 from owncloud/remove-ru_RU-master 13 years ago
kondou 2ee8425295 Remove cancel button from filepicker 13 years ago
Morris Jobke 50147bfbd1 Merge pull request #4193 from owncloud/versions_fix_css 13 years ago
Bjoern Schiessle 16efd81a0e first check if file exists before checking the files size 13 years ago
Morris Jobke 60efd93d5d fixes for IE8 13 years ago
Thomas Müller de52157e76 remove ru_RU - fixes #3135 13 years ago
Bjoern Schiessle 137cd2ca89 increase width of versions dialog 13 years ago
Jan-Christoph Borchardt 7e4dcd268f vertically center rename input box 13 years ago
Morris Jobke 746d32eb05 fix difference between packaged version and master 13 years ago
Morris Jobke 18769e1348 change font on login/install page from black to white 13 years ago
Jan-Christoph Borchardt b8b24bbae7 use proper password icon, three dots are 'more' 13 years ago
Georg Ehrke 164502477d use jQuery.get instead of jQuery.ajax 13 years ago