| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #8488 from owncloud/sabre-notfoundloglevel | Lukas Reschke | 2014-05-07 | 2 | -6/+20 |
| |\ | | | | | Some expected Sabre exceptions are now logged with DEBUG level | ||||
| | * | Some expected Sabre exceptions are now logged with DEBUG level | Vincent Petry | 2014-05-07 | 2 | -6/+20 |
| | | | |||||
| * | | Merge pull request #8223 from owncloud/fix_linkToPublic | Vincent Petry | 2014-05-07 | 1 | -5/+13 |
| |\ \ | | | | | | | Fix linkToPublic and linkToAbsolute. | ||||
| | * | | Also fix linkToAbsolute | Thomas Tanghus | 2014-04-16 | 1 | -3/+7 |
| | | | | |||||
| | * | | Fix linkToPublic. Refs #8218 | Thomas Tanghus | 2014-04-15 | 1 | -2/+6 |
| | | | | |||||
| * | | | Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri | Vincent Petry | 2014-05-06 | 1 | -1/+4 |
| |\ \ \ | | | | | | | | | Send URI instead of filepath to NGINX for X-Accel | ||||
| | * | | | Send URI instead of filepath to NGINX for X-Accel | josh4trunks | 2014-04-03 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Merge pull request #8459 from owncloud/fix-getUserFolder | Morris Jobke | 2014-05-05 | 1 | -2/+10 |
| |\ \ \ \ | | | | | | | | | | | fix getUserFolder() of server container | ||||
| | * | | | | fix getUserFolder() of server container | Morris Jobke | 2014-05-05 | 1 | -2/+10 |
| | | |_|/ | |/| | | |||||
| * | | | | Dont create borders around previews when scaling up is disabled | Robin Appelman | 2014-05-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #8386 from owncloud/fix_6946_master | Vincent Petry | 2014-05-05 | 6 | -64/+39 |
| |\ \ \ \ | |/ / / |/| | | | Fix 6946 master | ||||
| | * | | | Group Database backend must not gather user details itself but ask user | Arthur Schiwon | 2014-04-28 | 6 | -64/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backends. This is a port to master from PR #7745 remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends Conflicts: lib/private/group/backend.php LDAP: getDisplayNamesInGroup is not an option for group backends anymore Conflicts: apps/user_ldap/group_ldap.php apps/user_ldap/group_proxy.php clean up group backends Conflicts: lib/private/group/database.php remove now unnecessary test implement getDisplayNames in group manager adjust user manager tests test for group manager's displayNamesInGroup trim must not be used in empty in PHP < 5.5 keep the constant to not provoke PHP warnings Conflicts: lib/private/group/backend.php | ||||
| * | | | | Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master | Thomas Müller | 2014-05-05 | 6 | -22/+48 |
| |\ \ \ \ | | | | | | | | | | | Images on public sharing get downscaled to increase use experience - thi... | ||||
| | * | | | | Images on public sharing get downscaled to increase use experience - this ↵ | Thomas Müller | 2014-05-02 | 6 | -22/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will speed up loading time - adding keep aspect to core/ajax/preview.php - remove duplicate method Preview::show() - no more hard coded mimetype of preview - remove .png from the preview urls - keep old route preview.png for backwards compatibility - aspect preserving previews are now cached | ||||
| * | | | | | Merge pull request #8442 from owncloud/fix-typo | Thomas Müller | 2014-05-05 | 2 | -9/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix typo and PHPDoc | ||||
| | * | | | | | Fix PHP Doc and use readable variable name | Lukas Reschke | 2014-05-04 | 1 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | Does also take int or string | Lukas Reschke | 2014-05-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fix typo | Lukas Reschke | 2014-05-04 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-05 | 3 | -3/+56 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #8023 from flyser/master | Morris Jobke | 2014-05-03 | 2 | -3/+27 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix setting the max-upload-size for really large values. | ||||
| | * | | | | | Fix setting the max-upload-size for really large values. | Fabian Henze | 2014-04-03 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | php can only parse filesize units up to gigabytes, not terabytes or petabytes. | ||||
| * | | | | | | Merge pull request #8171 from owncloud/fix-import | Bernhard Posselt | 2014-05-02 | 2 | -3/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | be nice and use a relative import so people can use the class without fi... | ||||
| | * | | | | | | add class Pimple to autloader | Thomas Müller | 2014-04-28 | 2 | -3/+1 |
| | | | | | | | | |||||
| | * | | | | | | be nice and use a relative import so people can use the class without firing ↵ | Bernhard Posselt | 2014-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up owncloud | ||||
| * | | | | | | | Merge pull request #8377 from youngguns-nl/issue_8376 | Vincent Petry | 2014-05-02 | 2 | -2/+20 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | RecursiveDirectoryIterator does not work on NFS | ||||
| | * | | | | | | refs #8376; spaces=>tabs | Sjors van der Pluijm | 2014-04-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | refs #8376; added comment and applied patch on other files | Sjors van der Pluijm | 2014-04-28 | 2 | -1/+15 |
| | | | | | | | | |||||
| | * | | | | | | rewind iterator before iteration starts | Sjors van der Pluijm | 2014-04-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | fixes #8376 | Sjors van der Pluijm | 2014-04-28 | 1 | -1/+4 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-01 | 4 | -0/+27 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #8391 from owncloud/router-parameter-sorting | Thomas Müller | 2014-04-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Preserve keys when sorting parameters when generatings urls | ||||
| | * | | | | | | Preserve keys when sorting parameters when generatings urls | Robin Appelman | 2014-04-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #8132 from owncloud/issue/8131 | Thomas Müller | 2014-04-30 | 2 | -77/+57 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Issue/8131 Fix emitting of filesystem related hooks | ||||
| | * | | | | | | | Deduplicate code | Joas Schilling | 2014-04-29 | 1 | -136/+39 |
| | | | | | | | | | |||||
| | * | | | | | | | Correctly emit create/update hooks when a large file is being created/update | Joas Schilling | 2014-04-29 | 1 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after being uploaded in .part files Fix #8131 | ||||
| | * | | | | | | | Emit a new hook, when a file is being updated only | Joas Schilling | 2014-04-29 | 2 | -1/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The write-hook also is triggered for created files Fix #8131 | ||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-30 | 5 | -0/+32 |
| | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | | Merge pull request #8285 from owncloud/better_getmountby_handling | icewind1991 | 2014-04-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Handle return values better from Filesystem::getMountBy* | ||||
| | * | | | | | | Better handle return values from Filesystem::getMountBy* | Robin McCorkell | 2014-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getMountByStorageId and getMountByNumericId return an empty array on error, which should be detected to avoid possible errors. This commit also adds in some new logging points and throws to aid debugging | ||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-29 | 7 | -0/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #7852 from josh4trunks/basic_auth_fix | Thomas Müller | 2014-04-28 | 1 | -13/+14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixes login / logout when HTTP Basic Headers are avilable. | ||||
| | * | | | | | | | Fixed Typo | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Don't always $cookie_path, only set it when needed | josh4trunks | 2014-04-03 | 1 | -3/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | cookie would be useless if value is not set | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Don't to set the cookie it wasn't needed. | josh4trunks | 2014-04-03 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixes login / logout when HTTP Basic Headers are avilable. | josh4trunks | 2014-04-03 | 1 | -13/+15 |
| | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | | Update outdated comment | Volkan Gezer | 2014-04-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | remove preview office fallback as it makes too much trouble and generates ↵ | Georg Ehrke | 2014-04-28 | 2 | -149/+0 |
| | |_|/ / / / |/| | | | | | | | | | | | | | | | | | inacceptable results | ||||
| * | | | | | | Merge pull request #7473 from owncloud/append-error-document | Thomas Müller | 2014-04-28 | 2 | -46/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove .htaccess creation code | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |