Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use non-empty defaults | Victor Dubiniuk | 2014-09-22 | 1 | -1/+1 |
* | Merge pull request #11228 from owncloud/drop-travis | Morris Jobke | 2014-09-22 | 4 | -274/+0 |
|\ | |||||
| * | Revert "Travis support" | Morris Jobke | 2014-09-22 | 4 | -274/+0 |
* | | Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition | Vincent Petry | 2014-09-22 | 1 | -0/+26 |
|\ \ | |||||
| * | | Added extra check to avoid deleting key folders | Vincent Petry | 2014-09-19 | 1 | -0/+26 |
* | | | Merge pull request #11167 from owncloud/env-movetomountreenableproxy | Morris Jobke | 2014-09-22 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Reenable file proxy when renaming between mount points | Vincent Petry | 2014-09-18 | 1 | -0/+1 |
* | | | Merge pull request #11204 from owncloud/fix_oc_stream_seek | Morris Jobke | 2014-09-22 | 4 | -3/+13 |
|\ \ \ | |||||
| * | | | in quota wrapper use === instead of ! for better readability and as in other ... | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| * | | | return boolean in Ciose::stream_seek | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| * | | | return boolean in OC::stream_seek | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| * | | | add seek and tell to streamwrapper test | Jörn Friedrich Dreyer | 2014-09-21 | 1 | -0/+10 |
* | | | | Merge pull request #11212 from owncloud/occ-catching-errors | Morris Jobke | 2014-09-22 | 2 | -23/+30 |
|\ \ \ \ | |||||
| * | | | | no loner use deprecated class \OC_Config | Thomas Müller | 2014-09-22 | 2 | -3/+16 |
| * | | | | remove bootstrapping - occ can by definition only be executed if ownCloud is ... | Thomas Müller | 2014-09-22 | 1 | -8/+0 |
| * | | | | show upgrade errors as error in the console and report back that the upgrade ... | Thomas Müller | 2014-09-22 | 1 | -12/+14 |
* | | | | | Merge pull request #11210 from owncloud/issue/11209 | Morris Jobke | 2014-09-22 | 1 | -1/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Also match routes without trailing slash | Joas Schilling | 2014-09-22 | 1 | -1/+20 |
* | | | | | | update 3rdparty submodule to its master commit | Morris Jobke | 2014-09-22 | 1 | -0/+0 |
* | | | | | | Merge pull request #9225 from voxsim/fix_displayNamesInGroup | blizzz | 2014-09-22 | 2 | -22/+328 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | 1. remove sizeof($filteredUsers) > 0 as condition | voxsim | 2014-09-18 | 1 | -2/+2 |
| * | | | | | add more logic in displayNamesInGroup for big user bases | voxsim | 2014-09-15 | 2 | -16/+49 |
| * | | | | | change logic in displayNamesInGroup and add some unit tests | voxsim | 2014-08-28 | 2 | -21/+294 |
| * | | | | | fix in displayNamesInGroup: when specified limit N, we did complex search onl... | voxsim | 2014-06-26 | 1 | -1/+1 |
* | | | | | | Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard | Thomas Müller | 2014-09-22 | 1 | -2/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Append port to trusted domain in case it's not 80 or 443 | Lukas Reschke | 2014-09-08 | 1 | -2/+10 |
* | | | | | | | Merge pull request #10499 from owncloud/mkcol-headers-afterbind | Thomas Müller | 2014-09-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use afterBind to send fileId header for files and directories | Vincent Petry | 2014-08-18 | 1 | -1/+1 |
* | | | | | | | | fix button text l10n | Volkan Gezer | 2014-09-22 | 1 | -1/+1 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-22 | 13 | -13/+18 |
* | | | | | | | | Merge pull request #11203 from owncloud/fix_broken_previews_on_public_page | Morris Jobke | 2014-09-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | files_sharing: add route for ajax/publicpreview | Georg Ehrke | 2014-09-21 | 1 | -0/+2 |
* | | | | | | | | | Merge pull request #11199 from owncloud/delete_bogus_previews | Morris Jobke | 2014-09-21 | 2 | -1/+43 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | delete old previews | Georg Ehrke | 2014-09-21 | 2 | -1/+43 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #11200 from owncloud/preview_better_errorhandling | Morris Jobke | 2014-09-21 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | make sure preview prop is instanceof OC_Image before using it in showPreview | Georg Ehrke | 2014-09-21 | 1 | -1/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #11196 from owncloud/sqlite-migration-smallint-master | Morris Jobke | 2014-09-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | adding 'smallint unsigned' to type mapping for sqlite | Thomas Müller | 2014-09-20 | 1 | -0/+1 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-21 | 24 | -41/+83 |
|/ / / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-20 | 31 | -97/+164 |
* | | | | | | | Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the... | Morris Jobke | 2014-09-19 | 1 | -7/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Throw error in showPreview instead the constructor | Lukas Reschke | 2014-09-19 | 1 | -7/+7 |
* | | | | | | | | Merge pull request #11184 from owncloud/typo | Morris Jobke | 2014-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | fix typo | Volkan Gezer | 2014-09-19 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Add myself as author | Vincent Petry | 2014-09-19 | 1 | -0/+1 |
* | | | | | | | Merge pull request #10968 from owncloud/admin-groupsselect2 | Lukas Reschke | 2014-09-19 | 68 | -113/+153 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add select2 cache for complete group list | Vincent Petry | 2014-09-11 | 1 | -23/+39 |
| * | | | | | | | fit select2 to ownCloud input style | Jan-Christoph Borchardt | 2014-09-10 | 1 | -0/+12 |
| * | | | | | | | Fixed select2 for admin and apps page | Vincent Petry | 2014-09-10 | 4 | -13/+29 |
| * | | | | | | | Added select2 on the apps page | Vincent Petry | 2014-09-09 | 6 | -88/+99 |