aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-282-4/+29
|\
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-272-4/+29
| |\
| | * Merge pull request #25237 from owncloud/search-filelistnextpageresultsVincent Petry2016-06-272-4/+29
| | |\
| | | * Prerender file list pages to include search resultsVincent Petry2016-06-242-4/+29
* | | | Add app:check-code for already compatible appsMorris Jobke2016-06-273-8/+0
|/ / /
* | | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-269-4/+95
|\| |
| * | Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| * | Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-244-2/+60
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-224-0/+26
* | changes emptycontent icon to drag-accept on file-dragVincent Chan2016-06-231-1/+2
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2110-2/+104
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-202-0/+40
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-174-0/+44
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-154-2/+6
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-142-0/+14
* | Fix failing JS unit testsMorris Jobke2016-06-161-4/+2
* | Merge pull request #83 from nextcloud/file-drop-highlightMarius Blüm2016-06-155-89/+277
|\ \
| * | store icons in classVincent Chan2016-06-152-6/+5
| * | fixes responsive/mobile viewVincent Chan2016-06-152-5/+9
| * | dragging over folder will highlight folder onlyVincent Chan2016-06-152-0/+11
| * | restrict dropZone to app-content divVincent Chan2016-06-151-1/+1
| * | change folder icon when dragging over a directoryVincent Chan2016-06-153-4/+17
| * | properly fix folder upload to use delegatedEventVincent Chan2016-06-142-4/+12
| * | fixes direct upload to folderVincent Chan2016-06-141-5/+1
| * | adds visual indication for file drag and dropVincent Chan2016-06-132-2/+15
| * | update jQuery File Upload Plugin (9.12.5) to support dragleaveVincent Chan2016-06-131-84/+228
* | | Merge pull request #113 from nextcloud/fix-more-buttonMarius Blüm2016-06-151-7/+7
|\ \ \
| * | | fix padding of 3-dot button on mobileJan-Christoph Borchardt2016-06-151-7/+7
| |/ /
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614Arthur Schiwon2016-06-148-0/+8
|\ \ \ | |/ / |/| / | |/
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-138-0/+8
* | Merge pull request #57 from nextcloud/fdrop-templateLukas Reschke2016-06-131-1/+7
|\ \
| * | smaller files drop fixesArthur Schiwon2016-06-111-1/+7
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-1118-0/+30
|\ \ \ | |/ / |/| / | |/
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-1018-0/+30
* | Merge pull request #19 from nextcloud/files-dropLukas Reschke2016-06-101-0/+23
|\ \ | |/ |/|
| * Make uploading possible via select and cleanup CSSLukas Reschke2016-06-091-0/+23
| * Adjust test to work with phpunit < 5.2Joas Schilling2016-06-091-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+12
| * Improve the UX for "not found" perma linksJoas Schilling2016-06-094-34/+44
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-092-0/+2
* | Merge pull request #25001 from owncloud/issue-24939-better-ux-on-invalid-perm...Vincent Petry2016-06-084-34/+44
|\ \
| * | Adjust test to work with phpunit < 5.2Joas Schilling2016-06-081-1/+1
| * | Improve the UX for "not found" perma linksJoas Schilling2016-06-074-34/+44
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2016-06-082-0/+12
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-036-50/+54
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-024-12/+22
* Merge pull request #24822 from owncloud/fix-download-spinnerVincent Petry2016-05-312-4/+4
|\
| * fixes size of the download spinnerVincent Chan2016-05-302-4/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-312-0/+22