Commit Graph

191 Commits

Author SHA1 Message Date
David Jennes
a9ece3bef7 Add delegate method with extracted file path 2015-04-09 20:07:03 +02:00
Douglas Bumby
fc61e0358d Merge pull request #144 from padinger/master
Fix calendar deprecation warning on OSX 10.10
2015-04-08 16:42:31 -04:00
Patrick Dinger
9761f045b2 Fix calendar deprecation warning on OSX 10.10 2015-04-08 14:44:43 +02:00
Douglas Bumby
2a1eee19b4 Merge pull request #139 from soffes/aceisScope-master
Aceis scope master
2015-04-06 23:53:18 -04: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
c9d93d23e3 Change SSZipArchive to Tests 2015-04-06 19:17:27 -04:00
Douglas Bumby
bddefcebfe Re-organise Xcode Project using Synx 2015-04-06 19:14:29 -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
cedaa5250c Merge pull request #136 from soffes/basitali-master
Basitali master
2015-04-06 17:06:13 -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
Douglas Bumby
13e3ab93b4 Merge pull request #135 from DimonDeveloper/patch-2
Archive empty folder in other folder
2015-04-06 16:47:25 -04:00
DimonDeveloper
5492b7bcea Archive empty folder in other folder 2015-04-06 23:39:15 +03:00
Douglas Bumby
8b046fc30b Version changed 2015-04-06 15:55:52 -04:00
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
Riley Testut
33c7884202 Added option to keep parent directory when compressing directory contents 2014-12-21 18:02:19 -06: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