Diffusion The official Wikipedia iOS application 03ed727eb44f

Merge branch 'develop' into update/T199837
03ed727eb44f
Actions

Description

Merge branch 'develop' into update/T199837

Details

Provenance

• NHarateh_WMF	Authored on Jul 20 2018, 8:14 PM
GitHub <noreply@github.com>	Committed on Jul 20 2018, 8:14 PM

Parents

rAPIOS970a0aa1ab20: update location placeholder cell after user enables location
rAPIOS64c0c4fe89a8: Merge pull request #2461 from wikimedia/update/dismiss-collapsed-cards

Branches

Unknown

Tags

Unknown

ChangeId

None

Event Timeline

GitHub <noreply@github.com> committed rAPIOS03ed727eb44f: Merge branch 'develop' into update/T199837 (authored by • NHarateh_WMF).Jul 20 2018, 8:14 PM

• NHarateh_WMF mentioned this in rAPIOS3199d8533632: Merge 03ed727eb44fdfb3b6a75763690587f7e7063266 into….Jul 20 2018, 8:16 PM

Merged Changes

64c0c4fe89a8 Merge pull request #2461 from wikimedia/update/dismiss-collapsed-cards
Author
JoeWalsh
Browse Repository
No Builds
No Audits
7f6ca8250aab Merge branch 'develop' into update/dismiss-collapsed-cards
Author
JoeWalsh
Browse Repository
No Builds
No Audits
9b0fdb237ff3 Merge pull request #2462 from wikimedia/update/T199831
Author
JoeWalsh
Browse Repository
No Builds
No Audits
0922e66104d2 fix for "because you read" cards appearing when hiding other feed cards
Author
JoeWalsh
Browse Repository
No Builds
No Audits
2e2c8a1fffc8 dismiss keyboard when user taps search
Author
• NHarateh_WMF
Browse Repository
No Builds
No Audits
ea6bec195856 Merge branch 'update/dismiss-collapsed-cards' of https://github.
Author
• NHarateh_WMF
Browse Repository
No Builds
No Audits
325dda2d80e2 fetch groups instead of getting them from results controller
Author
• NHarateh_WMF
Browse Repository
No Builds
No Audits
4fd63d31b342 Merge branch 'develop' into update/dismiss-collapsed-cards
Author
montehurd <montehurd@users.noreply.github.com>
Browse Repository
No Builds
No Audits
769e558ce8a9 dismiss collapsed groups via operation
Author
• NHarateh_WMF
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

WMF Framework/

WMFExploreFeedContentController.h

WMFExploreFeedContentController.m

Wikipedia/

Code/

ExploreViewController.swift

SearchViewController.swift

rAPIOS03ed727eb44f

View Options

WMF Framework/WMFExploreFeedContentController.h

View Options

WMF Framework/WMFExploreFeedContentController.m

View Options

Wikipedia/Code/ExploreViewController.swift

View Options

Wikipedia/Code/SearchViewController.swift

Merge branch 'develop' into update/T19983703ed727eb44fActions

Description

Details

Event Timeline

Merged Changes

Changes (4)

rAPIOS03ed727eb44f

WMF Framework/WMFExploreFeedContentController.h

WMF Framework/WMFExploreFeedContentController.m

Wikipedia/Code/ExploreViewController.swift

Wikipedia/Code/SearchViewController.swift

Merge branch 'develop' into update/T199837
03ed727eb44f
Actions