| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | 11 | -127/+95 |
| |\ | | | | | Fix 6946 master | ||||
| | * | the group manager calls exists check less often, adjust test accordingly | Arthur Schiwon | 2014-04-28 | 1 | -1/+1 |
| | | | |||||
| | * | Group Database backend must not gather user details itself but ask user | Arthur Schiwon | 2014-04-28 | 11 | -127/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 14 | -76/+135 |
| |\ \ | | | | | | | Images on public sharing get downscaled to increase use experience - thi... | ||||
| | * | | load image via javascript and use $(document).width() to determine the ↵ | Thomas Müller | 2014-05-02 | 2 | -48/+62 |
| | | | | | | | | | | | | | proper side of the image to be returned | ||||
| | * | | Images on public sharing get downscaled to increase use experience - this ↵ | Thomas Müller | 2014-05-02 | 13 | -32/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 29 | -130/+209 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-04 | 243 | -1045/+1206 |
| | | | | |||||
| * | | | Merge pull request #8440 from wakeup/master | Andreas Fischer | 2014-05-03 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes in config.sample * wakeup/master: Update config.sample.php Minor changes in config.sample | ||||
| | * | | | Update config.sample.php | Volkan Gezer | 2014-05-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Minor changes in config.sample | Volkan Gezer | 2014-05-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * appcodechecker accepts boolean. * using different ports in trusted domains Partially fixes #330 | ||||
| * | | | | Merge pull request #8023 from flyser/master | Morris Jobke | 2014-05-03 | 3 | -3/+49 |
| |\ \ \ \ | | | | | | | | | | | Fix setting the max-upload-size for really large values. | ||||
| | * | | | | Add unit tests for OC_Helper::phpFileSize function | Fabian Henze | 2014-04-07 | 1 | -0/+22 |
| | | | | | | |||||
| | * | | | | 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. | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-03 | 156 | -912/+818 |
| | | | | | | |||||
| * | | | | | 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 | 3 | -3/+29 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | RecursiveDirectoryIterator does not work on NFS | ||||
| | * | | | | | refs #8376; spaces=>tabs | Sjors van der Pluijm | 2014-04-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | 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 | 3 | -2/+24 |
| | | | | | | | |||||
| | * | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #8400 from owncloud/download-button-public-folder | Thomas Müller | 2014-05-02 | 4 | -18/+21 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | reintroduce download button on public shares | ||||
| | * | | | | | | disable download button if zip download is disabled | Thomas Müller | 2014-05-02 | 2 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | fix position and look of public download button | Jan-Christoph Borchardt | 2014-05-02 | 2 | -7/+7 |
| | | | | | | | | |||||
| | * | | | | | | remove unneeded header-right details styles | Jan-Christoph Borchardt | 2014-05-02 | 1 | -7/+0 |
| | | | | | | | | |||||
| | * | | | | | | remove file name from upper right button | Thomas Müller | 2014-04-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | reintroduce download button on public shares | Thomas Müller | 2014-04-29 | 1 | -3/+10 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-02 | 22 | -86/+116 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #8415 from owncloud/sharing_fix_rename | Björn Schießle | 2014-05-01 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [sharing] return the new name if a mount point was renamed | ||||
| | * | | | | | | | return the new name if a mount point was renamed | Bjoern Schiessle | 2014-04-30 | 1 | -4/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-01 | 87 | -289/+8061 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #8412 from owncloud/sharing_fix_part_file_rename | Lukas Reschke | 2014-04-30 | 3 | -9/+98 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | [sharing] fix rename of part files | ||||
| | * | | | | | | | get the correct owner path for part files | Bjoern Schiessle | 2014-04-30 | 2 | -1/+92 |
| | | | | | | | | | |||||
| | * | | | | | | | only update the values which really changed | Bjoern Schiessle | 2014-04-30 | 1 | -8/+6 |
| | |/ / / / / / | |||||
| * | | | | | | | 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 #8404 from owncloud/fix-checkboxes | Thomas Müller | 2014-04-30 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed too generic checkbox and link selectors | ||||
| | * | | | | | | | | Fixed too generic checkbox and link selectors | Vincent Petry | 2014-04-29 | 1 | -5/+5 |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that the sharing dropdown is embedded into the table row for some reason. This fix makes use of a more specific selector for the checkboxes and file name links to make sure it doesn't spill into any other potential elements like the sharing dialog. | ||||
| * | | | | | | | | Merge pull request #8408 from owncloud/delete-spinner | Morris Jobke | 2014-04-30 | 2 | -0/+17 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Show spinner for all files when deleting all | ||||
| | * | | | | | | | | Show spinner for all files when deleting all | Vincent Petry | 2014-04-29 | 2 | -0/+17 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #8405 from owncloud/remove-leftcontent-rightcontent | Morris Jobke | 2014-04-30 | 1 | -15/+0 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | remove leftcontent and rightcontent CSS, no longer needed | ||||
| | * | | | | | | | | remove leftcontent and rightcontent CSS, no longer needed | Jan-Christoph Borchardt | 2014-04-29 | 1 | -15/+0 |
| | |/ / / / / / / | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |