summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14311 from nextcloud/enh/2fa_backupscodes_to_main_webpackRoeland Jago Douma2019-02-2010-5140/+12
|\ | | | | Move twofactor_backupcodes to main webpack bundle
| * Update assetsRoeland Jago Douma2019-02-202-9/+10
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Move twofactor_backupcodes to main webpack bundleRoeland Jago Douma2019-02-208-5131/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14255 from nextcloud/fix-ocm-discoveryMorris Jobke2019-02-205-3/+83
|\ \ | |/ |/| Fix ocm end-point discovery discovery
| * Add unit tests and provide better messageMorris Jobke2019-02-203-5/+41
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * check ocs-provider routeBjoern Schiessle2019-02-201-0/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add setup check for ocm-provider routeBjoern Schiessle2019-02-202-0/+41
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * make sure that the ocm end-point discovery /ocm-provider is not redirected ↵Bjoern Schiessle2019-02-201-0/+1
| | | | | | | | | | | | to the index.php Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * adjust json to match the definitionBjoern Schiessle2019-02-201-1/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #14297 from nextcloud/enh/settings_to_main_webpackRoeland Jago Douma2019-02-2018-7135/+85
|\ \ | | | | | | Move settings to main webpack
| * | Bump bundlesJulius Härtl2019-02-209-9/+9
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Remove drone jobsRoeland Jago Douma2019-02-201-29/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move settings to main webpackRoeland Jago Douma2019-02-2018-7107/+86
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #14178 from ↵Morris Jobke2019-02-202-1/+9
|\ \ \ | |/ / |/| | | | | | | | nextcloud/bugfix/noid/get-current-user-for-guest-pages Fix OC.getCurrentUser() on guest pages
| * | Fix OC.getCurrentUser() on guest pagesJoas Schilling2019-02-192-1/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #14300 from nextcloud/bugfix/12844/fix-drag-scrollMorris Jobke2019-02-201-6/+5
|\ \ \ | | | | | | | | Use proper scroll container when dragging files
| * | | Use proper scroll container when dragging filesJulius Härtl2019-02-201-6/+5
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #14291 from nextcloud/enh/change_workflow_nameMorris Jobke2019-02-201-1/+1
|\ \ \ \ | |_|_|/ |/| | | Change Workflow to Tag Management
| * | | Change Workflow to Tag ManagementRoeland Jago Douma2019-02-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #14299 from ↵Morris Jobke2019-02-201-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/14298/fix_storages_not_closing_handle Hanlde writestream not closing source
| * | | | Hanlde writestream not closing sourceRoeland Jago Douma2019-02-201-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14298 If a storage doesn'tclose the write stream then $isEOF is not yet set. So we have to fallback. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11832 from nextcloud/bugfix/9849/birthday_without_yearMorris Jobke2019-02-209-34/+390
|\ \ \ \ | |/ / / |/| | | set birthday year to 1970 if no year, take X-APPLE-OMIT-YEAR into account
| * | | Add Repair step to regenerate birthday calendarGeorg Ehrke2019-02-169-4/+299
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | unicode all the birthday iconsGeorg Ehrke2019-02-162-29/+57
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | set birthday year to 1970, take X-APPLE-OMIT-YEAR into accountGeorg Ehrke2019-02-162-18/+51
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #14293 from nextcloud/fix-ocm-implementationRoeland Jago Douma2019-02-201-3/+4
|\ \ \ \ | | | | | | | | | | According to the OCM specification the body needs to be JSON encoded
| * | | | According to the OCM specification the body needs to be JSON encodedBjoern Schiessle2019-02-191-3/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | see: https://github.com/GEANT/OCM-API/pull/37 Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2019-02-20116-220/+304
| | | |
* | | | Merge pull request #14289 from nextcloud/enh/accessibility_to_main_webpackJulius Härtl2019-02-198-6271/+7
|\ \ \ \ | |/ / / |/| | | Move accessibility to main webpack
| * | | Move accessibility to main webpackRoeland Jago Douma2019-02-198-6271/+7
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #14263 from nextcloud/publish-activity-app-tokenRoeland Jago Douma2019-02-195-5/+86
|\ \ \ | |/ / |/| | Publish activity if app password created by ocs api or client login flow
| * | Emit event if app password createdDaniel Kesselberg2019-02-185-106/+72
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Publish activity for app token created by client login flowDaniel Kesselberg2019-02-172-2/+65
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Publish activity for app token created by ocs apiDaniel Kesselberg2019-02-172-3/+55
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #14242 from nextcloud/dependabot/npm_and_yarn/bootstrap-3.4.1Roeland Jago Douma2019-02-195-8/+8
|\ \ \ | | | | | | | | Bump bootstrap from 3.4.0 to 3.4.1
| * | | Use npm ci for webpack buildsJulius Härtl2019-02-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Bump bootstrap from 3.4.0 to 3.4.1dependabot[bot]2019-02-194-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [bootstrap](https://github.com/twbs/bootstrap) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v3.4.0...v3.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #14211 from nextcloud/bugfix/prefix-path-to-filecache-s3Morris Jobke2019-02-191-2/+2
|\ \ \ \ | | | | | | | | | | Prefix $path for filename for internal file cache
| * | | | Call headObject if file not in filecache :see_no_evil:Daniel Kesselberg2019-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Prefix $path for filename for internal file cacheDaniel Kesselberg2019-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #14249 from ↵Morris Jobke2019-02-191-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enhancement/noid/add-gotindex-to-indexdocument Add hasIndex() to OCP\FullTextSearch\Model\IndexDocument
| * | | | | Add hasIndex() to OCP\FullTextSearch\Model\IndexDocumentMaxence Lange2019-02-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com> Co-Authored-By: daita <maxence@artificial-owl.com>
* | | | | | Merge pull request #14282 from nextcloud/bugfix/noid/public-folder-shareMorris Jobke2019-02-191-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix writable public folder share
| * | | | | | Fix writable public folder shareJulius Härtl2019-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #14279 from nextcloud/bugfix/14220/header-labelMorris Jobke2019-02-191-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix header label visibility on open menu
| * | | | | | | Fix header label visibility on open menuJulius Härtl2019-02-191-5/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Merge pull request #14264 from nextcloud/null-is-not-a-booleanRoeland Jago Douma2019-02-191-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Set false as default for requirePNG
| * | | | | | Set false as default for requirePNGDaniel Kesselberg2019-02-181-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #14269 from nextcloud/cache-update-eventMorris Jobke2019-02-197-45/+164
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | add event for cache update
| * | | | | add event for cache updateRobin Appelman2019-02-187-45/+164
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>