summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4515 from nextcloud/downstream-27643Morris Jobke2017-04-2615-141/+242
|\ | | | | Adjust query/event logging code in favour of more complex owncloud/di…
| * Update autoloaderRoeland Jago Douma2017-04-262-4/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix missing conflict resolutionsJoas Schilling2017-04-263-12/+0
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Adjust query/event logging code in favour of more complex ↵Piotr Mrówczyński2017-04-2613-137/+254
| | | | | | | | | | | | | | owncloud/diagnostics (#27643) * Adjust query/event logging code in favour of more complex owncloud/diagnostics * Add descriptions to IQueryLogger and IEventLogger interfaces
* | Merge pull request #4517 from nextcloud/downstream-27637Morris Jobke2017-04-261-4/+4
|\ \ | | | | | | Fix recovery checkbox label to properly point
| * | Fix recovery checkbox label to properly pointVincent Petry2017-04-261-4/+4
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-04-27218-542/+896
| |
* | Merge pull request #4537 from nextcloud/change-linkMorris Jobke2017-04-261-5/+5
|\ \ | | | | | | Change feed to website planet link, fix wording
| * | Change feed to website planet link, fix wordingJan-Christoph Borchardt2017-04-261-5/+5
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #4526 from nextcloud/downstream-27269Morris Jobke2017-04-262-32/+48
|\ \ \ | | | | | | | | Don`t allow upload of files with extension .part
| * | | Use regex to detect part filesVincent Petry2017-04-262-34/+44
| | | |
| * | | #7496 Don`t allow upload of files with extension .partIlja Neumann2017-04-261-0/+6
| | |/ | |/|
* | | Merge pull request #4454 from nextcloud/add-bundles-to-install-pageMorris Jobke2017-04-2633-95/+1230
|\ \ \ | | | | | | | | Add app bundles to the apps page and unbundle enterprise apps
| * | | Fix testsLukas Reschke2017-04-261-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Update autoload mapLukas Reschke2017-04-262-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add SocialSharingBundleLukas Reschke2017-04-264-0/+89
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Fix bundles header positionJan-Christoph Borchardt2017-04-261-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Style app bundlesJan-Christoph Borchardt2017-04-263-10/+32
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Use .installed layoutLukas Reschke2017-04-262-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Styling fixes to bundle headerJan-Christoph Borchardt2017-04-261-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Add tests for repairstepLukas Reschke2017-04-262-1/+145
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add spreed to Groupware bundleLukas Reschke2017-04-262-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add tests for bundle codeLukas Reschke2017-04-265-0/+250
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Remove unrequired getDescription() methodLukas Reschke2017-04-264-29/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Adjust testsLukas Reschke2017-04-262-5/+24
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Make the emergency disable also accept arraysLukas Reschke2017-04-261-5/+6
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Make disableapp.php accept arraysLukas Reschke2017-04-263-53/+135
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Fix stylingLukas Reschke2017-04-263-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Don't sort on app bundlesLukas Reschke2017-04-261-10/+12
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add titlesLukas Reschke2017-04-263-20/+43
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Add app bundlesLukas Reschke2017-04-2619-21/+533
| | |/ | |/| | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4461 from ↵Morris Jobke2017-04-263-0/+214
|\ \ \ | | | | | | | | | | | | | | | | danxuliu/fix-closing-details-view-when-viewing-file-in-folder Fix details view not closed when viewing a file in its folder
| * | | Fix closing details view when viewing file in folderDaniel Calviño Sánchez2017-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Files app active view is set to "files" in silent mode to avoid an unneeded load of the "/" directory. However, this also prevents the details view from being automatically closed, so it has to be explicitly closed by the Goto plugin; the approach used is the same that would have been used by OCA.Files.App._onNavigationChanged if not silenced. Fixes #1448 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add acceptance tests for closing details view in Files appDaniel Calviño Sánchez2017-04-252-0/+213
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #4529 from nextcloud/fix-filelist-checkboxesMorris Jobke2017-04-261-3/+2
|\ \ \ \ | |_|/ / |/| | | Fix filelist and checkbox vertical align
| * | | Fix filelist and checkbox vertical alignJan-Christoph Borchardt2017-04-261-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4518 from nextcloud/downstream-25838Roeland Jago Douma2017-04-264-7/+163
|\ \ \ \ | | | | | | | | | | Fix share indicator handling
| * | | | Fix share indicator handlingVincent Petry2017-04-264-7/+163
| | |_|/ | |/| | | | | | | | | | | | | | Properly update the fileInfoModel with the updated share types, which also updates the file list row indicator properly
* | | | Merge pull request #4374 from nextcloud/contactsmenu_popoverLukas Reschke2017-04-2617-8/+643
|\ \ \ \ | | | | | | | | | | add contacts popover
| * | | | handle 404 separatelyGeorg Ehrke2017-04-262-2/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | unit test jquery.contactsmenuGeorg Ehrke2017-04-261-0/+198
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | fix CommentsTabsView js testGeorg Ehrke2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | fix ContactsStoreTestGeorg Ehrke2017-04-261-5/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | add contactsmenu popover to commentsGeorg Ehrke2017-04-262-2/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | better detection whether or not contactsmenu target was clickedGeorg Ehrke2017-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | add contactsmenu popover to resharer infoboxGeorg Ehrke2017-04-262-0/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | Contactsmenu popover: show proper message when server throws errorGeorg Ehrke2017-04-261-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | don't toggle sharing popover together with contactsmenu popoverGeorg Ehrke2017-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | close menu again when clicking on avatarGeorg Ehrke2017-04-261-29/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | add contactsmenu popoverGeorg Ehrke2017-04-2612-3/+379
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>