Skip to content

I merge from others commit, and add a project for methods sample. #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

I merge from others commit, and add a project for methods sample. #46

wants to merge 36 commits into from

Conversation

@TechD-Robin
Copy link

@TechD-Robin TechD-Robin commented Jan 14, 2015

I merge from others commit, and add a project for methods sample, and fix some bug.

agnat and others added 30 commits September 16, 2014 18:57
@agnat
Include zlib.h correctly
dea5f4d
@agnat
do not link libs on iOS
d119fd7
@agnat
Committing version changes
24baac6
@agnat
Xcode Upgrade chnges
bddd0b4
@techrah
Decompression progress updates using delegates (instead of block).
fef5fa1
@techrah
Reverted import statements for zlib and zconf. Uncertain how they got…
8b9df40 
… changed.
@techrah
Comment spelling correction.
edee78d
added a method to unzip zipped file to memory
aa9ea81
@pavel-mayer
- fixed excessive memory usage on archive creation
2fe5654 
- Works with ARC now
@pavel-mayer
- version number checks
14d37cd
@TechD-Robin
Merge branch 'master' of https://github.com/turenus/ZipArchive
09efe62
@TechD-Robin
Merge branch 'master' of https://github.com/OpenFibers/ZipArchive
7c604df
@TechD-Robin
add define check for OS version, to remove build warning;
c1048a3 
about NSGregorianCalendar will deprecate.
@TechD-Robin
modify check os version condition.
c5a27df
@TechD-Robin
fixed bug, when include the library into Mac application.
0347413
@TechD-Robin
fix bug refer from : mattconnolly#40 (comment) .
58cea7e 
tmu_date.tm_mon is the number of "months since January [0,11]"
and must be adjusted before being used in NSDateComponents.
@TechD-Robin
Merge branch 'master' of https://github.com/ryanhomer/ZipArchive into…
d353400 
… develop
@TechD-Robin
Refactoring define check for OS version, to remove build warning;
573bb98 
about NSGregorianCalendar will deprecate.
@TechD-Robin
Refactoring for ARC check, change to use SAFE_ARC macro.
e0a9a9e
@TechD-Robin
add a project for demo method (empty).
765cc9f
@TechD-Robin
import the library & add some base method for tableview(sample use).
ec7d04f
@TechD-Robin
add sample for base unzip method.
ae6878f
@TechD-Robin
add sample for unzip method with delegate option method (unzip progre…
9c0c425 
…ss).
@TechD-Robin
fix bug refer from this commit : kolyvan@8442c26 .
b7c46b0 
( fallback for encoding filename with different encoding in unzipping )

& add some sample for check about use different encoding.
@TechD-Robin
add a sample for zip file.
b695024 
& fix bug about components.month when zip file.
@j4v1n8r @TechD-Robin
Added the addFolder... method
d5a16b4
@TechD-Robin
modify a sample for addFolderToZip.
6c6e3fb
@TechD-Robin
add a progress block parameter for new addFolderToZip method.
2b7f922
@TechD-Robin
add a filename parameter to progress update block
f0105f8
@TechD-Robin
update podspec.
c76776e
@TechD-Robin
Copy link
Author

TechD-Robin commented Jan 16, 2015

Hi,
I am sorry for this pull request, i found that merge was difficult when these was mixed with my sample code.

If you will do nothing, or you can reject this request, please tell me;
I will use other method for my repository that forked your's.

& say sorry again for my English is pretty base.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@TechD-Robin @agnat @techrah @pavel-mayer @j4v1n8r