Commit Graph

13335 Commits (65413a95dcffee0d803dd30c9cd0028eb9c113e5)
 

Author SHA1 Message Date
kondou 65413a95dc Merge branch 'master' into oc_avatars 12 years ago
blizzz 431cf06e99 Merge pull request #4672 from owncloud/ocs_cleanup 12 years ago
Owen Winkler f81a205f12 Merge pull request #4514 from owncloud/windows_ssl 12 years ago
kondou e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 12 years ago
ringmaster 39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 12 years ago
ringmaster df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 12 years ago
Owen Winkler 9a263a500a Employ config option for OpenSSL config file, if provided. 12 years ago
Owen Winkler fb34f49913 Start a branch for easier OpenSSL configuration. 12 years ago
Jörn Friedrich Dreyer 06870a6e39 Merge pull request #4673 from owncloud/ocsapi_cleanup 12 years ago
Morris Jobke 91c0923cce Merge pull request #4663 from owncloud/fix-sticky-apps 12 years ago
Morris Jobke a2f18eabb1 Merge pull request #4657 from owncloud/files-controls-fixes 12 years ago
Morris Jobke 8a4acf263e Merge pull request #4674 from owncloud/fit-filepicker-new-icons 12 years ago
Morris Jobke 1e501a8521 IE8 fixes 12 years ago
Bernhard Posselt f038cb9aea Merge pull request #4671 from owncloud/emptycontent 12 years ago
kondou 14cc1cd4b8 Pass setLastModifiedHeader() time() 12 years ago
kondou 5c1d64b80e $image doesn't have data() when a defaultavatar should be used 12 years ago
kondou 91fed38f00 Also set an E-Tag header 12 years ago
kondou 44e141cc6a Use \OC_Response for cache invalidation 12 years ago
kondou 74c9223281 Properly check for tmpavatar, invalidate cache, fix debug msgs 12 years ago
Jenkins for ownCloud e68b5f8b0d [tx-robot] updated from transifex 12 years ago
kondou c95d4cafa9 Fix @tanghus's complains in avatars and clean up cropper after closing with "x" 12 years ago
kondou 76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 12 years ago
kondou ab70b8c26e Merge branch 'master' into oc_avatars 12 years ago
Christopher 36424580b0 Merge pull request #4329 from owncloud/fix_4258 12 years ago
kondou f44cd944e0 Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoadedCallback() 12 years ago
kondou 2d6a400381 Check for $this->fileInfo and @depend on testData() 12 years ago
Frank Karlitschek c54994d2e9 fixing this obvious typo directly 12 years ago
kondou 235638e5ab Merge branch 'master' into fix_4258 12 years ago
kondou 8de9e3d85e Add a description for $.avatar() and remove TODOs @raghunayyar fixed 12 years ago
kondou ebcd2a6b4d Fit filesummary for \OC\Preview's ne mimetype-icons 12 years ago
kondou 385de45ed9 Deal with OC.Router.generate() 12 years ago
kondou aa88eea9cf Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname 12 years ago
Frank Karlitschek f1836a997f remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future. 12 years ago
Frank Karlitschek a5633bb155 remove the config option that is no longer needed 12 years ago
Frank Karlitschek 58e036e304 remove knowledgebase calls that are no longer used in ownCloud 5/6 12 years ago
Alessandro Cosentino b10a646bc8 rename emptyfolder to emptycontent 12 years ago
Alessandro Cosentino 4b32d84314 text centered horizontally and vertically in emptycontent div 12 years ago
kondou 5d653753bd Merge branch 'master' into oc_avatars 12 years ago
Thomas Müller 92e90c8eb9 Merge pull request #4022 from owncloud/oc_preview 12 years ago
Georg Ehrke 668c4c2652 fix issue with filetable background 12 years ago
kondou 0869f9b655 Fix #4258, clean up \OC_Image and improve its unittest 12 years ago
Georg Ehrke 8ef40277b2 Merge master into oc_preview 12 years ago
Jan-Christoph Borchardt 0f5df181a3 Merge pull request #4661 from owncloud/separate-app-styles 12 years ago
Georg Ehrke 40cee5639e use gerMimeTypeDetector detectPath instead of getMimeType 12 years ago
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 12 years ago
Stephane Martin 95f42d6544 Merge pull request #4578 from houbaastef/master 12 years ago
Jan-Christoph Borchardt 1e834c57a4 fix issues caused by introduction of sticky Apps management footer 12 years ago
kondou 30526ded80 Fix \OCP\Avatar 12 years ago
kondou 80e10f01c4 Clean up 12 years ago
Morris Jobke bf6981312a Merge pull request #4660 from owncloud/apps-management-sticky 12 years ago