summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | use storage wrapper for quota instead of a filesystem proxyRobin Appelman2013-07-251-2/+22
| * | | | add conveince function to wrap all storagesRobin Appelman2013-07-251-0/+12
| * | | | use renamed constantsRobin Appelman2013-07-251-2/+2
| * | | | add option to wrap existing mountsRobin Appelman2013-07-252-0/+14
| * | | | fix getPermissionsCache for storage wrapperRobin Appelman2013-07-251-1/+1
| * | | | add quota storage wrapperRobin Appelman2013-07-251-0/+104
| * | | | add quota streamwrapper that limits the amount of data that can be written to...Robin Appelman2013-07-252-16/+147
| * | | | rename constantsRobin Appelman2013-07-253-4/+5
* | | | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-183-1/+36
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-17109-1018/+1679
| |\ \ \ \ \
| * | | | | | throw exception if encryption was disabled but files are still encrypted to p...Bjoern Schiessle2013-08-141-1/+11
| * | | | | | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-122-0/+25
| * | | | | | fix searchUsers() call in group.phpBjoern Schiessle2013-07-311-1/+1
* | | | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-189-9/+9
|\ \ \ \ \ \ \
| * | | | | | | Add _many_ newlines at the end of fileskondou2013-08-189-9/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Port DAV groupMemberSet fix to master #4458Thomas Tanghus2013-08-181-6/+8
* | | | | | | Merge pull request #4485 from guruz/class_autoloader_optimizationMarkus Goetz2013-08-182-1/+54
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Class Auto Loader: Cache paths in APCMarkus Goetz2013-08-182-1/+54
* | | | | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-173-236/+375
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-1699-850/+1360
| |\ \ \ \ \ \
| * | | | | | | use ===Robin Appelman2013-08-071-4/+4
| * | | | | | | add the option to have templates for newly created filesRobin Appelman2013-08-072-0/+60
| * | | | | | | split of mimetype detection code from OC_Helper, adding the option for apps t...Robin Appelman2013-08-072-236/+315
| | |_|_|_|/ / | |/| | | | |
* | | | | | | remove ru_RU - fixes #3135Thomas Müller2013-08-171-6/+0
* | | | | | | Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-161-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ merge master into css-fixesJan-Christoph Borchardt2013-08-16109-1008/+1661
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | change long couldn't be determined string to question mark againJan-Christoph Borchardt2013-08-041-1/+1