Skip to content

Commit

Permalink
Merge remote-tracking branch 'kasketis/master'
Browse files Browse the repository at this point in the history
* kasketis/master:
  Minor changes related to kasketis#97
  Fixed issue kasketis#97: Search bar UI issues under iOS 11 - XCode 9
  We use layout guides in the project, which are only supported in iOS 9; increasing the minimum supported iOS version from 8 to 9
  Fixed build error  :) Cleaned up some warnings
  Changed loader name
  Fixed iOS 11 crash during search by annotating with objc the appropriate properties
  Updated gitignore
  Added new models
  Fixed a bug that managed to slip by my Swift 4 update.
  Ready to roll!
  Proof of concept
  Attempting to use Swift 4 lint
  Swift 4 compatibility
  Added a webview demo
  Added an iOS demo
  Added left close button in NFXListController_iOS + NFX.toggle()
  • Loading branch information
freak4pc committed Oct 17, 2017
2 parents 44273f9 + d6c104b commit e8ac6df
Show file tree
Hide file tree
Showing 29 changed files with 1,065 additions and 100 deletions.
63 changes: 63 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,65 @@
.DS_Store
*.xcuserdatad

# Created by https://www.gitignore.io/api/xcode,osx

### OSX ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Xcode ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno

# End of https://www.gitignore.io/api/xcode,osx
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.0
2 changes: 1 addition & 1 deletion netfox.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "netfox"
s.version = "1.9"
s.version = "1.10.2"
s.summary = "A lightweight, one line setup, iOS/OSX network debugging library!"

s.description = <<-DESC
Expand Down
Loading

0 comments on commit e8ac6df

Please sign in to comment.