merge develop into develop-perf #655

Merged
merged 66 commits into from Oct 23, 2012

Projects

None yet

6 participants

@drewfish
Member

Conflicts:
docs/dev_guide/code_exs/binding_events.rst
examples/developer-guide/binding_events/mojits/PagerMojit/controller.server.js
examples/developer-guide/binding_events/mojits/PagerMojit/models/model.server.js
examples/developer-guide/configure_routing/mojits/RoutingMojit/controller.server.js
examples/developer-guide/device_assets/mojits/device/controller.server.js
examples/developer-guide/generating_urls/mojits/GenURLMojit/controller.server.js
examples/developer-guide/model_yql/mojits/flickr/controller.server.js
examples/developer-guide/model_yql/mojits/flickr/models/model.server.js
examples/developer-guide/multiple_mojits/mojits/BodyMojit/controller.server.js
examples/developer-guide/multiple_mojits/mojits/FooterMojit/controller.server.js
examples/developer-guide/multiple_mojits/mojits/FrameMojit/controller.server.js
examples/developer-guide/multiple_mojits/mojits/HeaderMojit/controller.server.js
examples/developer-guide/unittest_model_controller/mojits/flickr/controller.server.js
examples/developer-guide/unittest_model_controller/mojits/flickr/models/model.server.js
examples/developer-guide/using_configs/mojits/ContactUs/controller.server.js
examples/developer-guide/using_cookies/mojits/CookieMojit/controller.server.js
examples/developer-guide/using_parameters/mojits/QueryMojit/controller.server.js
examples/getting-started-guide/part2/basic_yql/mojits/Flickr/controller.server.js
examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js
examples/getting-started-guide/part3/intl-templates/mojits/Flickr/controller.server.js
examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js
examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/controller.common.js
examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/models/model.common.js
examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/controller.common.js
examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/controller.common.js
lib/app/archetypes/app/default/index.js
lib/app/archetypes/app/default/server.js
lib/app/archetypes/app/full/index.js
lib/app/archetypes/app/full/server.js
lib/app/archetypes/app/simple/server.js
lib/app/middleware/mojito-handler-static.js
lib/mojito.js
package.json

jlecomte and others added some commits Sep 25, 2012
@jlecomte jlecomte Added support for /robots.txt and fixed JSLint errors 09c6681
@jlecomte jlecomte Added support for crossdomain.xml file ebccc52
@isao isao include an empty options hash to when cli cmd received no args
show usage instead of exception for `mojito build`, maybe others
73a6dde
Joe Catera Changed the syntax for controllers to Y.namespace('mojito.controllers…
…')[NAME] for everything but examples/tutorial. I need to update the examples as well before changing the docs.
e4bb0ca
Joe Catera Fixed syntax for namespacing controllers/models in docs/examples. 74b3d8a
Joe Catera Fixing syntax issues for controller/model namespacing. 81c5ce5
Joe Catera Fixed merge conflict. b673043
Joe Catera Fixed model namespacing problem. f2e45ae
Joe Catera Merge pull request #589 from zhouyaoji/docs_fix_controller_syntax
[docs] Corrected the syntax for creating namespaces for models/controllers.
982ae53
Joe Catera Removed an unnecessary step in bundling packages, clarified the resou…
…rce types.
11379a5
Joe Catera Commenting out doc on log mutator functions as the feature does not p…
…resently work.
b539c71
Joe Catera Merge pull request #591 from zhouyaoji/docs_remove_log_mutator_funcs
Commenting out doc on log mutator functions as the feature does not pres...
285996f
@isao isao add callback() params to allow commands to display usage or exit c07690e
@isao isao rm usused params 8ffa567
@isao isao Merge pull request #600 from isao/cli
minor fixes to cli.js
9d7a669
@imalberto imalberto release 0.4.6 (based on 0.4.5-65-g9d7a669) 0730a07
@isao isao fix issue #525 `mojito test app|mojit` failed for archetype-code
Support for `mojito test` on client/binder code had been removed,
and binder unit test code would fail. This is now unsupported by
the mojito test runner. This change removes the unsupported
binder tests from the archetypes that `mojito create` uses.
111a714
Joe Catera Added func/unit test instructions. 77a8772
Joe Catera Merge pull request #615 from zhouyaoji/doc_run_unit-func_tests
[doc] Added func/unit test instructions.
25a5d07
Lichun Zhan fix issue #546 multiple jslint errors in developer-guide b548384
@isao isao Merge pull request #607 from isao/rm-bindertest-acrhetypes
fix issue #525 `mojito test app|mojit` failed for archetype-code

...by removing binder the test archetpe files
84931e8
lzhan Merge pull request #620 from lzhan/fixlinterr
fix issue #546 multiple jslint errors in developer-guide
fb635e5
Joe Catera Fixed a syntax issue for using run.js. 8e1e1c8
Joe Catera Merge pull request #621 from zhouyaoji/docs_unit-func_test_fix
[docs] Fixed a syntax issue for using run.js.
fac46b0
Lichun Zhan fix jslint error for pr565 7068fd3
@mojit0 mojit0 Add getter to avoid exposing _app for Manhattan use. a41580f
@mojit0 mojit0 Merge pull request #624 from mojit0/develop
Fix broken Manhattan server.js format to allow:

process.chdir(__dirname);

module.exports = function(config, token) {
   var Mojito = require('mojito');
   var app = Mojito.createServer();

   process.emit("application-ready", token, app.getHttpServer());
};
fe3a651
lzhan Merge pull request #623 from lzhan/jl
Jl
f9eb94a
@mojit0 mojit0 Move app init so any getHttpServer call returns initialized app insta…
…nce.
71246de
Joe Catera Added 'regex' property to config file. Still need example. f508117
@mojit0 mojit0 Merge pull request #625 from mojit0/develop
Move app init so any getHttpServer call returns initialized app instance...
0367e9e
Joe Catera Added a section that gives an example of using the 'regex' property. 2051a05
Joe Catera Tried to modify table to display on GH and elaborated on the use of k…
…ey as a parameter.
a3fe954
Joe Catera Fixed typo. cb8a66b
Joe Catera Rewrote a sentence. 5fda88c
Joe Catera Merge pull request #627 from zhouyaoji/docs_routing_add_regex
[doc: GH issue #598] The routing configuration documentation covers the 'regex' property.
c40c89f
@mojit0 mojit0 Fix intermittently failing functional test.
This test's comparison on hours would consistently fail…if it was 12:xx on the clock, otherwise it would pass.
edac5b7
@mojit0 mojit0 Add missing portion of test fix.
Adjust the logic to not produce a 0:xx pm value.
f9fef63
@mojit0 mojit0 Fix start logic.
Adjusted MojitoServer to remove start() call and replace with listen(). This
provides a more flexible way to adapt to different hosting container needs.

Adjust archetype server.js files to provide more information/templates.
0e0a30c
@mojit0 mojit0 Fix index.js archetypes.
The index.js archetypes were still reflecting the pre-clean-startup version.
67979ca
@mojit0 mojit0 Fix host defaulting.
Defaulting the host wasn't working properly. Adjusted to support putting in an explicit host, otherwise don't use one at all.
bc51b3a
@mojit0 mojit0 Adjust index/server coordination for container startup.
The index.js file is key for some containers so redirected it to call in server.js rather than mojito module.
6a99975
@mojit0 mojit0 Fix jslint errors. 7c8c558
@mojit0 mojit0 Readjust index.js reference. 0003c05
@mojit0 mojit0 Merge pull request #628 from mojit0/develop
Fix start logic.
89c248e
Joe Catera Fixed the FAQ regarding passing data from the controller to the binder. a013537
Joe Catera Merge pull request #629 from zhouyaoji/docs_sharing_configs
[docs GH 602] Rewrote item in the FAQ regarding passing data from the controller to the binder.
977bb80
Lichun Zhan update express and connect to a version supporting node0.8 2b73de2
@isao isao release 0.4.7 (based on 0.4.6-33-g977bb80) 5498f43
Lichun Zhan rm connect from dep list as express will pull it 2085855
lzhan Merge pull request #632 from lzhan/pkgupdate
update express and connect to a version supporting node0.8
37cea5a
Joe Catera Adding the 'bar.hb.html' index. 7bfb544
Joe Catera Merge pull request #639 from zhouyaoji/code_ex_correct_yql_getting-st…
…arted-ex

[code ex fix: GH 547] Added the 'bar.hb.html' index.
b12afb9
@mojit0 mojit0 Remove obsolete index.js files. a524b80
@mojit0 mojit0 Merge pull request #640 from mojit0/cleaner-startup
Remove obsolete index.js files from application archetypes.
Remove unnecessary Manhattan startup logic from server.js files.
434f56b
Joe Catera Fixed JSLint errors. ba5d1d0
Joe Catera Merge pull request #641 from zhouyaoji/code_exs_getting-started-jslin…
…t_errs

[gh 546] Fixed JSLint errors in getting-started-guide examples.
5a83c42
Joe Catera Added a placeholder for the API key and modified query. 3c5bb67
Joe Catera Updated query. f0af949
Joe Catera Merge pull request #648 from zhouyaoji/docs_fix_binders_ex
[docs GH 570] Docs fix binders ex: added placeholder for API key and modified YQL query.
60107e5
Joe Catera Added a prereq for doing the code example, added a link to get Flickr…
… API key, and added more information in the implementation notes.
351e25f
Joe Catera Merge pull request #650 from zhouyaoji/docs_fix_binders_ex
[docs] Added a prereq for doing the code example, added a link to get Flickr API and more info to the implementation notes.
44ad07e
Joe Catera Fixed typos. 0ef19a4
Joe Catera Merge branch 'docs_fix_binders_ex' into develop 6ac9c41
@drewfish drewfish Merge branch 'develop' into perf-merge-develop
Conflicts:
	docs/dev_guide/code_exs/binding_events.rst
	examples/developer-guide/binding_events/mojits/PagerMojit/controller.server.js
	examples/developer-guide/binding_events/mojits/PagerMojit/models/model.server.js
	examples/developer-guide/configure_routing/mojits/RoutingMojit/controller.server.js
	examples/developer-guide/device_assets/mojits/device/controller.server.js
	examples/developer-guide/generating_urls/mojits/GenURLMojit/controller.server.js
	examples/developer-guide/model_yql/mojits/flickr/controller.server.js
	examples/developer-guide/model_yql/mojits/flickr/models/model.server.js
	examples/developer-guide/multiple_mojits/mojits/BodyMojit/controller.server.js
	examples/developer-guide/multiple_mojits/mojits/FooterMojit/controller.server.js
	examples/developer-guide/multiple_mojits/mojits/FrameMojit/controller.server.js
	examples/developer-guide/multiple_mojits/mojits/HeaderMojit/controller.server.js
	examples/developer-guide/unittest_model_controller/mojits/flickr/controller.server.js
	examples/developer-guide/unittest_model_controller/mojits/flickr/models/model.server.js
	examples/developer-guide/using_configs/mojits/ContactUs/controller.server.js
	examples/developer-guide/using_cookies/mojits/CookieMojit/controller.server.js
	examples/developer-guide/using_parameters/mojits/QueryMojit/controller.server.js
	examples/getting-started-guide/part2/basic_yql/mojits/Flickr/controller.server.js
	examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js
	examples/getting-started-guide/part3/intl-templates/mojits/Flickr/controller.server.js
	examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js
	examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/controller.common.js
	examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/models/model.common.js
	examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/controller.common.js
	examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/controller.common.js
	lib/app/archetypes/app/default/index.js
	lib/app/archetypes/app/default/server.js
	lib/app/archetypes/app/full/index.js
	lib/app/archetypes/app/full/server.js
	lib/app/archetypes/app/simple/server.js
	lib/app/middleware/mojito-handler-static.js
	lib/mojito.js
	package.json
5c6c492
@caridy
Collaborator
caridy commented Oct 22, 2012

+1

@drewfish drewfish merged commit bbd1846 into yahoo:develop-perf Oct 23, 2012

1 check was pending

default The Travis build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment