Commit Graph

166 Commits

Author SHA1 Message Date
Douglas Bumby ef396cbd52 Merge pull request #133 from soffes/955dreams-master
955dreams master
2015-04-06 15:51:28 -04:00
Douglas Bumby 4b4cce2666 Merging in some changes 2015-04-06 15:51:07 -04:00
Douglas Bumby d8a7fd0e8c Update README.md 2015-04-06 15:44:13 -04:00
Douglas Bumby 0b476953df Make use of Objective-C .gitignore template 2015-04-06 15:25:08 -04:00
Douglas Bumby 056fe04808 Update and rename LICENSE to LICENSE.txt 2015-04-06 15:23:36 -04:00
Douglas Bumby 292d95e41a Merge pull request #58 from mickrobk/master
writeFileAtPath does not close file handle
2015-04-06 15:18:56 -04:00
Douglas Bumby fede9541b4 Merge pull request #132 from soffes/Cpu86-master
Cpu86 master
2015-04-06 15:13:48 -04:00
Douglas Bumby ae50a6d40a fix the merges 2015-04-06 15:13:07 -04:00
Douglas Bumby a75d901a85 Merge pull request #112 from iosphere/fix-shadowed-variable
Fix warning on shadowed variable when creating zip file
2015-04-06 15:00:27 -04:00
Douglas Bumby cb037e1010 Merge pull request #113 from iosphere/zipArchiveProgressEvent-type
Report file size as unsigned long long to delegate
2015-04-06 14:59:07 -04:00
Douglas Bumby c119896966 Merge pull request #95 from vtourraine/patch-1
Fix implicit conversion warning
2015-04-06 14:57:25 -04:00
Douglas Bumby bf55cb47b7 Merge pull request #108 from taberrr/patch-1
Update SSZipArchive.podspec
2015-04-06 14:10:42 -04:00
Douglas Bumby 801d1198b5 Merge pull request #122 from boherna/master
Adds progress and completion handlers. Support for adding folders and subfolders to ZIP packages.
2015-04-06 14:09:09 -04:00
Douglas Bumby 94a6637002 Merge pull request #114 from xhacker/patch-1
Update Readme.markdown
2015-04-06 13:48:38 -04:00
Douglas Bumby b37ab60ba0 Merge pull request #131 from soffes/zlandau-cancelunzip
Zlandau cancelunzip
2015-04-06 13:44:27 -04:00
Douglas Bumby a90b2a9611 Merge fixes 2015-04-06 13:42:48 -04:00
Douglas Bumby 7e44caef39 Merge pull request #130 from soffes/revert-129-master
Revert "Add support for archives in folders"
2015-04-06 13:35:51 -04:00
Douglas Bumby 0c9aaee02b Revert "Add support for archives in folders" 2015-04-06 13:35:21 -04:00
Douglas Bumby bd02992224 Merge pull request #129 from Binauric/master
Add support for archives in folders
2015-04-06 13:22:46 -04:00
Lars Immisch 9426653711 Add support for archives in folders 2015-03-27 10:53:38 +01:00
David Robles 67403e8a28 Update pod spec. 2014-11-05 15:40:12 -08:00
David Robles 74ce9fc2c7 Update Pod spec. 2014-11-05 15:34:55 -08:00
Bohdan Hernandez 553c4be486 Merge remote-tracking branch 'upstream/master'
* upstream/master:
  Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning
  Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning

Conflicts:
	SSZipArchive/minizip/ioapi.c
2014-11-05 20:51:56 +00:00
Sam Soffes 9f93d0c1b7 Merge pull request #120 from nicked/master
Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warnings
2014-10-31 08:23:04 -07:00
nicked 55437a8b8e Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning 2014-10-31 11:09:31 +01:00
nicked d68c99b890 Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning 2014-10-31 11:08:04 +01:00
Bohdan Hernandez e1bfb6e8ed Merge remote-tracking branch 'upstream/master'
* upstream/master:
  Change the CalendarUnit for iOS 8.0
2014-10-29 13:22:06 +00:00
Sam Soffes 874ebd8651 Merge pull request #119 from liufan321/master
Change CalendarUnits for iOS 8.0
2014-10-26 21:48:47 -07:00
Fan Liu a8f065f2a1 Change the CalendarUnit for iOS 8.0 2014-10-26 03:50:58 +08:00
Bohdan Hernandez b89dfcf4fd Merge branch 'master' of https://github.com/soffes/ssziparchive
# By Adam Yanalunas (2) and Landon Fuller (1)
# Via Adam Yanalunas
* 'master' of https://github.com/soffes/ssziparchive:
  Updated podspec for v0.3.2
  Relative symlink fixture for new symlink detection in #91
  Replace symlink heuristic with a well-defined test.
2014-09-22 00:45:08 +01:00
LIU Dongyuan / 柳东原 b688b9859a Update Readme.markdown
createZipFileAtPath:withFilesAtPaths: creates an invalid zip for directory
2014-09-20 13:21:42 -07:00
Lukas Mollidor 54875c8192 Report file size as unsigned long long to delegate 2014-09-12 19:11:46 +02:00
Lukas Mollidor df0d5536e8 Fix warning on shadowed variable when creating zip file 2014-09-12 18:44:36 +02:00
Adam Yanalunas 60f577ab9a Updated podspec for v0.3.2 2014-09-08 11:39:44 -07:00
Adam Yanalunas 60312c173b Merge pull request #111 from soffes/test/relative_path_fixture
Relative symlink fixture for new symlink detection in #91
v0.3.2
2014-09-08 11:26:13 -07:00
Adam Yanalunas c363747a15 Merge pull request #91 from landonf/master
Fix symlink detection
2014-09-08 11:26:01 -07:00
Adam Yanalunas e29efca7bf Relative symlink fixture for new symlink detection in #91 2014-09-05 13:19:30 -07:00
Taber Buhl 024241a3e0 Update SSZipArchive.podspec
trying alternative source_files syntax
2014-08-01 17:22:06 -04:00
Bohdan Hernandez 47c50d0482 Adds progress and completion handlers. 2014-07-29 18:54:28 +01:00
Zacharyl Landau 2385ac9241 Add a delegate for cancelling unzips
This adds a zipArchiveShouldUnzipFileAtIndex, which is called before
each call to zipArchiveWillUnzipFileAtIndex, allowing a delegate to
cancel the unzip progress.
2014-07-16 11:28:25 -07:00
Bohdan Hernandez b91fe135e2 Removes some compile warnings. 2014-05-12 09:52:50 +01:00
Bohdan Hernandez 57b6018ca0 Merge branch 'master' of https://github.com/soffes/ssziparchive
# By Andreas Dangel (2) and others
# Via Erickson Pacioles (1) and Sam Soffes (1)
* 'master' of https://github.com/soffes/ssziparchive:
  Fixed warnings from Xcode Analyzer
  Fix warnings on 64-bit
  Add a unit test for zipArchiveProgressEvent.
  Add a progress event while unzipping. The progress is determined by the compressed file size and zip entries.
2014-04-28 10:46:50 +01:00
Sam Soffes 89b32b9328 Merge pull request #99 from mr-fahrenheit/master
Fixed warnings from Xcode Analyzer
2014-04-06 09:25:57 -04:00
Mr. Fahrenheit 1b2ec1a9ec Fixed warnings from Xcode Analyzer 2014-04-06 19:42:33 +08:00
Sam Soffes b4c9bde3fb Fix warnings on 64-bit 2014-03-22 08:01:08 -07:00
Andreas Dangel 4fca963b62 Add a unit test for zipArchiveProgressEvent. 2014-03-22 03:56:37 +01:00
Andreas Dangel 281571d99f Add a progress event while unzipping.
The progress is determined by the compressed file size and zip entries.
2014-03-14 21:22:20 -04:00
Vincent Tourraine 47afe71fa2 Fix implicit conversion warning
```
SSZipArchive/minizip/ioapi.c:195:33: Implicit conversion loses integer precision: 'ZPOS64_T' (aka 'unsigned long long') to 'long'
```
2014-03-03 11:38:04 +01:00
Bohdan Hernandez de0ffe7478 Support for adding folders and subfolders to ZIP packages. 2014-02-09 02:48:44 +00:00
Landon Fuller 653caaa9b2 Replace symlink heuristic with a well-defined test.
As per the PKWARE ZIP File Format Specification (6.3.2), this
patch tests the file 'version made by' field for the UNIX (3)
constant, and then interprets the external file attributes accordingly,
assuming an st_mode field in the high 16 bits.
2014-01-16 11:53:45 -05:00