sync up #877

Merged
merged 140 commits into from Jan 4, 2013

Projects

None yet

6 participants

@isao
Contributor
isao commented Jan 4, 2013

No description provided.

dmitris and others added some commits Sep 21, 2012
@dmitris dmitris Fixed handling of bad input for mojito jslint mojit command, modified…
… the help/usage message
bfc2617
@dmitris dmitris minor change of the wording for the error to reflect that we need the…
… path to the mojit like mojits/Bar not just its name
740af31
Lichun Zhan update test as the app is updated af14351
lzhan Merge pull request #819 from lzhan/last
update test as the app is updated
2e87ef0
Joe Catera Specified that the addon file name must be the same as the namespace,…
… clarified that ac and addons are similar but not the same as YUI Base object and YUI Plugins, and removed the definition of a YUI module.
1ba67b6
Joe Catera Rewrote bullet on requiring the 'mojito' module. 952d3b6
Joe Catera Merge pull request #820 from zhouyaoji/docs_update_extending_mojito_c…
…hapter

[docs] Update the extending mojito chapter, in particular, sections on addons and view engines.
385c1df
@isao isao release 0.5.0pr6 (based on 0.5.0pr5-277-g385c1df) cab0bfd
Joe Catera Changed 'autoload' to 'yui_modules' in documentation. 438fd9b
Joe Catera Changed directory name from 'autoload' to 'yui_modules' for the YUI m…
…odules example.
e87716d
Joe Catera Rewrote opening paragraph, moved the customizing log level order sect…
…ion, made edits.
e6553f1
Joe Catera Merge pull request #822 from zhouyaoji/docs_logging_corrections
[docs] Rewrote opening paragraph, moved the customizing log level order section...
d28e292
Joe Catera Merge pull request #821 from zhouyaoji/docs_autoload_to_yui_modules
[docs] Changed the autoload directory to yui modules directory, but left notes that both can be used.
80002a5
Joe Catera Corrected issues pointed out by Caridy. 6c3cf27
Joe Catera Updated description to error example. 8c55547
Joe Catera Made a copy edit to the section on the status mojit. a2cd221
Joe Catera Merge pull request #825 from zhouyaoji/docs_update_mvc
[docs] Updated example for reporting errors, the section on file naming conventions for templates, and fixed a typo.
043ee5d
Joe Catera Made copy edits. c1f7f5b
Joe Catera Clarified that some of the resources of mojits configured with appLev…
…el: true are shared.
ea4d14e
Joe Catera Merge pull request #826 from zhouyaoji/mojito_configuring_corrections
[docs] Rewrote introductory paragraph, removed obsolete config params ( "deferAllOptionalAutoloads", "useRollups", "extraModules", "loader", "urlContains", "base" and "url").
e716cc5
@isao isao add {{port}} in application.json.hb so that the
`mojito create -p «portnum»` option works
9c85109
@drewfish drewfish skip synthetic yui modules f743b2a
@isao isao update hybrid mojit archetype for 0.5.x 49a52cf
@isao isao Merge pull request #828 from isao/createport
archtype updates
2fec468
@isao isao Revert "Merge pull request #828 from isao/createport"
This reverts commit 2fec468, reversing
changes made to e716cc5.
72fe0d1
@isao isao Merge pull request #829 from isao/revert
convert pr 828 commits into distinct prs
5e9b1ab
@isao isao update hybrid archetype to 0.5.x api, jslint 65d52b0
@isao isao fix mojito create -p option
- add {{port}} to application.json
- rename with .hb extension
da79557
Joe Catera Made copy edits. 05c8f2a
@drewfish drewfish Merge pull request #827 from drewfish/gv-synthetic
skip synthetic yui modules
937af65
@isao isao Merge pull request #830 from isao/pr7
update hybrid archetype to 0.5.x api, jslint
11a30cf
@drewfish drewfish updated DEPRECATIONS.md with 0.5.0 news dada41d
Joe Catera Added note that siblings within the 'children' object can have their …
…own children.
26f7777
Joe Catera Merge pull request #833 from zhouyaoji/docs_review_cleanup
[docs] Cleaned up documentation (made copy edits) based on reviews.
d2c75a8
@drewfish drewfish a few more deprecated parts of the `yui` section 774b67c
Joe Catera Removed stray heading and section ID from older version of doc. c3dc058
Joe Catera Merge pull request #834 from zhouyaoji/docs_fix_frame_mojit_chapter
[doc] Removed stray heading and section ID from older version of doc.
e9ef74f
@drewfish drewfish more careful about when we say a resource is modified 4c5cfa2
@drewfish drewfish Merge pull request #832 from drewfish/deprecations
updated DEPRECATIONS.md with 0.5.0 news
c81571c
@drewfish drewfish Merge pull request #836 from drewfish/static
more careful about when we say a resource is modified
c296bdd
@drewfish drewfish release 0.5.0 (based on 0.5.0pr6-31-gc296bdd) d7b0f0c
@isao isao Merge pull request #831 from isao/archetypes
fix mojito create -p option
93741d7
@isao isao rm rollups from usage text, readability 3b44df6
@isao isao jslint tweaks 556bba7
@isao isao replace mkdirP code w/ mkdirp.sync lib func b9ccc2e
@isao isao rm obsolete rollup code a25830f
@isao isao rm unused config 458adf4
@isao isao emit deprecation warnings 29302a9
@isao isao rm yui and yuitest copies used in old arrow workaround 48336ba
@isao isao Merge pull request #837 from isao/cli
remove obsolesced rollups from mojito compile command

note! `mojito compile rollups` are not needed and have been removed
note: the `compile` cli command is deprecated in favor of shaker, see DEPRECATIONS.md
f57eed2
@caridy caridy supporting registration of global models 170d4cf
@isao isao Merge pull request #838 from isao/testing
rm yui and yuitest copies used in old arrow workaround
c2a2f33
@caridy caridy Merge branch 'develop' of github.com:yahoo/mojito into global-models ac9b9ad
Lichun Zhan mojito start output version of mojito being run f921610
@caridy caridy adding unit tests for addon models, fixing a couple of bugs surfaced …
…by the unit tests
adefac3
@caridy caridy removing serializeClientStore method from store and tests that is not…
… needed anymore.
beaae2e
@caridy caridy micro-optimization: delete on object members is VERY evil. ddc4c34
Lichun Zhan use node require f405df5
Lichun Zhan rm unused var e55464d
@caridy caridy adding comments for cache structure on client 291c595
@caridy caridy Merge pull request #839 from caridy/global-models
adding support for global models:

- a parent mojit can register a custom global model instance
- a child mojit can ask for a regular model and receive a global model if exists
9874480
@caridy caridy Merge pull request #841 from caridy/micro-tunning
Micro optimization:

- "delete" is evil in V8, avoid the use of delete on objects.
b254d13
Lichun Zhan rm static referece of mojito version 39cb005
Lichun Zhan Merge remote-tracking branch 'upstream/develop' into fixlint b97968e
@drewfish drewfish fix issue #835 more careful about caching results of expandInstanceFo…
…rEnv()
54dcebe
@drewfish drewfish added test for problem found in issue #843 a82128c
@drewfish drewfish Merge pull request #845 from drewfish/issue835-ei-caching
fix issue #835 more careful about caching results of expandInstanceForEnv
81e23d4
@add0n add0n Initial integration of mojito-YAF client 20f46a1
Lichun Zhan minor correction 2a4e051
lzhan Merge pull request #844 from lzhan/fixlint
Merge dmitris pr #542
9f3e880
Joe Catera Removed errant section ID. 57b7c5c
Joe Catera Fixed two broken links. 00143ef
Joe Catera Merge pull request #850 from zhouyaoji/docs_more_cleanup
[docs] Fixed a broken links.
27a109f
@add0n add0n Merge branch 'develop' into develop-yaf b7aa665
@add0n add0n Added config flag support to alternatively use the YAF client 8ba0b11
@drewfish drewfish address preformance regression introduced in pr 845 836189d
@drewfish drewfish feedback from code review ff9677a
@drewfish drewfish delinted bcb6516
@caridy caridy adjusting ac.url.make routine to avoid accepting strings for querystr…
…ing. avoiding any parsing or stringifing routine at make, instead letting the route maker to deal with that. fixing all unit tests.
5c05679
Lichun Zhan use path.join for json file path df7be82
@drewfish drewfish more feedback from code review 6081cc2
@mojit0 mojit0 Updated CLI for testability. Added cli.js tests. 831b680
@mojit0 mojit0 Merge remote-tracking branch 'upstream/develop' into develop 93f7008
@drewfish drewfish Merge pull request #852 from drewfish/issue835-faster
address preformance regression introduced in pr 845
9d6ceea
@mojit0 mojit0 Merge pull request #853 from mojit0/develop
Fix cli.js for testability.
55af791
@caridy caridy avoid warning when urlParams is empty/null. fixing functional tests f…
…or routing.
c9a3c22
@caridy caridy Merge branch 'develop' of github.com:yahoo/mojito into micro-tunning 9619f96
@mojit0 mojit0 Fix lint errors. 2424529
@mojit0 mojit0 Fix lint errors. e1307f8
@mojit0 mojit0 Merge remote-tracking branch 'upstream/develop' into develop a1c5365
@mojit0 mojit0 Merge pull request #855 from mojit0/develop
Fix lint errors.
5c54fb4
@caridy caridy addressing review notes from @folta 95875cb
@caridy caridy Merge branch 'develop' of github.com:yahoo/mojito into micro-tunning eaea7a1
@caridy caridy delinting 45f0095
@caridy caridy Merge pull request #854 from caridy/micro-tunning
fix for ac.url.make weird behavior after micro-optmiziation
7c48652
@isao isao yui configs now in yui.config; rm dependencyCalc f1faf28
@drewfish drewfish don't set instance.base=null, since needed by client-side 23224be
@drewfish drewfish Merge pull request #856 from drewfish/base-null
don't set instance.base=null, since needed by client-side
d6e36e0
@drewfish drewfish remove console.log from unit tests f6b4a62
@drewfish drewfish Merge pull request #857 from drewfish/unit-console
remove console.log from unit tests
d81aeb9
lzhan Merge pull request #840 from lzhan/mostart
mojito start output version of mojito being run
795787a
@isao isao add groups df3f281
@isao isao revert base, whsp 6511c42
@isao isao use symlinked yui/ 8f02b14
@add0n add0n Merge branch 'develop' into develop-yaf 6ad6148
@isao isao resolve loader config for Hybridapp in 0.5.x
config changes that avoid find/replace hacks, thanks Caridy

* use 0.5.x yui.config.x instead of older yui.x
* use relatve config.base and config.group.app.base
* rm obsolete, add some empty properties to override new defaults
* use yui.config.seed to point to resolved synthetic files, per @caridy. this avoids having to create a symlink to emulate the «static-prefix»/yui/ uri
b852d82
@isao isao apply feedback from Caridy: "use loader-app
-resolved{langPath}, which behaves
better, and in any case u are already using 
loader-yui3-resolved."
44f91c4
@isao isao rm comboBase per Caridy feedback 8c21fa7
@drewfish drewfish better handling of null children b5e3771
@drewfish drewfish Merge pull request #860 from drewfish/tuned-composite
better handling of null children
53ae3d2
@drewfish drewfish fixed client-side util.common unit tests dc4e313
@drewfish drewfish Merge pull request #861 from drewfish/unit-client
fixed client-side util.common unit tests
a15c44a
@isao isao for subdir case,
- build.hybridapp.forceRelativePaths: false
- yui.config.base: "/yahoo.libs.yui/"
- yui.config.groups.app.base: "/"

doesn't work via http, but should for crt://
5909dc8
@drewfish drewfish better support of older browsers 673f194
@drewfish drewfish Merge pull request #862 from drewfish/unit-client
better support of older browsers
ab59586
@isao isao Merge pull request #859 from isao/hybridapp
resolve loader config for Hybridapp in 0.5.x
21075b3
@add0n add0n Merge branch 'develop' into develop-yaf 3c15f77
Lichun Zhan use right api call to get config af0cc93
Lichun Zhan add negtive test c72ba80
Lichun Zhan add id for testing purpose bab8436
lzhan Merge pull request #864 from lzhan/newsboxes
use right api call to get combined config
f3ed852
@isao isao release 0.5.1 (based on 0.5.0-78-gf3ed852) b0283b3
@add0n add0n Merge branch 'develop' into develop-yaf af0f2e2
@isao isao fix Read controller tests, update style, whp 182aba2
@isao isao fix Read model tests, update style, whp 812a8af
@isao isao lint f206a19
@isao isao Copyright (c) 2011-2013, Yahoo! Inc. de9a8e7
@isao isao Merge pull request #866 from isao/newsboxes
fix two newsboxes unit tests, misc
4da9668
@add0n add0n Updated to new client featuring a whole new set of functionality, inc…
…luding integration with Mojito server
761c593
@add0n add0n Added initialization code 1a2582f
@add0n add0n Merge branch 'develop' into develop-yaf 6995fb0
Joe Catera Added FAQ about setting expiration of a cookie. a236ed3
Joe Catera Merge pull request #868 from zhouyaoji/docs_faq_cookie
[doc] Added FAQ about setting expiration of a cookie.
bd792f7
@add0n add0n Merge branch 'develop' into develop-yaf 571c187
@isao isao Merge pull request #867 from isao/copyright
update copyright to 2013
c77e812
@isao isao update package.json in archetypes for mojito 0.5.x & node >0.6
fix bz 5996478
7150419
@isao isao Merge pull request #870 from isao/archetypes
update package.json in archetypes for mojito 0.5.x & node >0.6
c7db6cf
@add0n add0n Merge branch 'develop' into develop-yaf 139de0e
@add0n add0n Variable fixes and null checks 532b858
@add0n add0n check first to see if we already have a container generated by Mojito…
… and don't render a template unless it's model has changes
83966df
@isao isao merged commit 56df54e into yahoo:develop-yaf Jan 4, 2013

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