summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Adjust core apps to use "requiremin" instead of "require"Vincent Petry2014-05-271-2/+2
* Merge pull request #8728 from owncloud/sharing_fix_reshareVincent Petry2014-05-271-10/+4
|\
| * allow resharing of files with only share permissionsBjoern Schiessle2014-05-261-10/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-279-9/+18
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-2659-123/+68
* 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-251-15/+15
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-243-0/+4
* 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
* | allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-221-0/+4
|/
* Merge pull request #8612 from owncloud/share-updateshareiconsafterrenameBjörn Schießle2014-05-212-35/+73
|\
| * Fixed issues with renamingVincent Petry2014-05-162-35/+73
* | Fixed download URL in public pageVincent Petry2014-05-201-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-206-5/+28
* | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-191-1/+1
* | 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-192-3/+3
|\ \ \
| * | | Fix whitespace issuesRobin McCorkell2014-05-161-2/+2
| * | | Fix PHPDoc in /appsRobin McCorkell2014-05-161-1/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-193-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1855-0/+99
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1753-52/+9
|/ /
* | 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-1623-2593/+3333
|\ \ \ | |/ / |/| |
| * | Fixed many issues, clean upVincent Petry2014-05-1516-195/+346
| * | Namespacing for FileList, FileActions and trashbin appVincent Petry2014-05-1521-2558/+2955
| * | Files app navigation can now switchVincent Petry2014-05-155-4/+112
| * | Added navigation manager in files app for the sidebarVincent Petry2014-05-154-15/+58
| * | Added app navigation for files appVincent Petry2014-05-155-3/+44
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-163-1/+39
|/ /
* | 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
* | | We do not support updates from 4.5 > 7.0Lukas Reschke2014-05-131-46/+0
|/ /
* | Merge pull request #8041 from owncloud/files-sortcolumnsVincent Petry2014-05-127-54/+481
|\ \
| * | 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
| * | 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-281-4/+1
| * | Add sorting to files list, trashbin and public filesVincent Petry2014-04-286-44/+360
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-122-1/+20
* | | $owner is not defined hereLukas Reschke2014-05-111-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-112-0/+3
* | | Merge pull request #8520 from owncloud/jslint_polishing_in_file_uploadLukas Reschke2014-05-101-45/+61
|\ \ \
| * | | polish jslint for files-upload.jsJörn Friedrich Dreyer2014-05-091-45/+61