| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 637 | -4144/+20474 |
| |\ |
|
| | * | Merge pull request #4838 from owncloud/refactor_upload_js | Thomas Müller | 2013-09-16 | 3 | -33/+26 |
| | |\ |
|
| | | * | refactor upload js & html to always use only js to fill form data | Jörn Friedrich Dreyer | 2013-09-13 | 3 | -33/+26 |
| | * | | Merge pull request #4862 from owncloud/db_to_public | Thomas Müller | 2013-09-16 | 1 | -0/+11 |
| | |\ \ |
|
| | | * | | Add OCP\DB::getErrorMessage() to public namespace. | Thomas Tanghus | 2013-09-16 | 1 | -0/+11 |
| | |/ / |
|
| | * | | Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scann... | icewind1991 | 2013-09-15 | 1 | -0/+6 |
| | |\ \ |
|
| | | * | | adding null check on a mount's storage | Thomas Müller | 2013-09-15 | 1 | -0/+6 |
| | |/ / |
|
| | * | | Merge pull request #4835 from owncloud/fix-apps-height | Morris Jobke | 2013-09-15 | 1 | -2/+2 |
| | |\ \ |
|
| | | * | | use lineheight instead of padding and height | Bernhard Posselt | 2013-09-13 | 1 | -2/+2 |
| | | |/ |
|
| | * | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter | Morris Jobke | 2013-09-15 | 1 | -2/+4 |
| | |\ \ |
|
| | | * | | no autoFocus if no users returned | Pete McFarlane | 2013-09-11 | 1 | -1/+3 |
| | | * | | Added autoFocus to #shareWith autocomplete options | Pete McFarlane | 2013-09-11 | 1 | -3/+3 |
| | * | | | Merge pull request #4853 from owncloud/external-shared_mimetype-icons | Thomas Müller | 2013-09-15 | 2 | -16/+10 |
| | |\ \ \ |
|
| | | * | | | Use external and shared icons in OC.Dialogs.filepicker() | kondou | 2013-09-14 | 2 | -16/+10 |
| | * | | | | Merge pull request #4506 from owncloud/oc_avatars | Bernhard Posselt | 2013-09-14 | 20 | -2/+578 |
| | |\ \ \ \ |
|
| | | * | | | | Remove superfluous $ | kondou | 2013-09-14 | 1 | -1/+1 |
| | | * | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-12 | 511 | -3418/+12124 |
| | | |\ \ \ \ |
|
| | | * | | | | | Add a comment to clear defaultavatar-functionality | kondou | 2013-09-11 | 1 | -0/+1 |
| | | * | | | | | Bring another enable_avatars to $_ and fix $thus->$this | kondou | 2013-09-11 | 3 | -2/+3 |
| | | * | | | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatars | kondou | 2013-09-09 | 7 | -36/+41 |
| | | * | | | | | Have the "notsquare" error as data, not as message | kondou | 2013-09-06 | 2 | -2/+2 |
| | | * | | | | | Use \OC_App for checking whether encryption is enabled | kondou | 2013-09-05 | 1 | -1/+1 |
| | | * | | | | | Clean up avatars and preliminary use JSON->rawlist.php | kondou | 2013-09-05 | 4 | -18/+18 |
| | | * | | | | | Fix an IE8 bug with the avatarcropper. | kondou | 2013-09-05 | 2 | -10/+12 |
| | | * | | | | | Have login-checks and CSRF checks | kondou | 2013-09-05 | 3 | -8/+16 |
| | | * | | | | | Use proper controller naming | kondou | 2013-09-04 | 2 | -8/+10 |
| | | * | | | | | Fix some bugs and remove \OCP\Avatar for now | kondou | 2013-09-04 | 2 | -18/+6 |
| | | * | | | | | fixing style, var name & PHPDoc | Thomas Müller | 2013-09-04 | 2 | -3/+5 |
| | | * | | | | | Remove backgroundcolor on updating avatar, and add a missing parameter | kondou | 2013-09-04 | 1 | -3/+8 |
| | | * | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-04 | 58 | -468/+630 |
| | | |\ \ \ \ \ |
|
| | | * | | | | | | 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 |
| | | |\ \ \ \ \ \ |
|
| | | * | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | | 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 |
