Commit Graph

67 Commits

Author SHA1 Message Date
lagapollo 098a1ffa62 forgot semi-colon 2015-12-07 09:37:56 +01:00
lagapollo 6abbd98082 update SSZipArchive.h
For a project, I need to write a folder into the zip archive.
The method writeFolderAtPath: withFolderName: is only private and I need it from outside. 

I can't use class method because i'm creating the archive manually, i have multiple folders and multiples files to zip.
2015-12-07 09:36:17 +01:00
Alex Kalinichenko 35fe9b6af4 Add guards for the malloc calls in zip.c file. 2015-11-26 11:11:01 -05:00
Alex Kalinichenko 744822d595 Add guards for the malloc calls in SSZipArchive.m file. 2015-11-26 10:47:55 -05:00
Joshua Hudson 644dedb048 Manually merged in AES support. #207, #199. Original PRs had errors. 2015-11-24 10:31:51 -08:00
ClementPadovani 03f70718a2 Added getters.
Updated `BOOL` getters for `open` and `close`.
2015-11-17 15:17:13 +01:00
Joshua Hudson c466f6bd99 Revert "support aes,compatible old way for zip" 2015-11-16 10:46:30 -08:00
Joshua Hudson 964eb630e6 Merge pull request #199 from SLboat/master
support aes,compatible old way for zip
2015-11-16 10:41:18 -08:00
Joshua Hudson 812be0abb2 Merge pull request #188 from ANNotunzdY/master
comment typo
2015-11-16 10:40:28 -08:00
Sen c2bd1bd51b AES FIX 2015-10-29 10:14:32 +08:00
Sen c601929993 compatible old way for zip 2015-10-29 06:57:03 +08:00
Sen de2c1fe2f3 support password zip 2015-10-28 20:48:53 +08:00
Sen a523114ea1 update mini zip 1.1 to support aes... 2015-10-28 18:23:17 +08:00
Joshua Hudson 1bb8a98d51 Add's back change from #189
To merge in a bunch of greate changes I had to revert #189. Now that those are in I can roll that change back in.
2015-10-24 15:40:46 -07:00
Sean Soper 5a422fc833 Roll back changes made since 0.3.3 which was last known working version, move C libs around to get working in Pods 0.39 space, add Swift example, add Objective-C example, move tests and ensure they pass 2015-10-23 14:15:31 -04:00
Takayoshi Sato 1d737eb7a4 comment typo 2015-10-08 15:29:34 +09:00
Douglas Bumby 3a07e9888d Move project around 2015-07-12 12:06:13 +01:00
Douglas Bumby ded74bc073 Add new project (in the works) 2015-07-11 23:15:40 +01:00
Ahmed Hamdy 8d2b39b5ec Fix testCase and apply modern Objc 2015-06-06 20:43:47 +03:00
Lukas Mollidor c39636b71b Avoid shadowing variable when extracting ZIP64 extra header fields 2015-04-14 18:39:50 +02:00
David Jennes a9ece3bef7 Add delegate method with extracted file path 2015-04-09 20:07:03 +02:00
Patrick Dinger 9761f045b2 Fix calendar deprecation warning on OSX 10.10 2015-04-08 14:44:43 +02:00
Douglas Bumby 35b181504c Merging in #138 2015-04-06 23:52:50 -04:00
Douglas Bumby 8be53bee68 Fix 2015-04-06 23:51:08 -04:00
Douglas Bumby cc714460f9 Fix for #52 2015-04-06 23:43:15 -04:00
Douglas Bumby 88c2ab7516 Fixing issue #98 2015-04-06 23:39:19 -04:00
Douglas Bumby 95d3d3544a missed a spot 2015-04-06 17:18:40 -04:00
Douglas Bumby 4e3625684d cleanup 2015-04-06 17:18:27 -04:00
Douglas Bumby cc24921107 Copyright year + miscellaneous changes 2015-04-06 17:17:26 -04:00
Douglas Bumby 487093160b Merge pull request #137 from soffes/TheRealKerni-patch-1
The real kerni patch 1
2015-04-06 17:08:51 -04:00
Douglas Bumby dbc332ce70 #92 2015-04-06 17:08:24 -04:00
Douglas Bumby 938749897d MERGE: Add writeFileAtPath:withFileName: in SSZipArchive.h so that it can be called. 2015-04-06 17:05:47 -04:00
Douglas Bumby c881c8528f Merge pull request #121 from rileytestut/master
Added option to keep parent directory when compressing directory contents
2015-04-06 16:53:21 -04:00
DimonDeveloper 5492b7bcea Archive empty folder in other folder 2015-04-06 23:39:15 +03:00
Douglas Bumby 4b4cce2666 Merging in some changes 2015-04-06 15:51:07 -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 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 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 0c9aaee02b Revert "Add support for archives in folders" 2015-04-06 13:35:21 -04:00
Lars Immisch 9426653711 Add support for archives in folders 2015-03-27 10:53:38 +01:00
Riley Testut 33c7884202 Added option to keep parent directory when compressing directory contents 2014-12-21 18:02:19 -06: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
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
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