summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #8728 from owncloud/sharing_fix_reshareVincent Petry2014-05-272-11/+14
|\ \ \ \ \ \ \
| * | | | | | | 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 typoVolkan Gezer2014-05-241-1/+1
* | | | | | [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 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 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
|\ \ \ \
| * | | | 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
| * | | | 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 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'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 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
* | | | | | Add storage priority supportRobin McCorkell2014-05-212-4/+60
|/ / / / /
* | | | | Merge pull request #8416 from owncloud/sharing_keep_mount_points_visibleBjörn Schießle2014-05-219-78/+421
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | move the mount point up if a share is mounted to a subfolder and the subfolde...Bjoern Schiessle2014-05-219-78/+421
* | | | | Merge pull request #8612 from owncloud/share-updateshareiconsafterrenameBjörn Schießle2014-05-212-35/+73
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed issues with renamingVincent Petry2014-05-162-35/+73
* | | | | Merge pull request #8646 from owncloud/publicshare-fixesBjörn Schießle2014-05-213-24/+31
|\ \ \ \ \
| * | | | | Fixed JS issues in public pageVincent Petry2014-05-202-23/+30
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | only start migration if the encryption was initialized; allow to overwrite ke...Bjoern Schiessle2014-05-192-3/+49
* | | | | [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
* | | | Merge pull request #8435 from owncloud/fix-8322-masterThomas Müller2014-05-192-13/+15
|\ \ \ \ | |/ / / |/| | |
| * | | fix broken unit testThomas Müller2014-05-021-1/+11
| * | | - Introduce isShared() and isMounted() on FileInfo classThomas Müller2014-05-021-13/+4
* | | | Merge pull request #8585 from owncloud/phpdoc-improvements-appsAndreas Fischer2014-05-1943-342/+338
|\ \ \ \
| * | | | Fix whitespace issuesRobin McCorkell2014-05-1616-69/+69