Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Jul 3, 2015
  1. @javihernandez

    Merge remote-tracking branch 'kaspermarkus/GPII-311'

    javihernandez authored
    * kaspermarkus/GPII-311:
      GPII-311: Modified line endings to be LF instead of CR/LF
      GPII-311: Fixed extra whitespace in context integration tests
      GPII-311: Updated acceptance tests documentation to describe the increased attempts of process checking as required by maavis startup time
      GPII-311: Removed tab, jshinted and found stray comma in  context integration text that have now been removed
      GPII-311: Added text file describing the acceptance test and its dependencies
      GPII-311: Removed excess comments and some whitespacing
      GPII-1042: Increased the timelimit to 6 seconds totally to give applications more time to launch
      GPII-311: Maavis acceptance tests in test suite
      GPII-311: the Maavis acceptance tests themselves
      GPII-311: Maavis acceptance tests: sample NP set
      GPII-311: Maavis acceptance tests: sample NP set
      GPII-311: Maavis acceptance tests: device reporter
      GPII-311: config for Maavis acceptance tests
      GPII-311: Maavis acceptance tests
  2. @sgithens
  3. @sgithens

    GPII-413 Commiting merge from javihernandez/device-report-draft-2 aft…

    sgithens authored
    …er fixing minor merge conflict in tests/platform/index-linux.js with Javi's help.
  4. @kaspermarkus
  5. @amb26

    Merge branch 'GPII-989_'

    amb26 authored
    * GPII-989_:
      GPII-989: Adding missing options block in linux-chrome-testSpec.js
  6. @javihernandez
Commits on Jul 2, 2015
  1. @amb26

    GPII-1232: Moving WebSockets component up to flowManager.io - renamei…

    amb26 authored
    …ng WebSockets to webSockets for settings handler name - reindenting files that now no longer require wrapping
  2. @javihernandez
  3. @amb26

    Merge branch 'GPII-1231'

    amb26 authored
    * GPII-1231:
      GPII-1231: Stray semicolon in include
      GPII-1231 and GPII-1232: Widespread linting failures with emergency commit to resolve GPII-989 breakage of web-based lifecycleManager tests
      GPII-1232: Emergency fix for the websockets/lifecyclemanager issue
      GPII-1231: JSHinted stuff
      GPII-1231: Fixing the immediate problem with this JIRA. The broken web-based unit tests for lifecycle manager already present in master has not been added
  4. @amb26
  5. @amb26

    GPII-1231 and GPII-1232: Widespread linting failures with emergency c…

    amb26 authored
    …ommit to resolve GPII-989 breakage of web-based lifecycleManager tests
  6. @kaspermarkus
  7. @kaspermarkus
  8. @kaspermarkus
  9. @kaspermarkus

    GPII-1231: Fixing the immediate problem with this JIRA. The broken we…

    kaspermarkus authored
    …b-based unit tests for lifecycle manager already present in master has not been added
Commits on Jul 1, 2015
  1. @javihernandez
Commits on Jun 30, 2015
  1. @amb26

    Merge branch 'GPII-989'

    amb26 authored
    * GPII-989: (26 commits)
      GPII-989: Linted a little bit more
      GPII-989: Addressing latest comments from Antranig
      GPII-989: Linted and clean
      GPII-989: Moved some logic from the browserChannel to the WebsocketsComponent
      GPII-989: Now 'clients' is a member instead of an 'option'
      GPII-989: Implemented better and simpler get/set methods
      GPII-989: Fixed a few details in the documentation
      GPII-989: Fixed indentation level at linux-chrome-testSpec.js
      GPII-989: Adding acceptance/integration tests for cloud4chrome on GNU/Linux
      GPII-989: Added suppport for acceptance/integration testing with WebSockets
      GPII-989: Added documentation/BrowserChannel.md
      GPII-989: Adding new tests to all-tests.js
      GPII-989: Stop using a model to store the clients
      GPII-989: Linting and cleaning up
      GPII-989: Testing that untrusted clients can't use the browserChannel
      GPII-989: Avoiding untrusted solutions to make use of the browserChannel
      GPII-989: Adding more tests and addressing some comments
      GPII-989: Adding many tests for testing the new browserChannel endpoint
      GPII-989: Notify the system after each request to browserChannel
      GPII-989: Expose gpii.settingsHandlers.WebSockets via LyfecycleManager
      ...
Commits on Jun 29, 2015
  1. @javihernandez
  2. @javihernandez
Commits on Jun 23, 2015
  1. @javihernandez
Commits on Jun 19, 2015
  1. @javihernandez
  2. @javihernandez

    GPII-989: Moved some logic from the browserChannel to the WebsocketsC…

    javihernandez authored
    …omponent
    
    Also, use only logAndNotify after each request to the browserChannel
  3. @javihernandez
  4. @javihernandez

    GPII-989: Implemented better and simpler get/set methods

    javihernandez authored
    As of this commit, every application that makes use of the webSockets settings handler needs to include the id of the solution in the 'options' block.
  5. @javihernandez

    GPII-989: Merge branch 'upstream/master' into GPII-989

    javihernandez authored
    * origin/master: (281 commits)
      NOJIRA: grunt start -> node gpii.js
      NOJIRA: "unable to server" fixed
      GPII-966 / NOJIRA: typo
      GPII-966 / NOJIRA: sublists with spaces; typos
      GPII-966 / NOJIRA: sublists with spaces; typos
      GPII-966 / NOJIRA: sublists with spaces; typos
      GPII-966 / NOJIRA: typos
      GPII-966 / NOJIRA: typos
      GPII-966 / NOJIRA: sublists with spaces
      GPII-966 / NOJIRA: markdown list markup
      GPII-966 / NOJIRA: sublists with spaces
      NOJIRA: link to ContextManager.md was broken
      NOJIRA: editorial changes
      NOJIRA: typo; hyphen
      NOJIRA: Modified line endings of OldPreferencesServer.md to be LF
      NOJIRA: Rename onscreenKeyboard common term into onScreenKeyboardEnabled
      NOJIRA: Fixed some NP sets for the integration weekly tests
      NOJIRA: NP sets for weekly integration tests
      NOJIRA: "GNU/Linux and other Unix-like systems"
      NOJIRA: GNU Linux -> GNU/Linux; export lowercase
      ...
    
    Conflicts:
    	documentation/README.md
    	gpii/node_modules/flowManager/src/FlowManager.js
  6. @kaspermarkus
Commits on Jun 16, 2015
  1. @javihernandez
  2. @javihernandez
  3. @javihernandez
  4. @javihernandez
Commits on Jun 15, 2015
  1. @javihernandez
  2. @javihernandez

    GPII-989: Adding new tests to all-tests.js

    javihernandez authored
    Also, changed the way we pass the solution ids as arguments in our tests.
  3. @javihernandez

    GPII-989: Stop using a model to store the clients

    javihernandez authored
    This change is needed because we were experiencing some problems when storing a socket.io socket object
    inside a model. This issue has been documented at https://issues.fluidproject.org/browse/FLUID-5690
    and we will deal with the 'clients' object manually until the issue is solved.
  4. @javihernandez
  5. @javihernandez
Something went wrong with that request. Please try again.