Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | ||||
| * | 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 for setting the filesystem watcher policy | ||||
| * | | 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 | ||||
| * | | | 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 | ||||
| * | | | fix typo | Volkan Gezer | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex | ||||
* | | | | [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 | ||||
| * | | | 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 | ||||
| * | | | 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 | ||||
| * | | 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 |
|\ \ | | | | | | | Sharing improvements | ||||
| * | | 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 |
| | | | | | | | | | | | | point should be adjusted to ne unique again | ||||
| * | | 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 | ||||
| * | | | 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' | ||||
| * | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | 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 |
|\ \ \ \ | |_|_|/ |/| | | | Priority on external storage mounts | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | A mount applicable to all users is as good a definition of global as can be | ||||
| * | | | Add storage priority support | Robin McCorkell | 2014-05-21 | 2 | -4/+60 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each storage backend has a default priority, assigned to any system mounts created in ownCloud. mount.json can be manually modified to change these priorities. The priority order is as follows: * Personal * User * Group * Global Within each mount type, the mount with the highest priority is active. The storage backend defaults were chosen to be the following: * Local - 150 * Remote storage - 100 * SMB / CIFS with OC login - 90 | ||||
* | | | Fix for #8654 | Remco Brenninkmeijer | 2014-05-22 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #8634 from owncloud/handle-excpetions-in-console-master | Thomas Müller | 2014-05-22 | 2 | -21/+26 |
|\ \ \ | | | | | | | | | Handle excpetions in console master | ||||
| * | | | fix description of console command maintenance:repair - fixes #8574 | Thomas Müller | 2014-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | adding try/catch + switch to config object as provided by the server container | Thomas Müller | 2014-05-19 | 1 | -20/+25 |
| | | | | |||||
* | | | | Merge pull request #8659 from owncloud/get-preference-multiple-user | Vincent Petry | 2014-05-22 | 2 | -0/+74 |
|\ \ \ \ | | | | | | | | | | | Add a method to get the values for multiple users to OC\Preferences | ||||
| * | | | | Clean the database after the test | Joas Schilling | 2014-05-21 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Correctly create list of placeholders | Joas Schilling | 2014-05-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add a lot of users for testing | Joas Schilling | 2014-05-21 | 1 | -1/+15 |
| | | | | | |||||
| * | | | | Move return to new line | Joas Schilling | 2014-05-21 | 1 | -1/+3 |
| | | | | |