Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: appcelerator/titanium_mobile
...
head fork: ocastastudios/titanium_mobile
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Dec 13, 2011
@BlainHamon BlainHamon TIMOB-6612 Toned down severity of warning message for orphaned proxies. 662873a
@billdawson billdawson TIMOB-5031 apidoc: generate setters and getters in user-facing docume…
…ntation.
c3998b4
Stephen Tramer Merge pull request #954 from BlainHamon/timob-6573_1_8
TIMOB-6573 Allow functions as well as objects to be modules.
dfe571c
@pingwang2011 pingwang2011 timob-6627: wrap failing checks for XML drillbit tests 8d5f686
Opie Cyrus Merge pull request #961 from pingwang2011/timob-6627-1_8_X
Timob 6627: Android: Drillbit: wrap failing checks for setAttributeNode in the element and elementNS XML drillbit tests
8052ed8
@sptramer sptramer [TIMOB-6581] Ensure that operations when updating a row take place on…
… the correct threads.
b6a7e77
Stephen Tramer Merge pull request #959 from BlainHamon/timob-6612_1_8
TIMOB-6612 Toned down severity of warning message for orphaned proxies.
3bcd898
Joshua Roesslein [TIMOB-6600] Prevent port conflicts on device by having each app use …
…an unique number.

Conflicts:

	android/runtime/v8/src/java/org/appcelerator/kroll/runtime/v8/V8Runtime.java
	android/runtime/v8/src/native/V8Runtime.cpp
03afecf
@BlainHamon BlainHamon TIMOB-6626 send rotation events to those who don't implement ignoring…
…Rotation.
b360bfe
@billdawson billdawson TIMOB-6553 Make sure module name in KrollGeneratedBindings gets first…
… character upper-cased so it matches what's in [Module]Bootstrap.cpp.
4e4a560
@vishalduggal vishalduggal Merge pull request #962 from sptramer/timob-6581-18X
[TIMOB-6581][1_8_X] Segment Ti.UI.TableView.updateRow() calls to run on the proper threads
03a08fd
@srahim srahim [TIMOB-6575] Replacing the way we included icons for the app 0b1bd6b
Commits on Dec 14, 2011
@Mindelusions Mindelusions Revert 40dd6e0^..HEAD ad02606
@Mindelusions Mindelusions [TIMOB-6502] Fix for the execution failure that occurs when setting a…
… Properties string to null
2e483dc
@Mindelusions Mindelusions [TIMOB-6502] Pulled latest from master and removed .project file b4599ad
@donthorp donthorp Merge pull request #970 from cb1kenobi/timob-6502-1_8_X
TIMOB-6502 - Ti.App.Properties - setting a property to null causes execution failure
15fcee2
@Mindelusions Mindelusions [TIMOB-6426] MobileWeb: support for non-http protocols to Ti.Platform…
….openURL() and Ti.Platform.canOpenURL()
71ca4ab
@Mindelusions Mindelusions [TIMOB-6426] Added uric parser, Fixed canOpenURL() function a29adb9
@Mindelusions Mindelusions [TIMOB-6426] Removing strictMode on uri parser cb70964
@Mindelusions Mindelusions [TIMOB-6426] Removing random whitespace from the uri parser regex str…
…ing.
571b40e
@Mindelusions Mindelusions [TIMOB-6426] Simplified version of the openURL() method
The canOpenURL() method will always return true. The simplified version
of the openURL() url method just parses out the source and protocol,
whitelists some known sources and does some custom scheme checking.
f856536
@Mindelusions Mindelusions [TIMOB-6426] Fixing spacing issues f17f57d
Stephen Tramer Merge pull request #965 from BlainHamon/timob-6626_1_8
TIMOB-6626 send rotation events to those who don't implement ignoringRotation.
3ae0966
Opie Cyrus Merge pull request #968 from billdawson/timob-6553-1.8.X
TIMOB-6553 Android (1.8.X) Make sure module name in KrollGeneratedBindings gets first…
0174e32
@srahim srahim [TIMOB-6575] adding the edges of icons being in Resources folder a462784
@billdawson billdawson TIMOB-6585 use external module apiname in App.java when building the …
…Bootstrap name, since that's what's used by the code that generates Bootstrap.
f295f44
@marshall marshall Merge pull request #956 from joshthecoder/timob-6567-1_8_X
Merge TIMOB-6567 into 1_8_X
8decfaf
Joshua Roesslein [TIMOB-6649] Update debugger module. a9e875a
@marshall marshall Merge pull request #960 from billdawson/timob-5031-1.8.X
TIMOB-5031 (1_8_X) APIDOC: generate getters and setters for properties
369460b
@marshall marshall Merge pull request #948 from hieupham007/timob-6592-1_8_X
Timob 6592 1 8 x
d2eba59
@marshall marshall Merge pull request #953 from donthorp/timob-6464-1_8_X
[TIMOB-6464] validate updates for 1_8_X
c4e0ef3
@donthorp donthorp Merge pull request #971 from cb1kenobi/timob-6426-1_8_X
TIMOB-6426 - Add support for non-http protocols to Ti.Platform.openURL() and Ti.Platform.canOpenURL()
b0f9639
@marshall marshall Merge pull request #964 from joshthecoder/timob-6600-1_8_X
Merge TIMOB-6600 into 1_8_X
2506c0c
@billdawson billdawson TIMOB-6515 Make docgen support Array<Dictionary<Foo>> (embedded brack…
…ets)
8e12656
@donthorp donthorp [TIMOB-6599] annotate css for list with inherited class 942853e
@marshall marshall Merge pull request #975 from billdawson/timob-6585-1.8.X
TIMOB-6585 (1.8.X) Android: use external module apiname in App.java when building the Bootstrap class name
babd991
@srahim srahim [TIMOB-6575] seems like apple wants the icons to be ordered exactly l…
…ike this
ba4c131
@billdawson billdawson TIMOB-6629 Give external module bootstraps a way to call directly int…
…o our NativeModule.require
cb20d4f
@marshall marshall Merge pull request #979 from billdawson/timob-6515-1.8.X
Timob 6515 1.8.x APIDOC: Supported nested types likes Array<Dictionary<Foo>>
907e44c
@marshall marshall Merge pull request #983 from billdawson/timob-6629-1.8.X
Timob 6629 1.8.x Give external module bootstraps a way to call directly into o...
bba492e
@srahim srahim [TIMOB-6575] accidently added two icon-50 files 4ec3d6b
Opie Cyrus Merge pull request #980 from donthorp/timob-6599-1_8_X
TIMOB-6599 - css inherited for 1_8_X
f650ea7
@billdawson billdawson TIMOB-6655 APIDOC: make sure generated property accessors don't dupli…
…cate existing defined methods.

Conflicts:

	apidoc/docgen.py
ce94471
Opie Cyrus Merge pull request #978 from joshthecoder/timob-6649-1_8_X
Merge TIMOB-6649 into 1_8_X
5d591d6
@donthorp donthorp Merge pull request #986 from billdawson/timob-6655-1.8.X
TIMOB-6655 (1.8.X) APIDOC: make sure generated property accessors don't duplicat...
9084b6b
@srahim srahim clean up f538156
@dizzymonkey dizzymonkey TIMOB-6552 add in support for constants that are not literal values e497b23
Arthur Evans TIMOB-4760: Link in Ti.UI to Ti.UI.Window.orientationModes is broken
Type name was wrong (.UI was missing).
97dca01
Arthur Evans TIMOB-6307
Added missing appearance, keyboardType, and returnKeyType properties to TextField and TextArea.

Replaced keyboard toolbar samples with more detailed, tested samples & clarified that these samples are iOS-specific.

Added note on newly-discovered (but not new) TextArea bug, TIMOB-6652.
a3c5d91
ayeung Merge pull request #987 from dizzymonkey/timob-6552-1_8_X
Timob 6552 (1_8_X) add in support for constants that are not literal values
71d6bb9
@billdawson billdawson Merge pull request #989 from arthurevans/timob-6307-1_8_X
Timob 6307 --merge into 1_8_X
b50d055
@billdawson billdawson Merge pull request #988 from arthurevans/timob-4760-1_8_X
TIMOB-4760: Link in Ti.UI to Ti.UI.Window.orientationModes is broken
5838415
Arthur Evans TIMOB-6656
Removed anchors that were causing problems on the web site.
5d03bfa
@billdawson billdawson Merge pull request #991 from arthurevans/timob-6656_1_8_X
TIMOB-6656 Removed anchors ... (1_8_X edition)
b234e96
Stephen Tramer Merge pull request #969 from srahim/timob-6575-18X
[TIMOB-6575] Replacing the way we included icons for the app
3f1de9f
@cb1kenobi cb1kenobi Merging MobileWeb master changes into 1_8_X
[TIMOB-6398] [TIMOB-6388] [TIMOB-6587]
89e8e55
Joshua Roesslein [TIMOB-6538] Expose DebugBreak() to debugger. 88749ec
ayeung Merge pull request #993 from joshthecoder/timob-6538-1_8_X
Merge TIMOB-6538 into 1_8_X
c632d54
@donthorp donthorp Merge pull request #992 from cb1kenobi/mobileweb-1_8_X
[TIMOB-6398] [TIMOB-6388] [TIMOB-6587] prop(), copyright, analytics popups
f093021
@sptramer sptramer [TIMOB-6660] Rename variable in iteration loop to not reassign to an …
…earlier var.
939a51e
@vishalduggal vishalduggal Merge pull request #994 from sptramer/timob-6660-18X
[TIMOB-6660] Rename variable in iteration loop to resolve build problems
37fd911
Allen Yeung TIMOB-6665: Android: Default max event listeners is set to 10 dbf33ec
Commits on Dec 15, 2011
Opie Cyrus Merge pull request #1000 from ayeung/timob-6665-1_8_X
TIMOB-6665-1_8_X: Android: Default max event listeners is set to 10
ebe0b98
@dizzymonkey dizzymonkey TIMOB-6683 add support for event listeners on the external module wra…
…ppers
6b28769
@dizzymonkey dizzymonkey TIMOB-6683 fix for fireEventListener vs fireEvent 5c35e02
@dizzymonkey dizzymonkey TIMOB-6683 removing extra new line based on PR feedback 6be4a5d
@donthorp donthorp Merge pull request #1007 from dizzymonkey/timob-6683-1_8_X
[TIMOB-6683] for 1_8_X
21968ea
Arthur Evans TIMOB-3271
Added createable: false to avoid generating the bogus create method.
Also added a creation only "url" property as a cue to how this is used,
edited for style & added a few notes to make it clearer how this is used.
Will need to revisit this later with more info & sample code, but this should
fix the immediate problem.
3c8a5b4
Arthur Evans TIMOB-3271
Updated to describe the current state of background services.
804649d
Arthur Evans TIMOB-3271
Updated to clarify some issues & address comments.

And look! New 4th-level headings. Because I CAN.
beeca2f
@BlainHamon BlainHamon TIMOB-6688 Do not convert pure-JS modules to proxies, but wrapper the…
…m, to avoid TIMOB-2392.
34d406c
@billdawson billdawson Merge pull request #1010 from arthurevans/timob-3271-1_8_X
[TIMOB-3271] Correct Ti.App.iOS.BackgroundService doc
e6517e7
@dizzymonkey dizzymonkey TIMOB-6684 move the extend method we currently override on the Object…
… to the kroll namespace so it does not conflict with frameworks that check if extend is udnefined
d4ef5ee
@BlainHamon BlainHamon TIMOB-6668 Addendum: The C++ exception throws should actually be Obj-…
…C exception throws for proper processing.
8ccad10
@BlainHamon BlainHamon TIMOB-6688: The C++ exception throws should actually be Obj-C excepti…
…on throws for proper processing.
2f071f3
@BlainHamon BlainHamon Merge remote-tracking branch 'origin/timob-6688_1_8_X' into timob-668…
…8_1_8_X
3cefd79
@sptramer sptramer [TIMOB-6457] - Exception message processing now returns an appropriat…
…e error message even if the source isn't available

- Change C++-style 'throw' to Obj-C style '@throw'
781dc20
Commits on Dec 16, 2011
@vishalduggal vishalduggal Merge pull request #1014 from sptramer/timob-6457-18X
[TIMOB-6457][1_8_X] Fix bad errors/crash in require() [and maybe callbacks, too]
c44f563
@BlainHamon BlainHamon Merge branch '1_8_X' into timob-6688_1_8_X
Conflicts:
	iphone/Classes/KrollContext.mm
0e4a432
@billdawson billdawson TIMOB-6692 When scaling images, make sure a user-specified height or …
…width is properly taken into account.
810d46e
ayeung Merge pull request #1013 from dizzymonkey/timob-6684-1_8_X
Timob 6684 1 8 x
8054739
@BlainHamon BlainHamon TIMOB-6688 Refactor KrollFunction to better reflect its expanded role…
… as KrollWrapper
3264ada
Arthur Evans TIMOB-4828
Moved descriptions of string format methods into the Global/String module.
Fleshed out descriptions a bit.
7024d6a
Arthur Evans TIMOB-4828
Clarified where the locale setting comes from.
20ee4de
@joshthecoder joshthecoder Merge pull request #1016 from billdawson/timob-6692-1.8.X
TIMOB-6692 (1.8.X) Android: Make sure a user-specified height/width is properly taken into account when scaling images
a36b702
Stephen Tramer Merge pull request #1011 from BlainHamon/timob-6688_1_8_X
TIMOB-6688 Do not convert pure-JS modules to proxies, but wrapper them, to avoid TIMOB-2392."
1a1d34c
Allen Yeung TIMOB-6694: Android: Fastdev: v8/rhino: Adding an external js file an…
…d restarting with fastdev running does not pick up the new file
8413412
Joshua Roesslein [TIMOB-6713] Cancel all timers on runtime thread on destory. 30b6f5a
@hieupham007 hieupham007 timob-6526: refactored TiUIImageView start and stop no longer create …
…new runnable.

Also fixed a bug where there's a delay when hit stop on animation.
3b61624
@hieupham007 hieupham007 timob-6526: code cleanup 7259a27
@hieupham007 hieupham007 timob-6526: small optimization d2856de
Allen Yeung Remove empty line 12abb3f
@billdawson billdawson TIMOB-6714 Check for resource drawables (which includes fastdev check…
…) when loading drawable
6ee13dc
@joshthecoder joshthecoder Merge pull request #1024 from ayeung/timob-6694-1_8_X
Timob 6694:1_8_X: Android: Fastdev: v8/rhino: Adding an external js file and r...
fb72d9f
ayeung Merge pull request #1029 from billdawson/timob-6714-1.8.X
TIMOB-6714 (1.8.X) Android: Check for resource drawables (which includes fastdev check) w...
1bb2c44
@marshall marshall Merge pull request #1026 from joshthecoder/timob-6713-1_8_X
Merge TIMOB-6713 into 1_8_X
e51a248
@marshall marshall define all constants on the proxy's prototype template
instead of the instance template, so constants are available
for proxy instances. TIMOB-6686
918bc0d
Joshua Roesslein [TIMOB-6693] Silence some of the debugger logging. d9781dc
@marshall marshall Merge pull request #1031 from joshthecoder/timob-6693-1_8_X
Merge TIMOB-6693 into 1_8_X
e84e280
@joshthecoder joshthecoder Merge pull request #1030 from marshall/timob-6686-1_8_X
TIMOB-6686 (1_8_X): Android: V8: Constants on Proxy instances aren't working
f67db14
@hieupham007 hieupham007 timob-6526: delete extra logs. 4633833
@marshall marshall Merge pull request #1027 from hieupham007/timob-6526-1_8_X
Timob 6526 1 8 x
61086c9
ayeung Merge pull request #1021 from arthurevans/timob-4828-1_8_X
[TIMOB-4828] String.format* docs
d657bbc
@dizzymonkey dizzymonkey TIMOB-6707 fix to support proxy types in a external module that are n…
…ot exposed via create methods
107a46d
@joshthecoder joshthecoder Merge pull request #1035 from dizzymonkey/timob-6707-1_8_X
Timob 6707 1 8 x
8f41ec2
@billdawson billdawson TIMOB-6415 Re-introduce alternative (non-jsca) JSON documentation at …
…community's request (with some enhancements). Also make a scons option to not generate JSCA at the end of the build, since it's painful and slow. Still generates it by default, but add build_jsca=0 to your scons command line to suppress.
c81faac
ayeung Merge pull request #1040 from billdawson/timob-6415-1.8.X
TIMOB-6415 (1.8.X) APIDOC: Re-introduce alternative (non-jsca) JSON documentation at …
c903964
Commits on Dec 18, 2011
@sptramer sptramer [TIMOB-6741] - Correctly handle functions with 'Q' signature (ull)
- Follow symbolic links correctly when checking file size
d16f215
@sptramer sptramer [TIMOB-6667] Support saving raw video data to the camera roll. 4feb74e
@vishalduggal vishalduggal Merge pull request #1043 from sptramer/timob-6741-18X
[TIMOB-6741] Titanium.Filesystem.File.size support
9e7fd6c
@BlainHamon BlainHamon Merge pull request #1045 from sptramer/timob-6667-18X
[TIMOB-6667] Support saving raw video data to the camera roll.
22868a1
Commits on Dec 19, 2011
@sptramer sptramer [TIMOB-6748][1_8_X] Ensure that Ti.Filesystem.File is compiled in whe…
…n using Ti.Database.
90e5adb
@sptramer sptramer [TIMOB-6748] Ensure that Ti.Filesystem.File is compiled in when using…
… Ti.Database.
0e21e1b
@sptramer sptramer Merge remote-tracking branch 'origin/timob-6748-18X' into timob-6748-18X 7bf97b3
@srahim srahim Merge pull request #1047 from sptramer/timob-6748-18X
[TIMOB-6748][1_8_X] Building with Ti.Database triggers inclusion of Ti.Filesystem.File
4f57463
@cb1kenobi cb1kenobi [TIMOB-6739] Forced debug to true to prevent production builds. 58aa316
@donthorp donthorp Merge pull request #1048 from cb1kenobi/timob-6739-1_8_X
[TIMOB-6739] Forced debug to true to prevent production builds.
864d538
@dawsontoth dawsontoth [TIMOB-6749] Use Markdown2 with Legacy Support
Gracefully fallback to markdown from markdown2, but prefer markdown2 when it is available.
b6cc057
@vishalduggal vishalduggal [TIMOB-6756] Ensure proper paths for database migration 89175ef
@marshall marshall Merge pull request #1052 from dawsontoth/TIMOB-6749-1_8_x
Timob 6749 1 8 x
6981667
Commits on Dec 20, 2011
Allen Yeung TIMOB-5393: Tooling: Win 7 or XP space in path to SD card causes Andr…
…oid emulator r13 fail to launch from Studio
91230d6
@srahim srahim Merge pull request #1057 from vishalduggal/timob-6756-18X
[TIMOB-6756] (1_8_X) Ensure proper paths for database migration
8e3e43d
@donthorp donthorp Merge pull request #1067 from ayeung/timob-5393-1_8_X
TIMOB-5393 1 8 x: Tooling: Win 7 or XP space in path to SD card causes Android emulator r13 fail to launch from Studio
a28ca76
@dawsontoth dawsontoth [TIMOB-6789] Add callSync with Return Value
Add two methods named "callSync" with different arguments that return an Object. This will allow modules to get the return value from KrollFunctions again.
da72d31
Commits on Dec 21, 2011
@BlainHamon BlainHamon TIMOB-6808 KrollEval was being overreleased during loading. 381cffc
@BlainHamon BlainHamon TIMOB-6808 Have the KrollBridge unprotect JS modules when removing pr…
…oxies.
7199c7a
Stephen Tramer Merge pull request #1076 from BlainHamon/timob-6808_1_8_X
TIMOB-6808 KrollEval was being overreleased during loading.
f3575f8
Commits on Dec 22, 2011
Arthur Evans Updates to Release Notes for 1.8.0.1.GA e4b8e73
Arthur Evans Fixed typos and broken links noted by nhuynh. Also reformatted intro …
…sentence to make it more readable, per comments by same.
7f133fa
Allen Yeung TIMOB-5393: remove unncessary wrapping of quotes 76a3c2d
Arthur Evans Added TIMOB-5393 as a fixed issue. 483b5c2
@marshall marshall Merge pull request #1084 from ayeung/timob-5393-1_8_X
Timob 5393 1 8 x
dad31eb
@marshall marshall Merge pull request #1082 from arthurevans/timob-6630-1_8_X
[TIMOB-6630]  Updates to Release Notes for 1.8.0.1.GA -- merge into 1_8_X
4a6e1d8
@dawsontoth dawsontoth [TIMOB-6789] callSync No Longer Exposed
As per discussion with Opie.
1829466
@marshall marshall correctly associate tab activities with their window proxy
after the activity is created, restoring android event listeners
for tab windows. TIMOB-6844
b5663ce
ayeung Merge pull request #1090 from marshall/timob-6844-1_8_X
TIMOB-6844 (1_8_X): Android: UI - hardware button events not fired for heavyweight windows in tabGroups
fbdc96f
Commits on Dec 28, 2011
@dawsontoth dawsontoth [TIMOB-6789] Don't Delete Reference 85f8b00
Commits on Jan 04, 2012
@marshall marshall Merge pull request #1073 from dawsontoth/TIMOB-6789-1_8_X
[TIMOB-6789] Add callSync with Return Value for 1_8_X
ffbee61
Commits on Jan 16, 2012
@sptramer sptramer [TIMOB-6810] iOS 5 changed the way we have to report header/footer si…
…zes for nil views/titles; ensure that for search the size is 0.0.
736a720
@vishalduggal vishalduggal [TIMOB-5289] honor searchHidden property on data reload 36670a7
Commits on Jan 17, 2012
Opie Cyrus Merge pull request #1183 from sptramer/timob-6810-18X
[TIMOB-6810][1_8_X] Correctly report table row header/footer sizes.
0bdadac
Stephen Tramer Merge pull request #1184 from sptramer/timob-5289-18X
[TIMOB-5289][1_8_X] honor searchHidden property on data reload
2c4089c
Commits on Jan 19, 2012
@vishalduggal vishalduggal [TIMOB-7273]Hide search screen only if searchHidden is set f62769f
@vishalduggal vishalduggal Hide search without animation fa74f53
@srahim srahim Merge pull request #1214 from vishalduggal/timob-7273-18X
[TIMOB-7273] 1_8_X Hide search screen only if searchHidden is set
05d4b76
Commits on Jan 23, 2012
@marshall marshall Merge branch 'master' into 1_8_X
Conflicts:
	android/modules/ui/src/js/window.js
	android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/KrollGlobal.java
	android/runtime/rhino/src/java/org/appcelerator/kroll/runtime/rhino/RhinoFunction.java
	android/runtime/v8/src/java/org/appcelerator/kroll/runtime/v8/V8Function.java
	android/runtime/v8/src/java/org/appcelerator/kroll/runtime/v8/V8Runtime.java
	apidoc/Titanium/CHANGELOG/1.8.0.1.mdoc
	apidoc/Titanium/UI/TableView.yml
	apidoc/Titanium/UI/TextField.yml
	apidoc/Titanium/UI/UI.yml
	apidoc/Titanium/UI/View.yml
	build/titanium_version.py
	drillbit/tests/filesystem/filesystem.js
	iphone/Classes/TiNetworkHTTPClientProxy.m
	iphone/Classes/TiNetworkHTTPClientResultProxy.m
	iphone/Classes/TiUtils.h
	iphone/Classes/TiUtils.m
	mobileweb/src/Ti.API/api.js
	mobileweb/src/Ti.Accelerometer/accelerometer.js
	mobileweb/src/Ti.Analytics/analytics.js
	mobileweb/src/Ti.Android/activity.js
	mobileweb/src/Ti.Android/android.js
	mobileweb/src/Ti.Android/calendar.alert.js
	mobileweb/src/Ti.Android/calendar.calendar.js
	mobileweb/src/Ti.Android/calendar.event.js
	mobileweb/src/Ti.Android/calendar.js
	mobileweb/src/Ti.Android/calendar.reminder.js
	mobileweb/src/Ti.Android/intent.js
	mobileweb/src/Ti.Android/menu.js
	mobileweb/src/Ti.Android/menuitem.js
	mobileweb/src/Ti.Android/notification.js
	mobileweb/src/Ti.Android/notificationmanager.js
	mobileweb/src/Ti.Android/pendingintent.js
	mobileweb/src/Ti.Android/r.js
	mobileweb/src/Ti.Android/service.js
	mobileweb/src/Ti.App/android.r.js
	mobileweb/src/Ti.App/app.js
	mobileweb/src/Ti.App/ios.js
	mobileweb/src/Ti.App/properties.js
	mobileweb/src/Ti.Blob/blob.js
	mobileweb/src/Ti.Contacts/contacts.js
	mobileweb/src/Ti.Contacts/group.js
	mobileweb/src/Ti.Contacts/person.js
	mobileweb/src/Ti.Database/db.js
	mobileweb/src/Ti.Database/resultset.js
	mobileweb/src/Ti.Facebook/facebook.js
	mobileweb/src/Ti.Facebook/loginbutton.js
	mobileweb/src/Ti.Filesystem/file.js
	mobileweb/src/Ti.Filesystem/filesystem.js
	mobileweb/src/Ti.Geolocation/geolocation.js
	mobileweb/src/Ti.Locale/locale.js
	mobileweb/src/Ti.Map/annotation.js
	mobileweb/src/Ti.Map/map.js
	mobileweb/src/Ti.Map/mapview.js
	mobileweb/src/Ti.Media/audioplayer.js
	mobileweb/src/Ti.Media/audiorecorder.js
	mobileweb/src/Ti.Media/item.js
	mobileweb/src/Ti.Media/media.js
	mobileweb/src/Ti.Media/musicplayer.js
	mobileweb/src/Ti.Media/sound.js
	mobileweb/src/Ti.Media/videoplayer.js
	mobileweb/src/Ti.Network/bonjourbrowser.js
	mobileweb/src/Ti.Network/bonjourservice.js
	mobileweb/src/Ti.Network/httpclient.js
	mobileweb/src/Ti.Network/network.js
	mobileweb/src/Ti.Network/tcpsocket.js
	mobileweb/src/Ti.Platform/displaycaps.js
	mobileweb/src/Ti.Platform/platform.js
	mobileweb/src/Ti.UI/2dmatrix.js
	mobileweb/src/Ti.UI/3dmatrix.js
	mobileweb/src/Ti.UI/activityindicator.js
	mobileweb/src/Ti.UI/alertdialog.js
	mobileweb/src/Ti.UI/android.js
	mobileweb/src/Ti.UI/animation.js
	mobileweb/src/Ti.UI/button.js
	mobileweb/src/Ti.UI/buttonbar.js
	mobileweb/src/Ti.UI/capitalization.js
	mobileweb/src/Ti.UI/clipboard.js
	mobileweb/src/Ti.UI/coverflowview.js
	mobileweb/src/Ti.UI/dashboarditem.js
	mobileweb/src/Ti.UI/dashboardview.js
	mobileweb/src/Ti.UI/emaildialog.js
	mobileweb/src/Ti.UI/imageview.js
	mobileweb/src/Ti.UI/ios.adview.js
	mobileweb/src/Ti.UI/ios.js
	mobileweb/src/Ti.UI/ipad.js
	mobileweb/src/Ti.UI/ipad.popover.js
	mobileweb/src/Ti.UI/ipad.splitwindow.js
	mobileweb/src/Ti.UI/iphone.activityindicatorstyle.js
	mobileweb/src/Ti.UI/iphone.animationstyle.js
	mobileweb/src/Ti.UI/iphone.js
	mobileweb/src/Ti.UI/iphone.navigationgroup.js
	mobileweb/src/Ti.UI/iphone.progressbarstyle.js
	mobileweb/src/Ti.UI/iphone.rowanimationstyle.js
	mobileweb/src/Ti.UI/iphone.scrollindicatorstyle.js
	mobileweb/src/Ti.UI/iphone.statusbar.js
	mobileweb/src/Ti.UI/iphone.systembutton.js
	mobileweb/src/Ti.UI/iphone.systembuttonstyle.js
	mobileweb/src/Ti.UI/iphone.systemicon.js
	mobileweb/src/Ti.UI/iphone.tableviewcellselectionstyle.js
	mobileweb/src/Ti.UI/iphone.tableviewscrollposition.js
	mobileweb/src/Ti.UI/iphone.tableviewseparatorstyle.js
	mobileweb/src/Ti.UI/iphone.tableviewstyle.js
	mobileweb/src/Ti.UI/label.js
	mobileweb/src/Ti.UI/optiondialog.js
	mobileweb/src/Ti.UI/picker.js
	mobileweb/src/Ti.UI/pickercolumn.js
	mobileweb/src/Ti.UI/pickerrow.js
	mobileweb/src/Ti.UI/progressbar.js
	mobileweb/src/Ti.UI/scrollableview.js
	mobileweb/src/Ti.UI/scrollview.js
	mobileweb/src/Ti.UI/searchbar.js
	mobileweb/src/Ti.UI/slider.js
	mobileweb/src/Ti.UI/switch.js
	mobileweb/src/Ti.UI/tab.js
	mobileweb/src/Ti.UI/tabbedbar.js
	mobileweb/src/Ti.UI/tabgroup.js
	mobileweb/src/Ti.UI/tableview.css
	mobileweb/src/Ti.UI/tableview.js
	mobileweb/src/Ti.UI/tableviewrow.js
	mobileweb/src/Ti.UI/tableviewsection.js
	mobileweb/src/Ti.UI/textarea.js
	mobileweb/src/Ti.UI/textfield.js
	mobileweb/src/Ti.UI/toolbar.js
	mobileweb/src/Ti.UI/ui.js
	mobileweb/src/Ti.UI/view.js
	mobileweb/src/Ti.UI/webview.js
	mobileweb/src/Ti.UI/window.js
	mobileweb/src/Ti.Utils/utils.js
	mobileweb/src/Ti.XML/xml.js
	mobileweb/src/Ti.Yahoo/yahoo.js
	mobileweb/src/Ti/Gesture.js
	mobileweb/src/Ti/ti.js
	mobileweb/src/domview.js
	mobileweb/src/include.js
	mobileweb/src/loader.js
	mobileweb/src/positionable.js
	mobileweb/src/screen.js
	mobileweb/src/styleable.js
	mobileweb/src/titanium.js
	mobileweb/src/touchable.js
	support/iphone/compiler.py
	support/mobileweb/compiler.py
7f46286
@dizzymonkey dizzymonkey TIMOB-7335 cherry pick fix for handling JS error inside V8Function ac5eedf
Commits on Jan 24, 2012
ayeung Merge pull request #1235 from dizzymonkey/timob-7335-1_8_X
Timob 7335 1 8 x
637ee19
@hieupham007 hieupham007 timob-6809b: revert changes fda28e8
@hieupham007 hieupham007 timob-6809b: undo changes to fix compatibility issue 91c2020
@hieupham007 hieupham007 timob-6809b: fix attempt 1 24d0347
@hieupham007 hieupham007 timob-6809: add a null check before casting and calling TypeConverter. b64d8a0
@hieupham007 hieupham007 timob-6809: code clean up. 17fd000
ayeung Merge pull request #1245 from hieupham007/timob-6809-1_8_X
Timob 6809 1 8 x
5283996
Stephen Tramer [TIMOB-7345][TIMOB-7354] Notify delegates of a value change when requ…
…ested, even if the value didn't really 'change'. Important for NSArray & co.
b6e7398
Stephen Tramer [TIMOB-7345][TIMOB-7354] Fix boolean expression. 6d86f74
Commits on Jan 25, 2012
@BlainHamon BlainHamon Merge pull request #1243 from sptramer/timob-7345-1_8_X
[TIMOB-7345][TIMOB-7354][1_8_X] Notify delegates of value change
5b6a3ed
@vishalduggal vishalduggal [TIMOB-7346] Ensure activeTab is set correctly on initialize 7e4de06
@BlainHamon BlainHamon Merge pull request #1249 from vishalduggal/timob-7346-18X
[TIMOB-7346] 1_8_X Ensure activeTab is set correctly on initialize
1bc96cc
@dizzymonkey dizzymonkey TIMOB-7395 update filesystem system check in drillbit for mimetype to…
… include platform check
959f6f5
@vishalduggal vishalduggal [TIMOB-7174]Terminate the ios-sim process in kill simulator 43c2a0d
@vishalduggal vishalduggal flush will hang if stream is closed c223e10
@mstepanov mstepanov Merge pull request #1255 from vishalduggal/timob-7174-18X
[TIMOB-7174] 1_8_X Terminate the ios-sim process in kill simulator
0d9c7bb
@pingwang2011 pingwang2011 timob-7235: setTime() must be after prepare() 89b1a92
Stephen Tramer [TIMOB-7362] Store 'nil' as an NSNull object in the props dict; this …
…appears to be the classical behavior.
d3afda8
Opie Cyrus Merge pull request #1256 from pingwang2011/timob-7235_1_8_X
Timob 7235 1_8_X: Android: Media player crashed the application
7b758eb
Opie Cyrus Merge pull request #1254 from dizzymonkey/timob-7395-1_8_X
Timob 7395 1 8 x
1e65b9d
@vishalduggal vishalduggal Merge pull request #1258 from sptramer/timob-7362-18X
[TIMOB-7362][1_8_X] Store 'nil' as an NSNull object in the props dict
a425f3d
@hieupham007 hieupham007 timob-1827: delete extra fireEvent on "close" 3bafe6a
@vishalduggal vishalduggal [TIMOB-7363] Update barImage immediately if it is main thread 97ff4c9
@srahim srahim Merge pull request #1261 from vishalduggal/timob-7363-18X
[TIMOB-7363] 1_8_X Update barImage immediately if it is main thread
1310b22
Opie Cyrus Merge pull request #1260 from hieupham007/timob-1827-1_8_X
Timob 1827 1 8 x
c4beb7c
@vishalduggal vishalduggal [TIMOB-7398] Conditional resignation as firstResponder f22f01c
Commits on Jan 26, 2012
@billdawson billdawson TIMOB-6918 Don't generate getter/setter documentation for pseudo types. 11199a8
@billdawson billdawson TIMOB-6918 Update copyright header ca36497
@vishalduggal vishalduggal [TIMOB-7427] Wait for kill command to finish a74abad
@srahim srahim Merge pull request #1275 from vishalduggal/timob-7427-18X
[TIMOB-7427] 1_8_X Wait for kill command to finish
7ad6664
Commits on Jan 27, 2012
Stephen Tramer Merge pull request #1273 from billdawson/timob-6918-1.8.X
TIMOB-6918 (1.8.X) Don't generate getters/setters documentation for pseudo-types
cd8e1cb
@mstepanov mstepanov [TIMOB-7425] iOS: buttons and text disappearing from navigation bar 7702d1c
@vishalduggal vishalduggal [TIMOB-6368] Use TiUtils to convert to string value ba29fae
Stephen Tramer Merge pull request #1282 from vishalduggal/timob-6368-18X
[TIMOB-6368] 1_8_X Use TiUtils to convert to string value
c4c18c4
Stephen Tramer [TIMOB-7436] Safely copy custom fonts when building. 117f2c8
@mstepanov mstepanov [TIMOB-7425] use respondsToSelector instead of iOS version check 7c0288d
Stephen Tramer Merge pull request #1278 from mstepanov/timob-7425
(1_8_X) [TIMOB-7425] iOS: buttons and text disappearing from navigation bar
009750b
@mstepanov mstepanov Merge pull request #1285 from sptramer/timob-7436-18X
[TIMOB-7436][1_8_X] Safely copy custom fonts when building.
56f7e9d
@billdawson billdawson TIMOB-7169 Support isInternal at type level in JSCA and set it to tru…
…e for proxies with no class properties.
e1ed7d9
@billdawson billdawson TIMOB-7169 typo correction 459f235
Commits on Jan 28, 2012
Stephen Tramer Merge pull request #1290 from billdawson/timob-7169-1.8.X
TIMOB-7169 (1.8.X) Support isInternal JSCA type and set it to true for proxies that have no class properties
36194d6
@vishalduggal vishalduggal [TIMOB-7455] Revert use of setBackgroundImage:forBarMetrics: method dcaf183
@vishalduggal vishalduggal Remove use of undocumented animated property b934090
@vishalduggal vishalduggal Reinstate undocumented animated property. But set default to NO 1783971
@srahim srahim Merge pull request #1293 from vishalduggal/timob-7455-18X
[TIMOB-7455] 1_8_X Revert use of setBackgroundImage:forBarMetrics: method
a24502a
Commits on Jan 31, 2012
Arthur Evans TIMOB-7369 1.8.1 Release Notes, first draft. 95c0fe5
Arthur Evans TIMOB-7369. Committing current working version. 52709d3
Arthur Evans TIMOB-7369 Updated release notes for 1.8.1. e66a8d0
Arthur Evans TIMOB-7369 In which the writer cannot leave his original wording uned…
…ited.
a13d7e8
Arthur Evans TIMOB-7369 Edited bug list. 1f8edbb
@marshall marshall bump 1_8_X base version to 1.8.2 8bf3199
Commits on Feb 02, 2012
@srahim srahim [TIMOB-7347] Implementing getter for ContentOffset, since dynaprops t…
…yring to remember a TiPoint led to error messages]
5c19599
@srahim srahim [TIMOB-7347] updates 22e045a
@srahim srahim [TIMOB-7347] Needs to wait till its done b90f227
@srahim srahim [TIMOB-7347] fixing up logic 86ed63c
@vishalduggal vishalduggal Merge pull request #1328 from sptramer/timob-7347-18X
[TIMOB-7347][1_8_X] Avoid Kroll errors on dynprops
cacde6b
Commits on Feb 15, 2012
@marshall marshall Merge branch 'master' into 1_8_X
Conflicts:
	android/kroll-apt/src/java/org/appcelerator/kroll/annotations/generator/ProxyBinding.fm
	android/runtime/v8/src/native/V8Function.cpp
	apidoc/Titanium/UI/TableView.yml
	iphone/Classes/TiUITableView.m
	iphone/Classes/TiUIWindowProxy.m
	mobileweb/src/loader.js
	mobileweb/src/styleable.js
	mobileweb/src/touchable.js
43d708c
@BlainHamon BlainHamon TIMOB-7646 Ensure navigation group does not dealloc during late closing. b5c0996
@BlainHamon BlainHamon TIMOB-7638 Ensure barImage stays at the right index. 5bc7d44
@mstepanov mstepanov Merge pull request #1430 from BlainHamon/timob-7638_1_8_X
Timob 7638 For 1.8.x: Ensure barImage stays at the right index.
4e0be23
@marshall marshall expose onCreateWindow to WebView to allow custom logic when
a WebView wants to create a new window based on a non-existent href
target. TIMOB-7589
f4187f4
@vishalduggal vishalduggal Merge pull request #1432 from BlainHamon/timob-7646_1_8_X
TIMOB-7646 Ensure navigation group does not dealloc during late closing.
d87ffd5
Commits on Feb 16, 2012
Arthur Evans [TIDOC-388] Fix validation error in App.yml. 808ee5d
Arthur Evans [TIDOC-387][TIDOC-81] Fixed Tab.close doc, clarified Tab.close usage,…
… and fixed typo.
ae58134
Arthur Evans [TIDOC-387][TIDOC-81] Updated to address comments & clarify which not…
…es apply to which

platforms.
da3870a
Arthur Evans [TIDOC-387][TIDOC-81] Further clarified mobile web behavior. 5d1a56d
Arthur Evans [TIDOC-387][TIDOC-81] Updated to address Blain's comment. 888be95
Opie Cyrus Merge pull request #1436 from marshall/timob-7589-1_8_X
TIMOB-7589 (1_8_X): Android: Allow custom new windows for WebViews
f7884ce
Stephen Tramer Merge pull request #1441 from arthurevans/tidoc-387_1_8_X
[TIDOC-387] for 1_8_X: Tab.close clarifications and App.yml validation fix
eb347a5
Joshua Roesslein Convert Window paths to Unix style. 629cfa7
Opie Cyrus Merge pull request #1447 from joshthecoder/timob-7677-1_8_X
Cherry pick TIMOB-7677 into 1_8_X
569e4da
Stephen Tramer [TIMOB-7692] Use __block ref to self during dealloc. 069d601
Stephen Tramer [TIMOB-7692] Fix for protected property setting to use __block self 2a3094e
@mstepanov mstepanov Merge pull request #1449 from sptramer/timob-7692-18X
[TIMOB-7692] Use __block ref to self during dealloc.
b701052
Commits on Feb 17, 2012
@billdawson billdawson TIMOB-7694 Null check on table view's native listView before accessing. 59e883e
Joshua Roesslein Assertion macro that logs failures with source location. b1e6523
Joshua Roesslein Re-attach java proxy when it is requested.
If the Java proxy is "detached" we will re-attach it
from the weak reference we kept.
f5e229c
Joshua Roesslein Abort program when an assertion failure occurs. 08ccd04
Opie Cyrus Merge pull request #1460 from joshthecoder/timob-7676-1_8_X
Cherry pick TIMOB_7676 into 1_8_X
a47193c
@marshall marshall Merge pull request #1453 from billdawson/timob-7694-1.8.X
Timob 7694 1.8.x Check for listview null
442eea2
Commits on Feb 21, 2012
Joshua Roesslein Use WrappedContext::Unwrap to get a valid pointer. 568cba3
@marshall marshall Merge pull request #1472 from joshthecoder/timob-7712-1_8_X
[TIMOB-7712] Cherry pick into 1_8_X.
8df2503
Commits on Feb 22, 2012
@mstepanov mstepanov [TIMOB-7644][TIMOB-7152] iOS: Memory is not being released when a tab…
… is removed from tabGroup
86faec4
@mstepanov mstepanov clean up a statement which wasn't supposed to go to previous commit a7d205e
@mstepanov mstepanov [TIMOB-7714] iOS: Window freezing after navigating back to the top vi…
…ew within a tab
a66f4c0
@mstepanov mstepanov [TIMOB-7152] nil tagGroup on TabProxy only when closing the last(curr…
…ent) window
4493e85
Commits on Feb 23, 2012
Stephen Tramer Merge pull request #1474 from mstepanov/timob_7644_18x
(1_8_X) [TIMOB-7644][TIMOB-7152] iOS: Memory is not being released when a tab is removed from tabGroup
018cb8e
@BlainHamon BlainHamon Trying to see if we can easily disable batch processing. 4230f0d
@BlainHamon BlainHamon TIMOB-7681 re-disable batch processing. 2b8b354
@mstepanov mstepanov Merge pull request #1488 from BlainHamon/timob-7681_1_8_X
[TIMOB-7681] disable batch processing.
5b180fc
Commits on Feb 24, 2012
@mstepanov mstepanov [TIMOB-7791] iOS : fix tabGroup close issue with previously activated…
… tabs
87cff45
@mstepanov mstepanov split TabProxy::close method to public and private API parts 294e663
@mstepanov mstepanov remove unused variable 4b63089
@BlainHamon BlainHamon Revert "[TIMOB-7344] iOS: apply percentage constraints correctly for …
…reference(parent) size, not sandbox size"

This reverts commit a9e28c0.

Conflicts:

	iphone/Classes/TiViewProxy.m
9951507
@srahim srahim Merge pull request #1493 from mstepanov/timob-7791_18x
(1_8_X) [TIMOB-7791] iOS : TabGroups - Tab group icon and content disappear after running KS > Tab Groups > Close/Animate Tab Group
add338c
Stephen Tramer Merge pull request #1495 from BlainHamon/timob-7727_1_8_X
Timob 7727 1 8 x Revert [TIMOB-7344]
59b3a90
Commits on Feb 28, 2012
@pingwang2011 pingwang2011 timob-7840_1_8_X: modified KS 47b6164
@pingwang2011 pingwang2011 timob-7840_1_8_X: setting property instead of calling method 91dc3e5
Commits on Feb 29, 2012
@marshall marshall Merge pull request #1534 from pingwang2011/timob-7840_1_8_X
Timob 7840 1 8 x : Blocker: Android: WebView.js: Runitme Error on launch: Uncaught TypeError: Object [object WebView] has no method 'setHtml'
b1c25f7
Arthur Evans [TIMOB-7755] Check in 1.8.2 Release Notes. ea654fc
@marshall marshall Merge pull request #1540 from arthurevans/timob-7755_1_8_X
[TIMOB-7755] Check in 1.8.2 Release Notes--1.8.X branch
28f9b09
Commits on Mar 19, 2012
Ben Collier Fixes 1.8.2 window flicker bug. fd1e3aa
Ben Collier Cancel-able activity indicators
Passing cancelable: true to the activity indicator allows the back
button or tapping the background to close the indicator. The close
event is also fired when cancelled.
7240ed9