Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Adjust core apps to use "requiremin" instead of "require" | Vincent Petry | 2014-05-27 | 8 | -12/+12 | |
| * | | | | | | | | Added requiremin/requiremax fields for apps | Vincent Petry | 2014-05-27 | 3 | -91/+272 | |
* | | | | | | | | | Merge pull request #8721 from owncloud/sharing_don_lose_filesize | Vincent Petry | 2014-05-27 | 2 | -10/+46 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | don't lose file size during rename | Bjoern Schiessle | 2014-05-26 | 2 | -10/+46 | |
* | | | | | | | | | | Merge pull request #8733 from owncloud/l10n-forgotten-tags | Vincent Petry | 2014-05-27 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | unwrapped strings fix | Volkan Gezer | 2014-05-27 | 1 | -3/+3 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #8728 from owncloud/sharing_fix_reshare | Vincent Petry | 2014-05-27 | 2 | -11/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | allow resharing of files with only share permissions | Bjoern Schiessle | 2014-05-26 | 2 | -11/+14 | |
| |/ / / / / / / | ||||||
* / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-27 | 186 | -496/+708 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #8687 from owncloud/recursive-remove-smb | Vincent Petry | 2014-05-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make the recursive delete more robust | Robin Appelman | 2014-05-23 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #8674 from owncloud/watch-policy | Frank Karlitschek | 2014-05-26 | 3 | -2/+13 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add a config option fro setting the filesystem watcher policy | Robin Appelman | 2014-05-23 | 2 | -1/+12 | |
| * | | | | | | | Fix phpdoc | Robin Appelman | 2014-05-22 | 1 | -1/+1 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-26 | 327 | -3252/+7930 | |
| |_|_|_|_|/ / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #8711 from owncloud/l10n-fully-translatable-ldap | Volkan Gezer | 2014-05-25 | 6 | -15/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | make user_ldap fully translatable | Volkan Gezer | 2014-05-25 | 6 | -15/+17 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #8705 from wakeup/master | Thomas Müller | 2014-05-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix typo | Volkan Gezer | 2014-05-24 | 1 | -1/+1 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-25 | 64 | -379/+422 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #8688 from owncloud/public-image-positioning | Lukas Reschke | 2014-05-24 | 1 | -7/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Show less whitespace above publicly shared images | Robin Appelman | 2014-05-23 | 1 | -7/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-24 | 267 | -7207/+8890 | |
* | | | | | | | Merge pull request #8699 from owncloud/sharing_improvements | Björn Schießle | 2014-05-23 | 1 | -23/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix share label creation | Bjoern Schiessle | 2014-05-23 | 1 | -23/+26 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #8690 from owncloud/design-noise | Jan-Christoph Borchardt | 2014-05-23 | 4 | -15/+10 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | remove noise texture from interface (not necessary, and blurry on high-res) | Jan-Christoph Borchardt | 2014-05-23 | 4 | -15/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #8675 from owncloud/sharing-improvements | Björn Schießle | 2014-05-23 | 2 | -8/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | prevent default action when clicking on the share notification | Bjoern Schiessle | 2014-05-23 | 1 | -1/+6 | |
| * | | | | | | always check for unique filename, if a file gets added from outside the mount | Bjoern Schiessle | 2014-05-22 | 1 | -6/+6 | |
| * | | | | | | fileList needs be be declared before the if-statement | Bjoern Schiessle | 2014-05-22 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #8671 from owncloud/log-upload-errors | Vincent Petry | 2014-05-23 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | php upload errors are written to log | Thomas Müller | 2014-05-22 | 1 | -1/+3 | |
* | | | | | | | | Merge pull request #8658 from realriot/master | Thomas Müller | 2014-05-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Changed access mode for Dropbox to 'auto' | Sascha Schmidt | 2014-05-21 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #8647 from owncloud/public-image-scaling | Vincent Petry | 2014-05-23 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Dont scale up the preview for publicly shared images | Robin Appelman | 2014-05-22 | 1 | -1/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #8599 from owncloud/sharing_disable_for_groups | Björn Schießle | 2014-05-22 | 20 | -23/+352 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | allow admin to disable sharing for specific groups of users | Bjoern Schiessle | 2014-05-22 | 20 | -23/+352 | |
* | | | | | | | Merge pull request #8163 from Xenopathic/files_external_priority | Vincent Petry | 2014-05-22 | 3 | -5/+275 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Use default priority of 100 if backend default is not set | Robin McCorkell | 2014-05-21 | 1 | -2/+7 | |
| * | | | | | | Add priority overriding comments | Robin McCorkell | 2014-05-21 | 1 | -0/+4 | |
| * | | | | | | Fix priority merging logic and add unit test | Robin McCorkell | 2014-05-21 | 2 | -0/+55 | |
| * | | | | | | Add unit tests | Robin McCorkell | 2014-05-21 | 2 | -8/+130 | |
| * | | | | | | Use constants for priority type and add comments | Robin McCorkell | 2014-05-21 | 1 | -13/+16 | |
| * | | | | | | Use more strict type comparisons | Robin McCorkell | 2014-05-21 | 1 | -4/+4 | |
| * | | | | | | Preserve priority if already set | Robin McCorkell | 2014-05-21 | 1 | -0/+5 | |
| * | | | | | | Treat 'all users' as 'global' | Robin McCorkell | 2014-05-21 | 1 | -1/+21 | |
| * | | | | | | Add storage priority support | Robin McCorkell | 2014-05-21 | 2 | -4/+60 | |
| |/ / / / / | ||||||
* | | | | | | Fix for #8654 | Remco Brenninkmeijer | 2014-05-22 | 1 | -3/+3 |