summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-227-15/+121
* 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
| * | | 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 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 sharesBjoern Schiessle2014-05-162-7/+66
* | | | Merge pull request #8610 from owncloud/ie8-filesdndbugVincent Petry2014-05-161-1/+1
|\ \ \ \
| * | | | Fix drag and drop in IE8Vincent Petry2014-05-161-1/+1
* | | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-1638-3022/+4198
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed many issues, clean upVincent Petry2014-05-1528-276/+535
| * | | | Namespacing for FileList, FileActions and trashbin appVincent Petry2014-05-1535-2940/+3687
| * | | | Files app navigation can now switchVincent Petry2014-05-157-7/+118
| * | | | Added navigation manager in files app for the sidebarVincent Petry2014-05-157-60/+70
| * | | | Added app navigation for files appVincent Petry2014-05-157-3/+52
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1673-66/+167
|/ / / /
* | / / Fixed trashbin to use correct classVincent Petry2014-05-151-1/+1
| |/ / |/| |
* | | Merge pull request #8589 from fibsifan/files_external_sftp_portRobin McCorkell2014-05-151-4/+4
|\ \ \
| * | | changing label "URL" to "Host"fibsifan2014-05-151-4/+4
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-05-154-1/+19
|/ /
* | Merge pull request #8584 from Bagera/masterjbtbnl2014-05-141-1/+1
|\ \
| * | Set row height in files tableBagera2014-05-141-2/+2
| * | fixes #7949Bagera2014-05-131-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-143-8/+93
* | | Merge pull request #8582 from owncloud/remove-outdated-update-scLukas Reschke2014-05-141-46/+0
|\ \ \
| * | | We do not support updates from 4.5 > 7.0Lukas Reschke2014-05-131-46/+0
| |/ /
* | | @returns -> @returnThomas Müller2014-05-133-12/+12
* | | @breif -> @briefThomas Müller2014-05-132-3/+3
|/ /