Chris Li
|
d3ce014f54
|
Commit
|
2017-03-01 18:56:43 -05:00 |
|
Chris Li
|
37f47b0a5c
|
Merge branch '1.8'
Conflicts:
Kiwix-iOS/AppDelegate.swift
Kiwix-iOS/Assets-old.xcassets/Bookmarks/BookmarkAdded.imageset/BookmarkAdded.png
Kiwix-iOS/Assets-old.xcassets/Bookmarks/BookmarkAdded.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/BookmarkColor.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/BookmarkColor.imageset/favorite.png
Kiwix-iOS/Assets-old.xcassets/Bookmarks/BookmarkRemoved.imageset/BookmarkRemoved.png
Kiwix-iOS/Assets-old.xcassets/Bookmarks/BookmarkRemoved.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/Star.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/Star.imageset/stars64 copy 2.png
Kiwix-iOS/Assets-old.xcassets/Bookmarks/StarHighlighted.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/StarHighlighted.imageset/stars64 copy 3.png
Kiwix-iOS/Assets-old.xcassets/Bookmarks/StarRemoved.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/StarRemoved.imageset/star.png
Kiwix-iOS/Assets-old.xcassets/Bookmarks/StarShortcut.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Bookmarks/StarShortcut.imageset/star-1.png
Kiwix-iOS/Assets-old.xcassets/Contents.json
Kiwix-iOS/Assets-old.xcassets/Cross.imageset/close copy.png
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/Cloud.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/Cloud.imageset/icloud.png
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/CloudColor.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/CloudColor.imageset/sky.png
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/CloudFilled.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/CloudFilled.imageset/icloud-filled.png
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/LanguageFilter.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/LanguageFilter.imageset/Filter.png
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/Refresh.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Cloud/Refresh.imageset/update23.png
Kiwix-iOS/Assets-old.xcassets/Library/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Library.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/Library/Library.imageset/Library.png
Kiwix-iOS/Assets-old.xcassets/SearchScopeControl/Check.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/SearchScopeControl/Check.imageset/success.png
Kiwix-iOS/Assets-old.xcassets/SearchScopeControl/CheckBlue.imageset/Contents.json
Kiwix-iOS/Assets-old.xcassets/SearchScopeControl/CheckBlue.imageset/success-1.png
Kiwix-iOS/Assets.xcassets/Bookmarks/BookmarkAdded.imageset/BookmarkAdded.png
Kiwix-iOS/Assets.xcassets/Bookmarks/BookmarkAdded.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/BookmarkColor.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/BookmarkColor.imageset/favorite.png
Kiwix-iOS/Assets.xcassets/Bookmarks/BookmarkRemoved.imageset/BookmarkRemoved.png
Kiwix-iOS/Assets.xcassets/Bookmarks/BookmarkRemoved.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/Star.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/Star.imageset/stars64 copy 2.png
Kiwix-iOS/Assets.xcassets/Bookmarks/StarHighlighted.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/StarHighlighted.imageset/stars64 copy 3.png
Kiwix-iOS/Assets.xcassets/Bookmarks/StarRemoved.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/StarRemoved.imageset/star.png
Kiwix-iOS/Assets.xcassets/Bookmarks/StarShortcut.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Bookmarks/StarShortcut.imageset/star-1.png
Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png
Kiwix-iOS/Assets.xcassets/Library/Cloud/Cloud.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Cloud/Cloud.imageset/icloud.png
Kiwix-iOS/Assets.xcassets/Library/Cloud/CloudColor.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Cloud/CloudColor.imageset/sky.png
Kiwix-iOS/Assets.xcassets/Library/Cloud/CloudFilled.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Cloud/CloudFilled.imageset/icloud-filled.png
Kiwix-iOS/Assets.xcassets/Library/Cloud/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Cloud/LanguageFilter.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Cloud/LanguageFilter.imageset/Filter.png
Kiwix-iOS/Assets.xcassets/Library/Cloud/Refresh.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Cloud/Refresh.imageset/update23.png
Kiwix-iOS/Assets.xcassets/Library/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Library.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/Library/Library.imageset/Library.png
Kiwix-iOS/Assets.xcassets/SearchScopeControl/Check.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/SearchScopeControl/Check.imageset/success.png
Kiwix-iOS/Assets.xcassets/SearchScopeControl/CheckBlue.imageset/Contents.json
Kiwix-iOS/Assets.xcassets/SearchScopeControl/CheckBlue.imageset/success-1.png
Kiwix-iOS/Assets.xcassets/SearchScopeControl/Contents.json
Kiwix-iOS/Controller/Bookmark/BookmarkControllerAnimator.swift
Kiwix-iOS/Controller/LibraryLocalTBVC.swift
Kiwix-iOS/Controller/Main/MainController.swift
Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
Kiwix-iOS/Controller/Main/MainControllerShowHide.swift
Kiwix-iOS/Info.plist
Kiwix-iOS/Model/Network.swift
Kiwix-iOS/Storyboard/Library.storyboard
Kiwix-iOS/Storyboard/Search.storyboard
Kiwix-iOS/iOSExtensions.swift
Kiwix-iOSUITests/SnapshotHelper.swift
Kiwix-iOSWidgets/Bookmarks/Info.plist
Kiwix-iOSWidgets/Bookmarks/TodayViewController.swift
Kiwix.xcodeproj/project.pbxproj
Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Bookmarks.xcscheme
Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Kiwix-OSX.xcscheme
Kiwix.xcodeproj/xcuserdata/Chrisli.xcuserdatad/xcschemes/Kiwix-iOS.xcscheme
Kiwix/CoreData/Article.swift
Kiwix/Extensions.swift
Kiwix/FileManager.swift
Kiwix/Operations/RefreshLibraryOperation.swift
Kiwix/Operations/ScanLocalBookOperation.swift
Kiwix/URLProtocol/KiwixURLProtocol.swift
Kiwix/ZimMultiReader/DirectoryMonitor.swift
Podfile
Podfile.lock
README.md
Shared/ZimMultiReader/DirectoryMonitor.swift
Tests/iOS_ScreenshotAutomator/SnapshotHelper.swift
iOS/Support/Assets.xcassets/Bookmarks/BookmarkAdded.imageset/BookmarkAdded.png
iOS/Support/Assets.xcassets/Bookmarks/BookmarkAdded.imageset/Contents.json
iOS/Support/Assets.xcassets/Bookmarks/BookmarkColor.imageset/Contents.json
iOS/Support/Assets.xcassets/Bookmarks/BookmarkColor.imageset/favorite.png
iOS/Support/Assets.xcassets/Bookmarks/BookmarkDate.imageset/Contents.json
iOS/Support/Assets.xcassets/Bookmarks/BookmarkRemoved.imageset/BookmarkRemoved.png
iOS/Support/Assets.xcassets/Bookmarks/BookmarkRemoved.imageset/Contents.json
iOS/Support/Assets.xcassets/Bookmarks/Contents.json
iOS/Support/Assets.xcassets/Bookmarks/StarShortcut.imageset/Contents.json
iOS/Support/Assets.xcassets/Bookmarks/StarShortcut.imageset/star-1.png
iOS/Support/Assets.xcassets/Cross.imageset/close copy.png
iOS/Support/Assets.xcassets/Dots.imageset/Contents.json
iOS/Support/Assets.xcassets/Library/Cloud/Cloud.imageset/Contents.json
iOS/Support/Assets.xcassets/Library/Cloud/Cloud.imageset/icloud.png
iOS/Support/Assets.xcassets/Library/Cloud/CloudColor.imageset/Contents.json
iOS/Support/Assets.xcassets/Library/Cloud/CloudColor.imageset/sky.png
iOS/Support/Assets.xcassets/Library/Cloud/CloudFilled.imageset/Contents.json
iOS/Support/Assets.xcassets/Library/Cloud/CloudFilled.imageset/icloud-filled.png
iOS/Support/Assets.xcassets/Library/Cloud/Contents.json
iOS/Support/Assets.xcassets/Library/Cloud/Download.imageset/Contents.json
iOS/Support/Assets.xcassets/Library/Cloud/LanguageFilter.imageset/Contents.json
iOS/Support/Assets.xcassets/Library/Cloud/LanguageFilter.imageset/Filter.png
iOS/Support/Assets.xcassets/Library/Contents.json
iOS/Support/Assets.xcassets/Library/Local/Contents.json
iOS/Support/Assets.xcassets/Library/Local/Folder.imageset/Contents.json
iOS/Support/Assets.xcassets/Library/Local/Folder.imageset/folder-2.png
iOS/Support/Assets.xcassets/Library/Local/FolderFilled.imageset/folder.png
iOS/Support/Assets.xcassets/Main/Library.imageset/Contents.json
iOS/Support/Assets.xcassets/Main/Library.imageset/Library.png
iOS/Support/Assets.xcassets/SearchScopeControl/Check.imageset/Contents.json
iOS/Support/Assets.xcassets/SearchScopeControl/Check.imageset/success.png
iOS/Support/Assets.xcassets/SearchScopeControl/CheckBlue.imageset/Contents.json
iOS/Support/Assets.xcassets/SearchScopeControl/CheckBlue.imageset/success-1.png
iOS/Support/Info.plist
iOSWidgets/Bookmarks/Info.plist
iOSWidgets/Bookmarks/TodayViewController.swift
|
2017-03-01 18:55:30 -05:00 |
|
Chris Li
|
9ffab93604
|
Merge branch '1.8-macOS' into 1.8
|
2017-03-01 17:28:33 -05:00 |
|
Chris Li
|
44dccc295c
|
Refactor
|
2017-03-01 17:27:01 -05:00 |
|
Chris Li
|
93837a31eb
|
commit
|
2017-03-01 17:23:51 -05:00 |
|
Chris Li
|
fdd67657bb
|
Commit
|
2017-03-01 17:19:43 -05:00 |
|
Chris Li
|
df35b84b85
|
Refactor
|
2017-03-01 17:06:57 -05:00 |
|
Chris Li
|
76b80ce082
|
Accessibility
|
2017-03-01 15:53:18 -05:00 |
|
Chris Li
|
86b8757219
|
Library improvement
|
2017-03-01 11:29:39 -05:00 |
|
Chris Li
|
a09b8f46b1
|
Add commented line back while fix ifaddrs pointer bug
|
2017-02-25 09:47:42 -05:00 |
|
Chris Li
|
71e257cd2a
|
Version bump
|
2017-02-24 14:33:51 -05:00 |
|
Chris Li
|
14bbbd29bf
|
Cellular capability detection
|
2017-02-24 14:19:32 -05:00 |
|
Chris Li
|
d43c964e3d
|
Refactor
|
2017-02-24 13:56:35 -05:00 |
|
Chris Li
|
4698d52195
|
Library cell selection actions
|
2017-02-24 11:42:10 -05:00 |
|
Chris Li
|
5d651c7a83
|
Bug fix: duplicated results when both title & index search is activated
|
2017-02-24 11:17:09 -05:00 |
|
Chris Li
|
7955cbf79e
|
Wifi only / wifi + cellular download
|
2017-02-15 10:30:10 -05:00 |
|
Chris Li
|
4dbe7f4688
|
macOS target
|
2017-02-13 15:53:56 -05:00 |
|
Chris Li
|
91e552d3fc
|
Adding macOS target
|
2017-02-12 18:32:27 -05:00 |
|
Chris Li
|
7c33a9a987
|
Library button hittest
|
2017-02-12 17:31:30 -05:00 |
|
Chris Li
|
0720adf7df
|
Library: add open main page in local tab
|
2017-02-12 16:45:36 -05:00 |
|
Chris Li
|
ee72c99cd5
|
Build setting
|
2017-02-12 16:39:57 -05:00 |
|
Chris Li
|
cf815f7722
|
1.8 beta
|
2017-02-10 16:22:24 -05:00 |
|
Chris Li
|
d50a0e5be3
|
bug fix: Network activity indicator controller
|
2017-02-10 15:40:58 -05:00 |
|
Chris Li
|
a5ab07ee71
|
Widget target
|
2017-02-10 15:37:03 -05:00 |
|
Chris Li
|
b895da4c4e
|
Project signing setting
|
2017-02-10 15:36:45 -05:00 |
|
Chris Li
|
4593057da7
|
Code removal
|
2017-02-10 15:35:11 -05:00 |
|
Chris Li
|
8522bc9b9c
|
ATS enabled
|
2017-02-10 15:33:53 -05:00 |
|
Chris Li
|
c33b000477
|
Welcome: load main page
|
2017-02-10 15:30:49 -05:00 |
|
Chris Li
|
1c1e24bff0
|
Bug fix for quick action
|
2017-02-10 14:33:13 -05:00 |
|
Chris Li
|
91ab3c65ac
|
Commit
|
2017-02-10 13:54:33 -05:00 |
|
Chris Li
|
216eb91a22
|
welcome controller button
|
2017-02-08 13:56:19 -05:00 |
|
Chris Li
|
f4bd73e477
|
Fixes for library space detection
|
2017-02-07 13:40:15 -05:00 |
|
Chris Li
|
d841c3b982
|
Library free space detection
|
2017-02-07 13:31:53 -05:00 |
|
Chris Li
|
a76b45eb4c
|
Code removal
|
2017-02-07 10:22:08 -05:00 |
|
Chris Li
|
000ff42bba
|
Book collection cell baseline alignment
|
2017-02-07 10:12:49 -05:00 |
|
Chris Li
|
1c963bec67
|
Code removal
|
2017-02-07 10:05:33 -05:00 |
|
Chris Li
|
b12f727904
|
Code removal
|
2017-02-07 09:48:21 -05:00 |
|
Chris Li
|
e404ea14d8
|
Refactor
|
2017-02-06 12:01:02 -05:00 |
|
Chris Li
|
0404ac9101
|
Renaming
|
2017-02-03 17:27:21 -05:00 |
|
Chris Li
|
220d655723
|
refactor
|
2017-02-03 17:26:01 -05:00 |
|
Chris Li
|
779bd8e81d
|
Code removal
|
2017-02-03 15:52:03 -05:00 |
|
Chris Li
|
fada467f7d
|
Code removal
|
2017-02-03 15:51:52 -05:00 |
|
Chris Li
|
874d1da6fc
|
Bookmark widget data update
|
2017-02-03 15:51:23 -05:00 |
|
Chris Li
|
d6718d2d67
|
Refactors and fixes
|
2017-02-03 15:35:12 -05:00 |
|
Chris Li
|
0136e66d94
|
Empty background for lang filter
|
2017-02-03 15:22:40 -05:00 |
|
Chris Li
|
a67f37bffd
|
Library empty background
|
2017-02-03 15:10:59 -05:00 |
|
Chris Li
|
59f870de9f
|
Wording of lang filter alert
|
2017-02-03 13:45:32 -05:00 |
|
Chris Li
|
d58cc8b9b9
|
Rate app
|
2017-02-03 11:52:05 -05:00 |
|
Chris Li
|
ff739d2e17
|
Basic setup for UserHabit
|
2017-02-02 17:04:52 -05:00 |
|
Chris Li
|
0f7d7f7bd1
|
Bug fix: book status when cancelling / pausing
|
2017-02-02 16:51:27 -05:00 |
|