Skip to content
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

[TIMOB-6423] Fixed up keystore key password checking and prompting. #4980

Merged
merged 9 commits into from Nov 15, 2013
Merged

[TIMOB-6423] Fixed up keystore key password checking and prompting. #4980

merged 9 commits into from Nov 15, 2013

Conversation

cb1kenobi
Copy link
Contributor

No description provided.

jonalter and others added 6 commits September 5, 2013 10:36
@jonalter
[MOD-1514] Map iOS: moving to a standalone module
348cb17
@jonalter
Merge branch 'master' of https://github.com/appcelerator/titanium_mobile
9e4ec19 
 into MOD-1514

Conflicts:
	iphone/Classes/MapModule.m
	iphone/Classes/TiMapAnnotationProxy.m
	iphone/Classes/TiMapView.h
	iphone/Classes/TiMapView.m
	iphone/Classes/TiMapViewProxy.m
	iphone/iphone/Titanium.xcodeproj/project.pbxproj
@cb1kenobi
[TIMOB-15711] Fixed sync issues with xcodebuild and optimize images r…
0652b5b 
…unning at the same time.
@cb1kenobi
Merge branch 'master' into timob-15711
9e9e6d8 
Conflicts:
	iphone/cli/commands/_build.js
@cb1kenobi
[TIMOB-6423] Fixed up keystore key password checking and prompting.
b131b66
Merge pull request #4978 from cb1kenobi/timob-15711
d4180d1 
[TIMOB-15711] Fixed sync issues with xcodebuild and optimize images runn...
@ayeung
Copy link
Contributor

ayeung commented Nov 15, 2013

Code reviewed and functionally tested. Request Accepted.

ayeung and others added 3 commits November 15, 2013 13:18
Merge pull request #4980 from cb1kenobi/timob-6423
923ed0d 
[TIMOB-6423] Fixed up keystore key password checking and prompting.
@vishalduggal
Merge pull request #4650 from jonalter/MOD-1514
8487d06 
[MOD-1514] Map iOS: moving to a standalone module
@vishalduggal
Merge pull request #4981 from jonalter/MOD-1492
3ee4efc 
[MOD-1492] Adding iOS Map Module 2.0.0 to packaged modules
@jonalter jonalter merged commit 3ee4efc into tidev:master Nov 15, 2013
@cb1kenobi cb1kenobi deleted the timob-6423 branch November 15, 2013 22:31
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.

None yet
4 participants
@cb1kenobi @ayeung @jonalter @vishalduggal