summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-021-1/+1
* Properly check for tmpavatar, invalidate cache, fix debug msgskondou2013-09-011-1/+2
* Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-5/+7
* Merge branch 'master' into oc_avatarskondou2013-09-012-137/+166
|\
| * Merge pull request #4329 from owncloud/fix_4258Christopher2013-09-011-136/+165
| |\
| | * Check for $this->fileInfo and @depend on testData()kondou2013-09-011-2/+2
| | * Merge branch 'master' into fix_4258kondou2013-08-3119-2/+1392
| | |\
| | * | Fix #4258, clean up \OC_Image and improve its unittestkondou2013-08-301-136/+165
| * | | fixing this obvious typo directlyFrank Karlitschek2013-09-011-1/+1
| | |/ | |/|
* | | Merge branch 'master' into oc_avatarskondou2013-08-3130-19/+1581
|\| |
| * | Merge master into oc_previewGeorg Ehrke2013-08-3013-17/+189
| |\|
| | * Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-301-1/+3
| | |\
| | | * move CSS for browser-specific fixes out of styles.css into new fixes.cssJan-Christoph Borchardt2013-08-301-0/+1
| | | * move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-301-1/+2
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-309-3/+168
| | * | Merge pull request #4578 from houbaastef/masterStephane Martin2013-08-301-5/+10
| | |\ \
| | | * | fixes #4574Stephane Martin2013-08-261-5/+10
| | * | | Use the real username in preferences and magic cookie instead of case-insensi...Arthur Schiwon2013-08-301-3/+4
| | | |/ | | |/|
| | * | Merge pull request #4592 from owncloud/fix-logicThomas Müller2013-08-291-4/+2
| | |\ \
| | | * | fix weird logical behaviourMorris Jobke2013-08-271-4/+2
| | * | | also emmit create hook when creating new files using touch()Robin Appelman2013-08-291-0/+1
| | * | | webdav quota information contains the values for used and free - not totalThomas Müller2013-08-291-1/+1
| * | | | fix parameter missing warningGeorg Ehrke2013-08-291-1/+1
| * | | | Merge master into oc_previewGeorg Ehrke2013-08-2922-112/+368
| |\| | |
| * | | | invert logic of disable_previewsGeorg Ehrke2013-08-291-3/+3
| * | | | Merge master into oc_previewGeorg Ehrke2013-08-265-55/+39
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | fix return value of methodGeorg Ehrke2013-08-231-1/+2
| * | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-2366-242/+376
| |\ \ \ \
| * | | | | make it possible to disable previewsGeorg Ehrke2013-08-231-0/+10
| * | | | | style fixes for preview libGeorg Ehrke2013-08-195-43/+46
| * | | | | Merge master into oc_previewGeorg Ehrke2013-08-1997-600/+853
| |\ \ \ \ \
| * | | | | | check if ->resource is a resourceGeorg Ehrke2013-08-151-2/+4
| * | | | | | add comment to make @jancborchardt happyGeorg Ehrke2013-08-151-0/+1
| * | | | | | fix svg and cache transparency issueGeorg Ehrke2013-08-153-3/+10
| * | | | | | improve unknown backendGeorg Ehrke2013-08-152-20/+35
| * | | | | | don't generate previews of empty txt filesGeorg Ehrke2013-08-141-0/+4
| * | | | | | Merge master into oc_previewGeorg Ehrke2013-08-1489-571/+1078
| |\ \ \ \ \ \
| * | | | | | | fix deleting old previews after file changedGeorg Ehrke2013-08-141-1/+1
| * | | | | | | remove \OC\Preview::showErrorPreviewGeorg Ehrke2013-08-141-7/+0
| * | | | | | | update indexes of oc_permissionsGeorg Ehrke2013-08-091-1/+1
| * | | | | | | allow permissions.user to be null as suggested by @butonicGeorg Ehrke2013-08-071-1/+1
| * | | | | | | fix merge conflictsGeorg Ehrke2013-08-0515-118/+239
| |\ \ \ \ \ \ \
| * | | | | | | | suppress is_file error msgGeorg Ehrke2013-08-051-1/+1
| * | | | | | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-07-301-0/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix code style of try catch blocksGeorg Ehrke2013-07-303-3/+3
| * | | | | | | | | fix merge conflictsGeorg Ehrke2013-07-301-17/+1
| * | | | | | | | | style fixesGeorg Ehrke2013-07-3013-303/+163
| * | | | | | | | | Merge branch 'master' into oc_previewThomas Müller2013-07-3085-5419/+3048
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | add class='preview-icon' to rows in file app that make use of previewsGeorg Ehrke2013-07-292-28/+28
| * | | | | | | | | | Revert "OC\Preview - outsource static methods"Georg Ehrke2013-07-2910-43/+34