| Commit message (Expand) | Author | Age | Files | Lines |
* | Clean up oc_avatars | kondou | 2013-09-04 | 3 | -9/+10 |
* | Don't update avatar on displayNameChange anymore | kondou | 2013-09-04 | 1 | -1/+0 |
* | Have the header avatar to the left of the user name | kondou | 2013-09-03 | 2 | -9/+18 |
* | Fix unwanted caching in IE8 | kondou | 2013-09-03 | 2 | -7/+20 |
* | Partly fix cropper in IE8 and don't use a dialog for it | kondou | 2013-09-03 | 2 | -25/+34 |
* | Don't use HTML5 <header> to support avatars in IE8 | kondou | 2013-09-03 | 2 | -2/+2 |
* | Merge branch 'master' into oc_avatars | kondou | 2013-09-03 | 242 | -1875/+2007 |
|\ |
|
| * | Merge pull request #4672 from owncloud/ocs_cleanup | blizzz | 2013-09-02 | 2 | -52/+0 |
| |\ |
|
| | * | remove the config option that is no longer needed | Frank Karlitschek | 2013-08-31 | 1 | -3/+0 |
| | * | remove knowledgebase calls that are no longer used in ownCloud 5/6 | Frank Karlitschek | 2013-08-31 | 1 | -49/+0 |
| * | | Merge pull request #4514 from owncloud/windows_ssl | Owen Winkler | 2013-09-02 | 4 | -12/+40 |
| |\ \ |
|
| | * | | This function doesn't cache anymore. Adjusted PHPDoc to suit. | ringmaster | 2013-09-02 | 1 | -1/+1 |
| | * | | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 2 | -13/+11 |
| | * | | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 3 | -7/+21 |
| | * | | Start a branch for easier OpenSSL configuration. | Owen Winkler | 2013-09-02 | 3 | -1/+17 |
| |/ / |
|
| * | | Merge pull request #4673 from owncloud/ocsapi_cleanup | Jörn Friedrich Dreyer | 2013-09-02 | 2 | -36/+0 |
| |\ \ |
|
| | * | | remove the activity call here. it is not implemented anyways. This will be pr... | Frank Karlitschek | 2013-08-31 | 2 | -36/+0 |
| | |/ |
|
| * | | Merge pull request #4663 from owncloud/fix-sticky-apps | Morris Jobke | 2013-09-02 | 1 | -4/+4 |
| |\ \ |
|
| | * | | fix issues caused by introduction of sticky Apps management footer | Jan-Christoph Borchardt | 2013-08-30 | 1 | -4/+4 |
| * | | | Merge pull request #4657 from owncloud/files-controls-fixes | Morris Jobke | 2013-09-01 | 1 | -7/+13 |
| |\ \ \ |
|
| | * | | | adjust right padding of controls bar, fix #4650 | Jan-Christoph Borchardt | 2013-08-30 | 1 | -2/+2 |
| | * | | | fix coding style for controls bar | Jan-Christoph Borchardt | 2013-08-30 | 1 | -7/+13 |
| * | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-icons | Morris Jobke | 2013-09-01 | 2 | -2/+19 |
| |\ \ \ \ |
|
| | * | | | | IE8 fixes | Morris Jobke | 2013-09-02 | 1 | -0/+4 |
| | * | | | | Fit filesummary for \OC\Preview's ne mimetype-icons | kondou | 2013-08-31 | 1 | -2/+15 |
| | | |_|/
| | |/| | |
|
| * | | | | Merge pull request #4671 from owncloud/emptycontent | Bernhard Posselt | 2013-09-01 | 5 | -11/+12 |
| |\ \ \ \ |
|
| | * | | | | rename emptyfolder to emptycontent | Alessandro Cosentino | 2013-08-31 | 3 | -8/+8 |
| | * | | | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 3 | -8/+9 |
| | |/ / / |
|
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 228 | -1751/+1919 |
* | | | | | Fix some of @jancborchardt's complaints in oc_avatars | kondou | 2013-09-02 | 4 | -9/+9 |
* | | | | | Pass setLastModifiedHeader() time() | kondou | 2013-09-01 | 1 | -2/+2 |
* | | | | | $image doesn't have data() when a defaultavatar should be used | kondou | 2013-09-01 | 1 | -1/+1 |
* | | | | | Also set an E-Tag header | kondou | 2013-09-01 | 1 | -0/+2 |
* | | | | | Use \OC_Response for cache invalidation | kondou | 2013-09-01 | 1 | -10/+4 |
* | | | | | Properly check for tmpavatar, invalidate cache, fix debug msgs | kondou | 2013-09-01 | 2 | -4/+16 |
* | | | | | Fix @tanghus's complains in avatars and clean up cropper after closing with "x" | kondou | 2013-09-01 | 2 | -8/+36 |
* | | | | | Provide 'enable_avatars' in config.php, to disable avatars | kondou | 2013-09-01 | 6 | -7/+22 |
* | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-01 | 3 | -146/+193 |
|\| | | | |
|
| * | | | | Merge pull request #4329 from owncloud/fix_4258 | Christopher | 2013-09-01 | 2 | -145/+192 |
| |\ \ \ \ |
|
| | * | | | | Check for $this->fileInfo and @depend on testData() | kondou | 2013-09-01 | 2 | -2/+5 |
| | * | | | | Merge branch 'master' into fix_4258 | kondou | 2013-08-31 | 145 | -120/+4872 |
| | |\| | | |
|
| | * | | | | Fix #4258, clean up \OC_Image and improve its unittest | kondou | 2013-08-30 | 2 | -145/+189 |
| * | | | | | fixing this obvious typo directly | Frank Karlitschek | 2013-09-01 | 1 | -1/+1 |
| | |/ / /
| |/| | | |
|
* | | | | | Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoade... | kondou | 2013-09-01 | 3 | -15/+17 |
* | | | | | Add a description for $.avatar() and remove TODOs @raghunayyar fixed | kondou | 2013-08-31 | 2 | -2/+28 |
* | | | | | Deal with OC.Router.generate() | kondou | 2013-08-31 | 1 | -4/+4 |
* | | | | | Sanitize displayname, respect data @ $element, fix routename, clean after cro... | kondou | 2013-08-31 | 5 | -12/+18 |
* | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-31 | 463 | -5441/+12834 |
|\| | | | |
|
| * | | | | Merge pull request #4022 from owncloud/oc_preview | Thomas Müller | 2013-08-31 | 145 | -120/+4872 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | fix issue with filetable background | Georg Ehrke | 2013-08-30 | 1 | -1/+1 |