summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3891 from owncloud/fix_loadAppScriptFileBart Visscher2013-08-281-5/+8
|\
| * Check if the app is enabled and the app path is found before trying to load t...Bart Visscher2013-06-281-5/+8
* | Merge pull request #4434 from owncloud/fix_octemplate_escapingThomas Tanghus2013-08-281-1/+1
|\ \
| * | Fix octemplate string escaping.Thomas Tanghus2013-08-141-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-282-3/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2712-15/+144
* | | add documentationMorris Jobke2013-08-271-0/+13
* | | Code styleTom Needham2013-08-271-2/+2
* | | Add quota to core apiTom Needham2013-08-271-5/+28
* | | Merge pull request #4348 from owncloud/fixing-4343-masterJörn Friedrich Dreyer2013-08-271-27/+64
|\ \ \
| * | | lacy initialization of fileView - in case basic auth is used FileSystem is no...Thomas Müller2013-08-261-4/+16
| * | | Merge branch 'master' into fixing-4343-masterThomas Müller2013-08-22134-1291/+2159
| |\ \ \
| * | | | adding unit tests for quota checksThomas Müller2013-08-081-32/+43
| * | | | adding unit tests to determine lengthThomas Müller2013-08-081-1/+1
| * | | | fixes #4343Thomas Müller2013-08-081-2/+16
* | | | | Merge pull request #4507 from owncloud/existingusersfromgroupblizzz2013-08-271-14/+24
|\ \ \ \ \
| * | | | | consolidate validity check for users in group classArthur Schiwon2013-08-261-23/+24
| * | | | | no assoc index here, makes tests pass againArthur Schiwon2013-08-191-1/+1
| * | | | | return only existing users in groupArthur Schiwon2013-08-191-3/+12
* | | | | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-271-32/+0
|\ \ \ \ \ \
| * | | | | | revert debugging code which accidentially entered this pull requestThomas Müller2013-08-271-4/+0
| * | | | | | kill zh_CN.GB2312Thomas Müller2013-08-272-32/+4
* | | | | | | storage information is path specificThomas Müller2013-08-271-2/+5
* | | | | | | webdav quota now displays the same values as the web interface doesThomas Müller2013-08-272-6/+6
|/ / / / / /
* | | | | | Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core in...Morris Jobke2013-08-261-3/+20
|\ \ \ \ \ \
| * | | | | | final fix for xsendfile zip generation race conditionValerio Ponte2013-08-081-3/+20
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-252-8/+8
* | | | | | | Merge pull request #4331 from owncloud/improve_app-managementChristopher2013-08-252-43/+27
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into improve_app-managementkondou2013-08-2178-244/+464
| |\ \ \ \ \ \ \
| * | | | | | | | Don't use an alert for displaying app-mgmt-errorskondou2013-08-181-1/+1
| * | | | | | | | Merge branch 'master' into improve_app-managementkondou2013-08-1887-666/+752
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Throw exceptions instead of only logging in \OC_Installer::installApp()kondou2013-08-091-35/+18
| * | | | | | | | | Merge branch 'master' into improve_app-managementkondou2013-08-0986-438/+1000
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Log exception at the catching codekondou2013-08-091-5/+5
| * | | | | | | | | | Improve app-managementkondou2013-08-061-4/+5
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-231-4/+4
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-222-8/+8
* | | | | | | | | | Merge branch 'master' of github.com:owncloud/coreThomas Müller2013-08-221-6/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sharing: only determine path root if owner is availableArthur Schiwon2013-08-221-6/+10
| | |_|_|/ / / / / / | |/| | | | | | | |
* / | | | | | | | | additional readdir check in mappedlocalThomas Müller2013-08-221-1/+1
|/ / / / / / / / /
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-211-4/+4
* | | | | | | | | Merge pull request #4512 from owncloud/readdir-strict-equalsThomas Müller2013-08-209-13/+13
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into readdir-strict-equalsGeorg Ehrke2013-08-1913-142/+310
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | use strict equals in readdir loops to prevent issues with '0' filesRobin Appelman2013-08-199-13/+13
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1943-68/+30
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-1913-142/+310
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | merge master in storage-wrapper-quotaRobin Appelman2013-08-18115-1255/+2145
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | remove outdated quota proxyRobin Appelman2013-08-161-114/+0
| * | | | | | | | | fix quota wrapper reporting negative free_space, breaking user interfaceRobin Appelman2013-08-161-1/+1
| * | | | | | | | | use renamed constantsRobin Appelman2013-07-251-1/+1