summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | only start migration if the encryption was initialized; allow to overwrite ↵Bjoern Schiessle2014-05-192-3/+49
| | | | | | | | | | | | keys if no files exists
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2010-7/+48
| | |
* | | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1952-365/+365
| | | | | | | | | | | | * test case added to avoid adding them later
* | | Merge pull request #8435 from owncloud/fix-8322-masterThomas Müller2014-05-192-13/+15
|\ \ \ | |/ / |/| | Expose permission via WebDAV
| * | fix broken unit testThomas Müller2014-05-021-1/+11
| | |
| * | - Introduce isShared() and isMounted() on FileInfo classThomas Müller2014-05-021-13/+4
| | | | | | | | | | | | | | | | | | - Reuse these methods on determineIcon() - Generate permission string for the desktop client - expose {http://owncloud.org/ns}permissions as additional WebDAV property containing the permission string
* | | Merge pull request #8585 from owncloud/phpdoc-improvements-appsAndreas Fischer2014-05-1943-342/+338
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPDoc improvements /apps * owncloud/phpdoc-improvements-apps: Fix whitespace issues Reduce double-space with single-space. Remove spaces around | operator in doc block. Fix more missing or broken PHPDoc PHPDoc fixes for user_ldap Fix PHPDoc in /apps
| * | | Fix whitespace issuesRobin McCorkell2014-05-1616-69/+69
| | | |
| * | | Reduce double-space with single-space.Andreas Fischer2014-05-161-1/+1
| | | |
| * | | Remove spaces around | operator in doc block.Andreas Fischer2014-05-161-1/+1
| | | |
| * | | Fix more missing or broken PHPDocRobin McCorkell2014-05-1610-22/+20
| | | |
| * | | PHPDoc fixes for user_ldapRobin McCorkell2014-05-167-29/+29
| | | |
| * | | Fix PHPDoc in /appsRobin McCorkell2014-05-1631-241/+239
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-194-0/+11
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1859-0/+115
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-17165-158/+130
|/ / /
* | | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_linksBjörn Schießle2014-05-161-0/+54
|\ \ \ | | | | | | | | use default expire date only for link shares
| * | | use default expire date only for link sharesBjoern Schiessle2014-05-161-0/+54
| | | |
* | | | Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-162-7/+66
|\ \ \ \ | |_|_|/ |/| | | allow admin to enforce passwords for public link shares
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 13:54:13 +0000