summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Only update the etag. Do not re-submit any other unchanged data.Andreas Fischer2013-09-201-2/+3
|
* Use update() instead of put().Andreas Fischer2013-09-201-3/+1
|
* when storing back the data field 'encrypted' it is necessary to cast the ↵Thomas Müller2013-09-202-0/+3
| | | | boolean to an integer to make pg happy
* etag changes are now propagated up the file treeThomas Müller2013-09-162-6/+29
|
* Merge branch 'master' into fixing-4866-masterThomas Müller2013-09-16297-7339/+12951
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-16297-7339/+12951
| |
* | recreate an etag within the scanner if the cache contains an empty etagThomas Müller2013-09-162-1/+24
|/
* Merge pull request #4838 from owncloud/refactor_upload_jsThomas Müller2013-09-163-33/+26
|\ | | | | refactor upload js & html to always use only js to fill form data
| * refactor upload js & html to always use only js to fill form dataJörn Friedrich Dreyer2013-09-133-33/+26
| |
* | Merge pull request #4862 from owncloud/db_to_publicThomas Müller2013-09-161-0/+11
|\ \ | | | | | | Add OCP\DB::getErrorMessage() to public namespace.
| * | Add OCP\DB::getErrorMessage() to public namespace.Thomas Tanghus2013-09-161-0/+11
|/ /
* | Merge pull request #4860 from ↵icewind19912013-09-151-0/+6
|\ \ | | | | | | | | | | | | owncloud/fixing-potential-null-storage-on-scanner-master adding null check on a mount's storage
| * | adding null check on a mount's storageThomas Müller2013-09-151-0/+6
|/ /
* | Merge pull request #4835 from owncloud/fix-apps-heightMorris Jobke2013-09-151-2/+2
|\ \ | | | | | | use lineheight instead of padding and height
| * | use lineheight instead of padding and heightBernhard Posselt2013-09-131-2/+2
| |/
* | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enterMorris Jobke2013-09-151-2/+4
|\ \ | | | | | | Fixes #4465 - Added autoFocus to #shareWith autocomplete options
| * | no autoFocus if no users returnedPete McFarlane2013-09-111-1/+3
| | |
| * | Added autoFocus to #shareWith autocomplete optionsPete McFarlane2013-09-111-3/+3
| | |
* | | Merge pull request #4853 from owncloud/external-shared_mimetype-iconsThomas Müller2013-09-152-16/+10
|\ \ \ | | | | | | | | Use external and shared icons in OC.Dialogs.filepicker()
| * | | Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-142-16/+10
| | | |
* | | | Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-1420-2/+578
|\ \ \ \ | | | | | | | | | | OC Avatars
| * | | | Remove superfluous $kondou2013-09-141-1/+1
| | | | |
| * | | | Merge branch 'master' into oc_avatarskondou2013-09-12511-3418/+12124
| |\ \ \ \
| * | | | | Add a comment to clear defaultavatar-functionalitykondou2013-09-111-0/+1
| | | | | |
| * | | | | Bring another enable_avatars to $_ and fix $thus->$thiskondou2013-09-113-2/+3
| | | | | |
| * | | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-097-36/+41
| | | | | |
| * | | | | Have the "notsquare" error as data, not as messagekondou2013-09-062-2/+2
| | | | | |
| * | | | | Use \OC_App for checking whether encryption is enabledkondou2013-09-051-1/+1
| | | | | |
| * | | | | Clean up avatars and preliminary use JSON->rawlist.phpkondou2013-09-054-18/+18
| | | | | |
| * | | | | Fix an IE8 bug with the avatarcropper.kondou2013-09-052-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Crop an avatar 2. Crop another avatar without reloading -> Second cropper is 28px x 30px big
| * | | | | Have login-checks and CSRF checkskondou2013-09-053-8/+16
| | | | | |
| * | | | | Use proper controller namingkondou2013-09-042-8/+10
| | | | | |
| * | | | | Fix some bugs and remove \OCP\Avatar for nowkondou2013-09-042-18/+6
| | | | | |
| * | | | | fixing style, var name & PHPDocThomas Müller2013-09-042-3/+5
| | | | | |
| * | | | | Remove backgroundcolor on updating avatar, and add a missing parameterkondou2013-09-041-3/+8
| | | | | |
| * | | | | Merge branch 'master' into oc_avatarskondou2013-09-0458-468/+630
| |\ \ \ \ \
| * | | | | | Clean up oc_avatarskondou2013-09-043-9/+10
| | | | | | |
| * | | | | | Don't update avatar on displayNameChange anymorekondou2013-09-041-1/+0
| | | | | | |
| * | | | | | Have the header avatar to the left of the user namekondou2013-09-032-9/+18
| | | | | | |
| * | | | | | Fix unwanted caching in IE8kondou2013-09-032-7/+20
| | | | | | |
| * | | | | | Partly fix cropper in IE8 and don't use a dialog for itkondou2013-09-032-25/+34
| | | | | | |
| * | | | | | Don't use HTML5 <header> to support avatars in IE8kondou2013-09-032-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into oc_avatarskondou2013-09-03242-1875/+2007
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/config.sample.php
| * | | | | | | Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-024-9/+9
| | | | | | | |
| * | | | | | | Pass setLastModifiedHeader() time()kondou2013-09-011-2/+2
| | | | | | | |
| * | | | | | | $image doesn't have data() when a defaultavatar should be usedkondou2013-09-011-1/+1
| | | | | | | |
| * | | | | | | Also set an E-Tag headerkondou2013-09-011-0/+2
| | | | | | | |
| * | | | | | | Use \OC_Response for cache invalidationkondou2013-09-011-10/+4
| | | | | | | |
| * | | | | | | Properly check for tmpavatar, invalidate cache, fix debug msgskondou2013-09-012-4/+16
| | | | | | | |
| * | | | | | | Fix @tanghus's complains in avatars and clean up cropper after closing with "x"kondou2013-09-012-8/+36
| | | | | | | |