summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-2842-41/+67
|
* Merge pull request #8713 from owncloud/typo-files-encrThomas Müller2014-05-271-2/+2
|\ | | | | fix grammar
| * fix grammarVolkan Gezer2014-05-251-2/+2
| |
* | forgotten infobox messages translationsVolkan Gezer2014-05-271-4/+4
| |
* | Merge pull request #8736 from owncloud/appinfo-newrequirefieldsVincent Petry2014-05-278-12/+12
|\ \ | | | | | | App info new fields "requiremin" and "requiremax"
| * | Adjust core apps to use "requiremin" instead of "require"Vincent Petry2014-05-278-12/+12
| | | | | | | | | | | | Also added a few missing authors.
* | | Merge pull request #8721 from owncloud/sharing_don_lose_filesizeVincent Petry2014-05-272-10/+46
|\ \ \ | |/ / |/| | don't lose file size during rename
| * | don't lose file size during renameBjoern Schiessle2014-05-262-10/+46
| | |
* | | Merge pull request #8728 from owncloud/sharing_fix_reshareVincent Petry2014-05-272-11/+14
|\ \ \ | | | | | | | | allow resharing of files with only share permissions
| * | | allow resharing of files with only share permissionsBjoern Schiessle2014-05-262-11/+14
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-05-2783-34/+238
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2014-05-2664-156/+138
|/
* make user_ldap fully translatableVolkan Gezer2014-05-256-15/+17
|
* Merge pull request #8705 from wakeup/masterThomas Müller2014-05-251-1/+1
|\ | | | | fix typo
| * fix typoVolkan Gezer2014-05-241-1/+1
| | | | | | Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-257-20/+24
|/
* Merge pull request #8688 from owncloud/public-image-positioningLukas Reschke2014-05-241-7/+0
|\ | | | | Show less whitespace above publicly shared images
| * Show less whitespace above publicly shared imagesRobin Appelman2014-05-231-7/+0
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-249-3/+46
| |
* | Merge pull request #8699 from owncloud/sharing_improvementsBjörn Schießle2014-05-231-23/+26
|\ \ | | | | | | fix share label creation
| * | fix share label creationBjoern Schiessle2014-05-231-23/+26
| |/
* / remove noise texture from interface (not necessary, and blurry on high-res)Jan-Christoph Borchardt2014-05-231-1/+1
|/
* Merge pull request #8675 from owncloud/sharing-improvementsBjörn Schießle2014-05-232-8/+13
|\ | | | | Sharing improvements
| * prevent default action when clicking on the share notificationBjoern Schiessle2014-05-231-1/+6
| |
| * always check for unique filename, if a file gets added from outside the mountBjoern Schiessle2014-05-221-6/+6
| | | | | | | | point should be adjusted to ne unique again
| * fileList needs be be declared before the if-statementBjoern Schiessle2014-05-221-1/+1
| |
* | Merge pull request #8671 from owncloud/log-upload-errorsVincent Petry2014-05-231-1/+3
|\ \ | | | | | | php upload errors are written to log
| * | php upload errors are written to logThomas Müller2014-05-221-1/+3
| | |
* | | Merge pull request #8658 from realriot/masterThomas Müller2014-05-231-1/+1
|\ \ \ | | | | | | | | Changed access mode for Dropbox to 'auto'
| * | | Changed access mode for Dropbox to 'auto'Sascha Schmidt2014-05-211-1/+1
| | | |
* | | | Dont scale up the preview for publicly shared imagesRobin Appelman2014-05-221-1/+2
| |_|/ |/| |
* | | Merge pull request #8599 from owncloud/sharing_disable_for_groupsBjörn Schießle2014-05-227-15/+121
|\ \ \ | | | | | | | | allow admin to disable sharing for specific groups of users
| * | | allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-227-15/+121
| | |/ | |/|
* | | Use default priority of 100 if backend default is not setRobin McCorkell2014-05-211-2/+7
| | |
* | | Add priority overriding commentsRobin McCorkell2014-05-211-0/+4
| | |
* | | Fix priority merging logic and add unit testRobin McCorkell2014-05-212-0/+55
| | |
* | | Add unit testsRobin McCorkell2014-05-212-8/+130
| | |
* | | Use constants for priority type and add commentsRobin McCorkell2014-05-211-13/+16
| | |
* | | Use more strict type comparisonsRobin McCorkell2014-05-211-4/+4
| | |
* | | Preserve priority if already setRobin McCorkell2014-05-211-0/+5
| | |
* | | Treat 'all users' as 'global'Robin McCorkell2014-05-211-1/+21
| | | | | | | | | | | | A mount applicable to all users is as good a definition of global as can be
* | | Add storage priority supportRobin McCorkell2014-05-212-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_visibleBjörn Schießle2014-05-219-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 Schiessle2014-05-219-78/+421
| | | | | | | | | | | | subfolder no longer exists
* | | Merge pull request #8612 from owncloud/share-updateshareiconsafterrenameBjörn Schießle2014-05-212-35/+73
|\ \ \ | |/ / |/| | [master] Fixed issues with renaming
| * | Fixed issues with renamingVincent Petry2014-05-162-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-fixesBjörn Schießle2014-05-213-24/+31
|\ \ \ | | | | | | | | [master] Fixed for public link page
| * | | Fixed JS issues in public pageVincent Petry2014-05-202-23/+30
| | | | | | | | | | | | | | | | | | | | - fixed subdir detection when uploading into subdir - add class detection before overriding to avoid JS errors
| * | | Fixed download URL in public pageVincent Petry2014-05-201-1/+1
| | |/ | |/|
* | | Merge pull request #8637 from owncloud/enc_improved_error_handlingVincent Petry2014-05-212-3/+49
|\ \ \ | |/ / |/| | [encryption] improved error handling during password change