Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-28 | 42 | -41/+67 |
| | |||||
* | Merge pull request #8713 from owncloud/typo-files-encr | Thomas Müller | 2014-05-27 | 1 | -2/+2 |
|\ | | | | | fix grammar | ||||
| * | fix grammar | Volkan Gezer | 2014-05-25 | 1 | -2/+2 |
| | | |||||
* | | forgotten infobox messages translations | Volkan Gezer | 2014-05-27 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #8736 from owncloud/appinfo-newrequirefields | Vincent Petry | 2014-05-27 | 8 | -12/+12 |
|\ \ | | | | | | | App info new fields "requiremin" and "requiremax" | ||||
| * | | Adjust core apps to use "requiremin" instead of "require" | Vincent Petry | 2014-05-27 | 8 | -12/+12 |
| | | | | | | | | | | | | Also added a few missing authors. | ||||
* | | | 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 | ||||
| * | | don't lose file size during rename | Bjoern Schiessle | 2014-05-26 | 2 | -10/+46 |
| | | | |||||
* | | | 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 | ||||
| * | | | 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 | 83 | -34/+238 |
|/ / | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-26 | 64 | -156/+138 |
|/ | |||||
* | 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 | 7 | -20/+24 |
|/ | |||||
* | 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 | 9 | -3/+46 |
| | | |||||
* | | 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 |
| |/ | |||||
* / | remove noise texture from interface (not necessary, and blurry on high-res) | Jan-Christoph Borchardt | 2014-05-23 | 1 | -1/+1 |
|/ | |||||
* | 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 |
| | | | | |||||
* | | | | 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 | 7 | -15/+121 |
|\ \ \ | | | | | | | | | 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 | 7 | -15/+121 |
| | |/ | |/| | |||||
* | | | 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 | ||||
* | | Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible | Björn Schießle | 2014-05-21 | 9 | -78/+421 |
|\ \ | | | | | | | [sharing] move the mount point up if the parent folder no longer exists | ||||
| * | | move the mount point up if a share is mounted to a subfolder and the ↵ | Bjoern Schiessle | 2014-05-21 | 9 | -78/+421 |
| | | | | | | | | | | | | subfolder no longer exists | ||||
* | | | Merge pull request #8612 from owncloud/share-updateshareiconsafterrename | Björn Schießle | 2014-05-21 | 2 | -35/+73 |
|\ \ \ | |/ / |/| | | [master] Fixed issues with renaming | ||||
| * | | Fixed issues with renaming | Vincent Petry | 2014-05-16 | 2 | -35/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | - summary is now untouched on rename instead of bogus incrementation - fixes "Share" status icon by only triggring "fileActionsReady" once - row is now reinserted even when rename is cancelled, this removes the hacky/buggy code that tried to rename the element back - added unit tests to cover the fixed cases | ||||
* | | | Merge pull request #8646 from owncloud/publicshare-fixes | Björn Schießle | 2014-05-21 | 3 | -24/+31 |
|\ \ \ | | | | | | | | | [master] Fixed for public link page | ||||
| * | | | Fixed JS issues in public page | Vincent Petry | 2014-05-20 | 2 | -23/+30 |
| | | | | | | | | | | | | | | | | | | | | - fixed subdir detection when uploading into subdir - add class detection before overriding to avoid JS errors | ||||
| * | | | Fixed download URL in public page | Vincent Petry | 2014-05-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #8637 from owncloud/enc_improved_error_handling | Vincent Petry | 2014-05-21 | 2 | -3/+49 |
|\ \ \ | |/ / |/| | | [encryption] improved error handling during password change |