[Commits] [fluid-project/infusion] 85c206: Merge branch 'master' into FLUID-5599

GitHub noreply at github.com
Thu May 7 10:40:21 EDT 2015


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 85c2066fd9459b8693c6b2c59f8063e195a815b5
      https://github.com/fluid-project/infusion/commit/85c2066fd9459b8693c6b2c59f8063e195a815b5
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/StarterSchemas.js
    M tests/framework-tests/core/html/DataBinding-test.html
    M tests/framework-tests/core/js/DataBindingTests.js
    M tests/framework-tests/core/js/FluidJSTests.js
    M tests/framework-tests/core/js/ModelTransformationTests.js
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    M tests/manual-tests/framework/preferences/fullPage-schema/js/prefsEditorFullPageSchema.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5599


  Commit: 237dc7c0414fac856fdfb9f68bb3b350a50ef867
      https://github.com/fluid-project/infusion/commit/237dc7c0414fac856fdfb9f68bb3b350a50ef867
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-04 (Mon, 04 May 2015)

  Changed paths:
    M examples/framework/preferences/usingGrades/js/prefsEditorSeparatedPanel.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/PrefsEditor.js
    A tests/framework-tests/preferences/data/contrast_en.json
    A tests/framework-tests/preferences/data/emphasizeLinks_fr.json
    A tests/framework-tests/preferences/data/inputsLarger_en.json
    A tests/framework-tests/preferences/data/lineSpace_fr.json
    A tests/framework-tests/preferences/data/linksControls_en.json
    A tests/framework-tests/preferences/data/prefsEditor_fr.json
    A tests/framework-tests/preferences/data/textFont_en.json
    A tests/framework-tests/preferences/data/textSize_fr.json
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js
    M tests/manual-tests/framework/preferences/fullPage/js/prefsEditorFullpage.js

  Log Message:
  -----------
  FLUID-5599: Based on Antranig's implementation of localised resource fetcher, updated the prefs framework to accept and fetch message files using locale values.


  Commit: 4916d316e86c76265c9ec8c91d07d658648c7cf7
      https://github.com/fluid-project/infusion/commit/4916d316e86c76265c9ec8c91d07d658648c7cf7
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-04 (Mon, 04 May 2015)

  Changed paths:
    M src/framework/core/js/FluidPromises.js
    M tests/framework-tests/core/data/messages1_en.json
    M tests/framework-tests/core/data/messages1_en_ZA.json
    M tests/framework-tests/core/data/messages2_fr.json
    M tests/framework-tests/core/data/messages3_en.json
    M tests/framework-tests/core/js/FluidPromisesTests.js
    M tests/framework-tests/core/js/FluidRequestsTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5599


  Commit: ee5ae2ab4940ba410937f89f4fbba1f8232694fb
      https://github.com/fluid-project/infusion/commit/ee5ae2ab4940ba410937f89f4fbba1f8232694fb
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-04 (Mon, 04 May 2015)

  Changed paths:
    M src/framework/preferences/messages/contrast.json
    M src/framework/preferences/messages/emphasizeLinks.json
    M src/framework/preferences/messages/inputsLarger.json
    M src/framework/preferences/messages/lineSpace.json
    M src/framework/preferences/messages/linksControls.json
    M src/framework/preferences/messages/speak.json
    M src/framework/preferences/messages/textSize.json
    M tests/framework-tests/preferences/data/contrast_en.json
    M tests/framework-tests/preferences/data/emphasizeLinks_fr.json
    M tests/framework-tests/preferences/data/inputsLarger_en.json
    M tests/framework-tests/preferences/data/lineSpace_fr.json
    M tests/framework-tests/preferences/data/linksControls_en.json
    M tests/framework-tests/preferences/data/textSize_fr.json

  Log Message:
  -----------
  FLUID-5599: Added new line chars at the end of some message json files.


  Commit: e92620501bb209f74b611626d6b8318fd2138688
      https://github.com/fluid-project/infusion/commit/e92620501bb209f74b611626d6b8318fd2138688
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-05 (Tue, 05 May 2015)

  Changed paths:
    M src/framework/preferences/js/PrefsEditor.js

  Log Message:
  -----------
  FLUID-5599: Simplified the merge of locale and defaultLocale options into the resource spec at fluid.prefs.resourceLoader.


  Commit: a533eb4c2a5e13f17abc25509798df173eb9d967
      https://github.com/fluid-project/infusion/commit/a533eb4c2a5e13f17abc25509798df173eb9d967
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M src/framework/preferences/js/PrefsEditor.js
    R tests/framework-tests/preferences/data/contrast_en.json
    A tests/framework-tests/preferences/data/contrast_fr.json
    M tests/framework-tests/preferences/data/emphasizeLinks_fr.json
    R tests/framework-tests/preferences/data/inputsLarger_en.json
    A tests/framework-tests/preferences/data/inputsLarger_fr.json
    A tests/framework-tests/preferences/data/lineSpace_en.json
    R tests/framework-tests/preferences/data/lineSpace_fr.json
    R tests/framework-tests/preferences/data/linksControls_en.json
    A tests/framework-tests/preferences/data/linksControls_fr.json
    M tests/framework-tests/preferences/data/prefsEditor_fr.json
    A tests/framework-tests/preferences/data/textSize_en.json
    R tests/framework-tests/preferences/data/textSize_fr.json
    M tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5599: Setup a proper defaltLocale value in fluid.prefs.prefsEditorLoader, improved unit tests for prefsEditor and use french language in _fr json files.


  Commit: 04265f1cc1b700e595630423cb1573d40dba5b86
      https://github.com/fluid-project/infusion/commit/04265f1cc1b700e595630423cb1573d40dba5b86
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5599: Fixed a typo.


  Commit: 5ef2933040402b4013da38cb753924a81e698d27
      https://github.com/fluid-project/infusion/commit/5ef2933040402b4013da38cb753924a81e698d27
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M src/framework/core/js/FluidRequests.js
    A tests/framework-tests/core/data/messages4.json
    M tests/framework-tests/core/js/FluidRequestsTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5599


  Commit: 821901fcc434beb5c01a6869b1ef4ace067a44fb
      https://github.com/fluid-project/infusion/commit/821901fcc434beb5c01a6869b1ef4ace067a44fb
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5599: Improved the unit test for the prefs editor.


  Commit: 6a211a4e481c08df14d3a9f8d6f2c5a94da051f4
      https://github.com/fluid-project/infusion/commit/6a211a4e481c08df14d3a9f8d6f2c5a94da051f4
  Author: Cindy Qi Li <cli at ocadu.ca>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M tests/framework-tests/core/data/messages4.json

  Log Message:
  -----------
  FLUID-5599: Added a new line char at the end of a json file.


  Commit: 76c61899b6f7f17528905490ca1df1f09140cf2e
      https://github.com/fluid-project/infusion/commit/76c61899b6f7f17528905490ca1df1f09140cf2e
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M examples/framework/preferences/usingGrades/js/prefsEditorSeparatedPanel.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/messages/contrast.json
    M src/framework/preferences/messages/emphasizeLinks.json
    M src/framework/preferences/messages/inputsLarger.json
    M src/framework/preferences/messages/lineSpace.json
    M src/framework/preferences/messages/linksControls.json
    M src/framework/preferences/messages/speak.json
    M src/framework/preferences/messages/textSize.json
    M tests/framework-tests/core/data/messages4.json
    A tests/framework-tests/preferences/data/contrast_fr.json
    A tests/framework-tests/preferences/data/emphasizeLinks_fr.json
    A tests/framework-tests/preferences/data/inputsLarger_fr.json
    A tests/framework-tests/preferences/data/lineSpace_en.json
    A tests/framework-tests/preferences/data/linksControls_fr.json
    A tests/framework-tests/preferences/data/prefsEditor_fr.json
    A tests/framework-tests/preferences/data/textFont_en.json
    A tests/framework-tests/preferences/data/textSize_en.json
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js
    M tests/manual-tests/framework/preferences/fullPage/js/prefsEditorFullpage.js

  Log Message:
  -----------
  Merge branch 'FLUID-5599'

* FLUID-5599:
  FLUID-5599: Added a new line char at the end of a json file.
  FLUID-5599: Improved the unit test for the prefs editor.
  FLUID-5599: Fixed a typo.
  FLUID-5599: Setup a proper defaltLocale value in fluid.prefs.prefsEditorLoader, improved unit tests for prefsEditor and use french language in _fr json files.
  FLUID-5599: Simplified the merge of locale and defaultLocale options into the resource spec at fluid.prefs.resourceLoader.
  FLUID-5599: Added new line chars at the end of some message json files.
  FLUID-5599: Based on Antranig's implementation of localised resource fetcher, updated the prefs framework to accept and fetch message files using locale values.


Compare: https://github.com/fluid-project/infusion/compare/7b1fdc80a063...76c61899b6f7


More information about the Commits mailing list