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-15479] Window Hybrid Merge #5333

Merged
merged 66 commits into from
Feb 6, 2014
Merged

[TIMOB-15479] Window Hybrid Merge #5333

merged 66 commits into from
Feb 6, 2014

Conversation

cb1kenobi
Copy link
Contributor

No description provided.

nebrius and others added 30 commits October 15, 2013 17:29
@nebrius
[TIMOB-15480] First draft of the template is complete.
c16fe58
@nebrius
[TIMOB-15480] Fleshed out the first draft of the detection code and c…
4ca8ed3 
…li interface
@nebrius
[TIMOB-15480] Finished the packaging part of the CLI
399c8e9
@nebrius
[TIMOB-15480] Implemented building and running the app
68c8555
@nebrius
[TIMOB-15480] Code cleanup
bfef984
@nebrius
Merge branch 'master' of github.com:appcelerator/titanium_mobile into…
a7ee3bf 
… mw_windows_packaging
@nebrius
[TIMOB-15482] Implemented resource bridge and wired require() into it
c0bdf4c
@nebrius
[TIMOB-15482] Added support for Ti.include
126aed2
@nebrius
[TIMOB-15482] Implemented filesystem support
43f4f5f
@nebrius
[TIMOB-15482] Cleaned up some css and code.
db742c7
@nebrius
[TIMOB-15482] Fixed some the last set of bugs (for now I'm sure)
11dcd8d
@nebrius
[TIMOB-15482] Forgot to update include and text with a refactor
fd6341d
@nebrius
Merge pull request #4824 from bryan-m-hughes/timob-15482
f48787a 
Timob 15482 XHR Bridge implementation for WP8
@nebrius
Merge branch 'master' into timob-11492
2bd0d1a
@nebrius
[TIMOB-11492] Added support for pointer events
a677a9c
@nebrius
Merge branch 'master' into mw_windows_packaging
bcc1dda
@nebrius
Merge pull request #4831 from bryan-m-hughes/mw_windows_packaging
d477a95 
Merged master (it was a lot).
@nebrius
Merge pull request #4832 from bryan-m-hughes/timob-11492
e9933a2 
Timob 11492 Pointer Events support
@nebrius
Quick bug fix
7b78cfc
@nebrius
Merge pull request #4842 from bryan-m-hughes/mw_windows_packaging
e05dfda 
Quick bug fix
@nebrius
[TIMOB-15572] Fixed a bug with json being considered binary data
0ebd32b
@nebrius
[TIMOB-15572] Updated the build system to use project ids instead of …
f66a33c 
…names
@nebrius
[TIMOB-15572] Further fleshed out project naming
0b131c5
@nebrius
[TIMOB-15572] Made network loads in require more robust
d56f06a
@nebrius
[TIMOB-15572] Implemented the console bridge
ad67b37
@nebrius
[TIMOB-15572] Slight code cleanup
f99b684
@nebrius
[TIMOB-15572] Fixed a bug with url loading
080fdda
@nebrius
Merge pull request #4872 from bryan-m-hughes/timob-15572
8b6902e 
Timob 15572 Bug fixes
@nebrius
[TIMOB-15486] Finished the Visual Studio template
9b6cd03
@nebrius
Merge pull request #4878 from bryan-m-hughes/timob-15486
7f3ffc0 
[TIMOB-15486] Finished the Visual Studio template
nebrius and others added 26 commits October 31, 2013 17:37
@nebrius
[TIMOB-15522] Fixed some detection bugs.
51bd61b
@nebrius
Merge pull request #4897 from bryan-m-hughes/timob-15522
e21d7be 
Timob 15522 Info command
@nebrius
Merge branch 'master' into mw_windows_packaging
d9490b5
@nebrius
Merge pull request #4910 from bryan-m-hughes/mw_windows_packaging
2ce7a64 
Manual merge of master
@nebrius
Fixed a bug with template project names
9d94ecd
@nebrius
Merge pull request #4921 from bryan-m-hughes/mw_windows_packaging
1f85a2c 
Fixed a bug with template project names
@nebrius
[TIMOB-15673] Added initial support for VS2013
9bb6824
@nebrius
[TIMOB-15673] Implemented a fleshed out certificate system
6bc998b
@nebrius
[TIMOB-15673] Quick bug fix
b165ad5
@nebrius
[TIMOB-15673] Fleshed out some wording
222ee66
@nebrius
Merge pull request #4947 from bryan-m-hughes/timob-15673
e6cc3b5 
Timob 15673
@nebrius
Merge branch 'master' into mw_windows_packaging
253eac1
@nebrius
Merge pull request #4948 from bryan-m-hughes/mw_windows_packaging
eff1081 
Manual merge of master
@nebrius
[TIMOB-15696] Shimmed out support for alert()
819a2d6
@nebrius
Merge pull request #4951 from bryan-m-hughes/timob-15696
e546fd2 
[TIMOB-15696] Shimmed out support for alert()
@cb1kenobi
Merge branch 'master' into mw_windows_packaging
c032f10
@cb1kenobi
Added Mobile Web info command support for outputting the Windows Phon…
c93d6b2 
…e environment info.
@cb1kenobi
Merge pull request #4991 from cb1kenobi/mw_windows_packaging
db1a564 
Added Mobile Web info command support for outputting the Windows Phone environment info.
@cb1kenobi
Fixed bugs with project paths that contain spaces and fixed a bug wit…
272674e 
…h first time use and not yet having logged into the Microsoft developer account.
@cb1kenobi
Merge pull request #4998 from cb1kenobi/mw_windows_packaging
1dc3f8b 
Fixed bugs with project paths that contain spaces and fixed a bug with f...
@nebrius
[TIMOB-15758] Added initial prototype of reflection API
91b8e67
@nebrius
[TIMOB-15758] Fleshed out constructor args
373f36e
@nebrius
Merge pull request #5009 from bryan-m-hughes/timob-15758
b355113 
Added prototype reflection code
@cb1kenobi
[TIMOB-16348] Fixed bug where the devices structure is not being init…
9411a65 
…alized if no Visual Studio instances are found.
@cb1kenobi
Merge pull request #5326 from cb1kenobi/mw_windows_packaging
f5a2bb9 
[TIMOB-16348] Fixed bug where the devices structure is not being initali...
@cb1kenobi
Merge branch 'mw_windows_packaging' into timob-15479
656fbba 
Conflicts:
	mobileweb/cli/commands/_build.js
@cb1kenobi
Copy link
Contributor Author

Tested on Mac and Windows. Merging!

cb1kenobi added a commit that referenced this pull request Feb 6, 2014
@cb1kenobi
Merge pull request #5333 from cb1kenobi/timob-15479
855124d 
[TIMOB-15479] Window Hybrid Merge
@cb1kenobi cb1kenobi merged commit 855124d into tidev:master Feb 6, 2014
@cb1kenobi cb1kenobi deleted the timob-15479 branch February 6, 2014 19:46
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
2 participants
@cb1kenobi @nebrius