summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Use more object oriented way for console commandsBart Visscher2013-09-011-0/+1
* 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
|\| | |
| * | | fix typoMorris Jobke2013-08-281-1/+1
| * | | Only enable logrotate when configured. Also rotate size is settable.Bart Visscher2013-08-282-8/+11
| * | | Check for installed state before registering the logrotate background jobBart Visscher2013-08-282-2/+16
| * | | Add description to log rotate classBart Visscher2013-08-281-0/+7
| * | | Review fixesBart Visscher2013-08-281-4/+4
| * | | Very simple log rotationBart Visscher2013-08-282-0/+27
| * | | 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
* | | | | | | | invert logic of disable_previewsGeorg Ehrke2013-08-291-3/+3
* | | | | | | | Merge master into oc_previewGeorg Ehrke2013-08-265-55/+39
|\| | | | | | |
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-252-8/+8