| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #6704 from owncloud/encryptedfoldersizecalc | Vincent Petry | 2014-01-14 | 1 | -5/+17 |
|\ |
|
| * | Fix calculated folder size to use unencrypted size | Vincent Petry | 2014-01-09 | 1 | -5/+17 |
* | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 1 | -12/+0 |
* | | fixing typo in redirection query string | st3so | 2014-01-12 | 1 | -1/+1 |
* | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandling | Vincent Petry | 2014-01-09 | 1 | -1/+4 |
|\ \ |
|
| * | | Removed special handling of part files in shared storage rename | Vincent Petry | 2014-01-08 | 1 | -1/+4 |
* | | | rename user-id to loginname to stay consistent | Thomas Müller | 2014-01-09 | 1 | -2/+2 |
* | | | set login name within apache auth backend | Thomas Müller | 2014-01-09 | 1 | -0/+2 |
* | | | fixing PHPDoc and use cameCase names | Thomas Müller | 2014-01-09 | 1 | -7/+7 |
| |/
|/| |
|
* | | Merge pull request #6681 from owncloud/userreport | blizzz | 2014-01-08 | 4 | -7/+56 |
|\ \ |
|
| * | | Infowarning about 32bit | Arthur Schiwon | 2014-01-08 | 1 | -0/+1 |
| * | | add tests for user counting | Arthur Schiwon | 2014-01-08 | 1 | -0/+9 |
| * | | if backends have the same class name, sum their users up instead of overwriting | Arthur Schiwon | 2014-01-08 | 1 | -1/+5 |
| * | | Introduce user count action to user management | Arthur Schiwon | 2014-01-07 | 3 | -7/+42 |
* | | | Fix ownCloud for php5.3.x | Thomas Müller | 2014-01-08 | 1 | -1/+2 |
* | | | Prevent deleting storage root | Vincent Petry | 2014-01-08 | 1 | -0/+13 |
| |/
|/| |
|
* | | Merge branch 'master' into disable-mod_pagespeed | Thomas Müller | 2014-01-08 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfil... | Vincent Petry | 2014-01-08 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Now also preventing to override "files" dir size with -1 | Vincent Petry | 2014-01-07 | 1 | -1/+1 |
* | | | | turn off mod_pagespeed | Thomas Müller | 2014-01-08 | 1 | -0/+3 |
|/ / / |
|
* | | | Merge pull request #6594 from owncloud/kill-index.php-from-url | Jörn Friedrich Dreyer | 2014-01-07 | 3 | -4/+28 |
|\ \ \
| |/ /
|/| | |
|
| * | | use getAppWebPath() in here as well | Thomas Müller | 2013-12-31 | 1 | -1/+1 |
| * | | new config parameter 'front_controller_active' which will instruct the url ge... | Thomas Müller | 2013-12-31 | 2 | -3/+27 |
* | | | Merge pull request #6660 from owncloud/fixing-disabled-function-checks | Thomas Müller | 2014-01-07 | 3 | -4/+6 |
|\ \ \ |
|
| * | | | trimming all array elements | Thomas Müller | 2014-01-07 | 1 | -1/+3 |
| * | | | we shall explode on ',' only | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| * | | | reuse existing helper function OC_Helper::is_function_enabled | Thomas Müller | 2014-01-07 | 2 | -2/+2 |
* | | | | Merge pull request #6290 from owncloud/files-androidcontentdisposition | Thomas Müller | 2014-01-07 | 4 | -6/+47 |
|\ \ \ \ |
|
| * | | | | Added isUserAgent() method to request | Vincent Petry | 2013-12-19 | 2 | -2/+24 |
| * | | | | Added workaround for Android content disposition | Vincent Petry | 2013-12-10 | 1 | -1/+2 |
| * | | | | Moved content disposition code+workarounds to OCP\Response | Vincent Petry | 2013-12-10 | 3 | -6/+24 |
* | | | | | Merge pull request #6642 from owncloud/update-SabreDAV | Thomas Müller | 2014-01-07 | 1 | -2/+6 |
|\ \ \ \ \ |
|
| * | | | | | Remove @ in order to get proper error handling | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| * | | | | | require composer's autoload.php if present | Thomas Müller | 2014-01-05 | 1 | -2/+6 |
* | | | | | | Merge pull request #6663 from owncloud/fix_empty_mimetypes | Thomas Müller | 2014-01-07 | 1 | -2/+1 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | remove duplicate exe mimetype, add correct msi mimetype | Jörn Friedrich Dreyer | 2014-01-07 | 1 | -2/+1 |
* | | | | | | Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-... | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | in order to work properly with encryption ocTransferId is added to the file p... | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| * | | | | | Adding a random postfix to the part file. | Thomas Müller | 2013-12-20 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-07 | 1 | -0/+8 |
| |_|_|_|/
|/| | | | |
|
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-06 | 2 | -2/+9 |
* | | | | | Merge pull request #6031 from s0taka/master | Morris Jobke | 2014-01-05 | 1 | -1/+1 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | No decimal points for Kilobyte and Byte #5371. | Simon Könnecke | 2013-11-25 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-05 | 1 | -0/+2 |
* | | | | | Merge pull request #6610 from owncloud/apcu-clear | icewind1991 | 2014-01-03 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Fix APCIterator syntax in \OC\Memcache\APCU::clear | Robin Appelman | 2014-01-02 | 1 | -1/+1 |
* | | | | | | Merge pull request #6605 from owncloud/free_space_disabled | Thomas Müller | 2014-01-02 | 1 | -1/+1 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free spa... | Robin Appelman | 2014-01-02 | 1 | -1/+1 |
* | | | | | | Merge pull request #6513 from owncloud/user-no-change-displayname | icewind1991 | 2014-01-02 | 3 | -14/+50 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Merge branch 'master' into user-no-change-displayname | Robin Appelman | 2013-12-19 | 11 | -82/+173 |
| |\ \ \ \ \ |
|