Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3891 from owncloud/fix_loadAppScriptFile | Bart Visscher | 2013-08-28 | 1 | -5/+8 |
|\ | |||||
| * | Check if the app is enabled and the app path is found before trying to load t... | Bart Visscher | 2013-06-28 | 1 | -5/+8 |
* | | Merge pull request #4434 from owncloud/fix_octemplate_escaping | Thomas Tanghus | 2013-08-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix octemplate string escaping. | Thomas Tanghus | 2013-08-14 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-28 | 2 | -3/+5 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 12 | -15/+144 |
* | | | add documentation | Morris Jobke | 2013-08-27 | 1 | -0/+13 |
* | | | Code style | Tom Needham | 2013-08-27 | 1 | -2/+2 |
* | | | Add quota to core api | Tom Needham | 2013-08-27 | 1 | -5/+28 |
* | | | Merge pull request #4348 from owncloud/fixing-4343-master | Jörn Friedrich Dreyer | 2013-08-27 | 1 | -27/+64 |
|\ \ \ | |||||
| * | | | lacy initialization of fileView - in case basic auth is used FileSystem is no... | Thomas Müller | 2013-08-26 | 1 | -4/+16 |
| * | | | Merge branch 'master' into fixing-4343-master | Thomas Müller | 2013-08-22 | 134 | -1291/+2159 |
| |\ \ \ | |||||
| * | | | | adding unit tests for quota checks | Thomas Müller | 2013-08-08 | 1 | -32/+43 |
| * | | | | adding unit tests to determine length | Thomas Müller | 2013-08-08 | 1 | -1/+1 |
| * | | | | fixes #4343 | Thomas Müller | 2013-08-08 | 1 | -2/+16 |
* | | | | | Merge pull request #4507 from owncloud/existingusersfromgroup | blizzz | 2013-08-27 | 1 | -14/+24 |
|\ \ \ \ \ | |||||
| * | | | | | consolidate validity check for users in group class | Arthur Schiwon | 2013-08-26 | 1 | -23/+24 |
| * | | | | | no assoc index here, makes tests pass again | Arthur Schiwon | 2013-08-19 | 1 | -1/+1 |
| * | | | | | return only existing users in group | Arthur Schiwon | 2013-08-19 | 1 | -3/+12 |
* | | | | | | Merge pull request #4586 from owncloud/fixing-3431-master | Morris Jobke | 2013-08-27 | 1 | -32/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | revert debugging code which accidentially entered this pull request | Thomas Müller | 2013-08-27 | 1 | -4/+0 |
| * | | | | | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 2 | -32/+4 |
* | | | | | | | storage information is path specific | Thomas Müller | 2013-08-27 | 1 | -2/+5 |
* | | | | | | | webdav quota now displays the same values as the web interface does | Thomas Müller | 2013-08-27 | 2 | -6/+6 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core in... | Morris Jobke | 2013-08-26 | 1 | -3/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | final fix for xsendfile zip generation race condition | Valerio Ponte | 2013-08-08 | 1 | -3/+20 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 2 | -8/+8 |
* | | | | | | | Merge pull request #4331 from owncloud/improve_app-management | Christopher | 2013-08-25 | 2 | -43/+27 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 78 | -244/+464 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't use an alert for displaying app-mgmt-errors | kondou | 2013-08-18 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'master' into improve_app-management | kondou | 2013-08-18 | 87 | -666/+752 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Throw exceptions instead of only logging in \OC_Installer::installApp() | kondou | 2013-08-09 | 1 | -35/+18 |
| * | | | | | | | | | Merge branch 'master' into improve_app-management | kondou | 2013-08-09 | 86 | -438/+1000 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Log exception at the catching code | kondou | 2013-08-09 | 1 | -5/+5 |
| * | | | | | | | | | | Improve app-management | kondou | 2013-08-06 | 1 | -4/+5 |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-23 | 1 | -4/+4 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 2 | -8/+8 |
* | | | | | | | | | | Merge branch 'master' of github.com:owncloud/core | Thomas Müller | 2013-08-22 | 1 | -6/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Sharing: only determine path root if owner is available | Arthur Schiwon | 2013-08-22 | 1 | -6/+10 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* / | | | | | | | | | additional readdir check in mappedlocal | Thomas Müller | 2013-08-22 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-21 | 1 | -4/+4 |
* | | | | | | | | | Merge pull request #4512 from owncloud/readdir-strict-equals | Thomas Müller | 2013-08-20 | 9 | -13/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into readdir-strict-equals | Georg Ehrke | 2013-08-19 | 13 | -142/+310 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | use strict equals in readdir loops to prevent issues with '0' files | Robin Appelman | 2013-08-19 | 9 | -13/+13 |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 43 | -68/+30 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4467 from owncloud/storage-wrapper-quota | icewind1991 | 2013-08-19 | 13 | -142/+310 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 115 | -1255/+2145 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | remove outdated quota proxy | Robin Appelman | 2013-08-16 | 1 | -114/+0 |
| * | | | | | | | | | fix quota wrapper reporting negative free_space, breaking user interface | Robin Appelman | 2013-08-16 | 1 | -1/+1 |
| * | | | | | | | | | use renamed constants | Robin Appelman | 2013-07-25 | 1 | -1/+1 |