summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* PHPDoc fixes for user_ldapRobin McCorkell2014-05-167-29/+29
* Fix PHPDoc in /appsRobin McCorkell2014-05-1631-241/+239
* 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
|/
* Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-132-2/+13
|\
| * backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-132-2/+13
* | Extract mount point merging logic into separate functionRobin McCorkell2014-05-131-11/+25
* | Merge pull request #8556 from owncloud/kill-legacy-code-masterThomas Müller2014-05-1227-94/+94
|\ \
| * | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-1224-86/+86
| * | remove legacy aka deprecated code: OC_CacheThomas Müller2014-05-122-2/+2
| * | remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-124-6/+6
* | | Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldapLukas Reschke2014-05-1213-384/+689
|\ \ \ | |/ / |/| |
| * | Use array as typeLukas Reschke2014-05-121-1/+1
| * | That's bool and not always trueLukas Reschke2014-05-111-1/+1
| * | Use WizardResult|false instead of mixedLukas Reschke2014-05-111-2/+2
| * | Use @return instead of @returnsLukas Reschke2014-05-113-9/+9
| * | Fix TypoLukas Reschke2014-05-111-1/+1
| * | Use proper PHPDoc and variable names in the LDAP libLukas Reschke2014-05-1112-378/+683
* | | Merge pull request #8041 from owncloud/files-sortcolumnsVincent Petry2014-05-1212-74/+507
|\ \ \
| * | | Clear selection on reload (when changing sort)Vincent Petry2014-04-292-2/+9
| * | | typos, indentation and remove of unused codeThomas Müller2014-04-283-7/+7
| * | | html input tag has no closing tagThomas Müller2014-04-281-2/+3
| * | | $RUNTIME_APPTYPES is no longer used - left over from pre OC4Thomas Müller2014-04-281-5/+0
| * | | Added unit test in files app for sort function in helper classVincent Petry2014-04-282-6/+113
| * | | Set default sort of trashbin to timestamp descendingVincent Petry2014-04-282-4/+2
| * | | Add sorting to files list, trashbin and public filesVincent Petry2014-04-2810-57/+382
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-127-4/+29