summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into clean_up_utilkondou2013-09-023-6/+63
|\
| * fixing this obvious typo directlyFrank Karlitschek2013-09-011-1/+1
| * Merge branch 'master' into oc_previewGeorg Ehrke2013-08-231-6/+10
| |\
| | * Sharing: only determine path root if owner is availableArthur Schiwon2013-08-221-6/+10
| * | Merge master into oc_previewGeorg Ehrke2013-08-193-2/+10
| |\|
| * | fix merge conflictsGeorg Ehrke2013-08-051-2/+23
| |\ \
| * \ \ Merge branch 'master' into oc_previewThomas Müller2013-07-306-17/+71
| |\ \ \
| * | | | add class='preview-icon' to rows in file app that make use of previewsGeorg Ehrke2013-07-291-27/+11
| * | | | implement use of previews in sharing appGeorg Ehrke2013-07-111-0/+10
| * | | | merge conflicts ...Georg Ehrke2013-07-103-3/+189
| |\ \ \ \
| * | | | | implement server side use of previewsGeorg Ehrke2013-06-261-0/+9
| * | | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-06-171-12/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-06-062-95/+160
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-05-251-1/+141
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-05-171-1/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-04-2213-259/+950
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | first version of the new previewer lib. It currently only created previews/th...Frank Karlitschek2012-11-131-0/+50
* | | | | | | | | | | Merge branch 'master' into clean_up_utilkondou2013-08-203-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-181-0/+8
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-171-2/+23
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-121-0/+8
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Add _many_ newlines at the end of fileskondou2013-08-182-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* / | | | | | | | | Clean up \OC\Utilkondou2013-08-151-1/+1
|/ / / / / / / / /
* | | | | | | | | cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-011-2/+20
* | | | | | | | | fixes #4026Thomas Müller2013-07-301-0/+3
|/ / / / / / / /
* | | | | | | | functions in OCP should be staticRobin Appelman2013-07-251-1/+1
* | | | | | | | need to use \OC_Image to escape OCP namespaceJörn Friedrich Dreyer2013-07-221-1/+1
* | | | | | | | return result from getL10NRobin Appelman2013-07-221-1/+1
* | | | | | | | Merge pull request #3880 from owncloud/code-checkerBart Visscher2013-07-213-8/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct casing of OC_User and pass through the params to getUsersBart Visscher2013-07-191-8/+8
| * | | | | | | | Add OC_L10N to public apiBart Visscher2013-07-191-0/+9
| * | | | | | | | Add OC_Image to public apiBart Visscher2013-07-191-0/+29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | add proper deprecated tagMorris Jobke2013-07-211-0/+1
* | | | | | | | add back public API function, but mark as deprecatedJan-Christoph Borchardt2013-07-201-0/+10
* | | | | | | | finally remove the file size obfuscation as it had more disadvantages. I was ...Jan-Christoph Borchardt2013-07-181-10/+0
* | | | | | | | Merge pull request #3270 from owncloud/convert-oc_configicewind19912013-07-111-6/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge branch 'master' into convert-oc_configBart Visscher2013-07-081-1/+24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into convert-oc_configBart Visscher2013-07-041-0/+108
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into convert-oc_configThomas Müller2013-07-011-2/+32
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into convert-oc_configBart Visscher2013-06-271-12/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into convert-oc_configMichael Gapczynski2013-06-032-61/+266
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Fix returns of values in OCP\ConfigBart Visscher2013-05-071-6/+21
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Implement encodePathVictor Dubiniuk2013-07-091-0/+14
* | | | | | | | | | Only emit permissions hook for files and and include pathMichael Gapczynski2013-07-081-9/+11
* | | | | | | | | | Add update permissions hook to sharingMichael Gapczynski2013-07-081-0/+9
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | removing unused getSharedItem()Thomas Müller2013-07-061-11/+0
* | | | | | | | | Merge branch 'master' into fixing-3942-masterThomas Müller2013-07-061-1/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | proper fix for getting the shared item if no user is logged inThomas Müller2013-07-051-1/+12
| | |_|_|_|/ / / / | |/| | | | | | |
* / | | | | | | | on reshares we now recursively move to the root of all reshares - therefore s...Thomas Müller2013-07-051-0/+23
|/ / / / / / / /
* | | | / / / / add public apiBjörn Schießle2013-07-041-0/+108
| |_|_|/ / / / |/| | | | | |