Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Merge Story 0 into master #63

Merged
merged 129 commits into from
Oct 30, 2015
Merged

Merge Story 0 into master #63

merged 129 commits into from
Oct 30, 2015

Commits on May 14, 2015

  1. Configuration menu
    Copy the full SHA
    3ddf1ea View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2015

  1. Setting up the framework for postcard app

    Client - Cordova app
    Server - Pouchdb-express based node app
    sreesharp committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    bfccfe7 View commit details
    Browse the repository at this point in the history
  2. Setting up the framework for postcard app

    Client - Cordova app
    Server - Pouchdb-express based node app
    sreesharp committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    f533e05 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/master'

    sreesharp committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    85ff659 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2015

  1. Revert "Setting up the framework for postcard app"

    This reverts commit bfccfe7.
    sreesharp committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    e4fd958 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a09505f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5bfec8a View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2015

  1. Configuration menu
    Copy the full SHA
    89786e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2015

  1. Updated the client UI

    sreesharp committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    7fcfc6b View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2015

  1. Configuration menu
    Copy the full SHA
    cceca8e View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2015

  1. Configuration menu
    Copy the full SHA
    0b2486f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2015

  1. Configuration menu
    Copy the full SHA
    ae6e5fe View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. Configuration menu
    Copy the full SHA
    186855c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1cb239e View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. Updated the Content Security Policy

    Included the leveldown related files
    sreesharp committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    0b56a69 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2015

  1. Configuration menu
    Copy the full SHA
    54bf38d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ad2d8f5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7496e5d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2015

  1. Configuration menu
    Copy the full SHA
    e3395d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2015

  1. Added sync support over Wifi using the express-PouchDB, Added user sp…

    …ecific card when they create new cards
    sreesharp committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    79a64a6 View commit details
    Browse the repository at this point in the history
  2. Delete HISTORY.md

    sreesharp committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    5f81075 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2015

  1. Configuration menu
    Copy the full SHA
    d6d785c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b4a8efd View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2015

  1. Fixed the leveldown issues

    sreesharp committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    33e1f75 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e2b16db View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9e69a72 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    31f729d View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2015

  1. Updating the readme

    sreesharp committed Jun 27, 2015
    Configuration menu
    Copy the full SHA
    2558dfc View commit details
    Browse the repository at this point in the history
  2. Updating the readme

    sreesharp committed Jun 27, 2015
    Configuration menu
    Copy the full SHA
    d5aaa44 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2015

  1. Configuration menu
    Copy the full SHA
    26392b5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fe8a65d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a19dca7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3d0036e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6e9d724 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2015

  1. correct the steps

    obastemur committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    4fe1912 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2015

  1. Configuration menu
    Copy the full SHA
    21d45a7 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. Configuration menu
    Copy the full SHA
    d006722 View commit details
    Browse the repository at this point in the history
  2. Sorting routes

    mattpodwysocki committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    50d9c74 View commit details
    Browse the repository at this point in the history
  3. Sorting routes

    mattpodwysocki committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    37bfcb3 View commit details
    Browse the repository at this point in the history
  4. Sorting routes

    mattpodwysocki committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    ca8ad92 View commit details
    Browse the repository at this point in the history
  5. Sorting routes

    mattpodwysocki committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    74aa1d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Fixing postcard app

    mattpodwysocki committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    b2e1779 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5e8f45e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fd3029c View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2015

  1. A few minor updates

    yaronyg committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    64f8a5b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4004fd6 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #8 from thaliproject/story_00_srichal

    Just getting up hello world using Cordova and JXCore
    srichal committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    0962f59 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2015

  1. Blanking login for now

    mattpodwysocki committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    6262be1 View commit details
    Browse the repository at this point in the history
  2. Blanking login for now

    mattpodwysocki committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    0e0b43c View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2015

  1. Fixing cardroutes

    mattpodwysocki committed Jul 13, 2015
    Configuration menu
    Copy the full SHA
    40b340b View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2015

  1. Configuration menu
    Copy the full SHA
    9c138b5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    38a6594 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2015

  1. Configuration menu
    Copy the full SHA
    49a1ecf View commit details
    Browse the repository at this point in the history
  2. Clean up install instructions

    This is not the final commit. I just need this to test things end to
    end from github.
    yaronyg committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    74f7895 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ea3044 View commit details
    Browse the repository at this point in the history
  4. Bug fixes to install script

    yaronyg committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    4cf3015 View commit details
    Browse the repository at this point in the history
  5. Cleaning up ready

    yaronyg committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    1db17c9 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2015

  1. Merge remote-tracking branch 'remotes/origin/story_0_matthewp' into s…

    …tory_0_sree
    
    Conflicts:
    	www/jxcore/app.js
    	www/jxcore/cardroutes.js
    	www/jxcore/package.json
    	www/jxcore/public/postcard.css
    	www/jxcore/public/postcard.js
    	www/jxcore/views/ejs/index.ejs
    sreesharp committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    7f6ca3b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d067ee0 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2015

  1. Minor cleanup

    yaronyg committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    62ab093 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. A test

    yaronyg committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    a654222 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2015

  1. Update readme

    yaronyg committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    ab75c14 View commit details
    Browse the repository at this point in the history
  2. Merge with story_0

    yaronyg committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    07027e1 View commit details
    Browse the repository at this point in the history
  3. Simplified readme & updated version

    Readme now points to story 0
    yaronyg committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    ae323ce View commit details
    Browse the repository at this point in the history
  4. Updated Thali dependency version & fix thali require

    We were depending on a checked in version of Thali which
    meant the app wouldn't get any updates!
    yaronyg committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    5c83c6f View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2015

  1. Removing plugins & hooks files

    They shouldn't be checked in, they are autogenerated when
    plugins are installed.
    
    The readme in the hooks directory wasn't doing anything.
    yaronyg committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    dbd511a View commit details
    Browse the repository at this point in the history
  2. Fix Matt's comments

    yaronyg committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    f869c21 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2015

  1. Merge pull request #16 from thaliproject/story_0_yarong

    Story 0 yarong
    yaronyg committed Aug 6, 2015
    Configuration menu
    Copy the full SHA
    f27cec8 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2015

  1. Fixing our broken install instructions

    Our instructions implied that one needed to clone the depot. They also didn't properly list out our dependencies.
    yaronyg committed Aug 7, 2015
    Configuration menu
    Copy the full SHA
    cd1b227 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #18 from thaliproject/yaronyg-patch-1

    Fixing our broken install instructions
    yaronyg committed Aug 7, 2015
    Configuration menu
    Copy the full SHA
    de65032 View commit details
    Browse the repository at this point in the history
  3. Pointing out common pitfalls

    yaronyg committed Aug 7, 2015
    Configuration menu
    Copy the full SHA
    8938277 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #20 from thaliproject/yaronyg-patch-1

    Pointing out common pitfalls
    yaronyg committed Aug 7, 2015
    Configuration menu
    Copy the full SHA
    024881d View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2015

  1. Configuration menu
    Copy the full SHA
    b4425e7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1e2f149 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #24 from thaliproject/story_0_matthewp_readme

    Adding Windows pre-reqs
    yaronyg committed Aug 14, 2015
    Configuration menu
    Copy the full SHA
    cd6b60c View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2015

  1. Fix for #25 and partial for #26

    yaronyg committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    6faa7a3 View commit details
    Browse the repository at this point in the history
  2. Fix for #26

    yaronyg committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    5ca8c4e View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2015

  1. first clean-up

    deadlyfingers authored and David Douglas committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    50f5391 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. Polymer 1.0 UI

    deadlyfingers committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    580f124 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c4aac68 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7ff200c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    de867b1 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. Configuration menu
    Copy the full SHA
    3a6f345 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cac2029 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2fa66ed View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. Configuration menu
    Copy the full SHA
    5edaf9a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7e3e7f1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    92fdaf0 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #38 from thaliproject/yaronyg-patch-1

    Adding iOS to shell instructions
    yaronyg committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    698e42e View commit details
    Browse the repository at this point in the history
  5. Fix ios build instruction

    yaronyg committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    d8818e4 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #39 from thaliproject/yaronyg-patch-1

    Fix ios build instruction
    yaronyg committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    c6e86ac View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. Configuration menu
    Copy the full SHA
    6fa9a3a View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2015

  1. Update readme.md

    yaronyg committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    0fdefb2 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2015

  1. Point to master

    yaronyg committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    5d70d58 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #42 from thaliproject/yaronyg-patch-1

    Point to master
    yaronyg committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    e77b4cc View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2015

  1. Configuration menu
    Copy the full SHA
    5c0e026 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2015

  1. Configuration menu
    Copy the full SHA
    8612397 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1de73db View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    30f755f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f9e2e07 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2015

  1. Merge pull request #30 from thaliproject/story_0_dadougla

    Story 0 - Polymer WebApp
    deadlyfingers committed Sep 15, 2015
    Configuration menu
    Copy the full SHA
    3fe0815 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cd0e61e View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2015

  1. Card changes to ignore 'me' record changed issue - fix #45.

    Updated jQuery ajax with context to use 'this' and replaced deprecated success methods.
    deadlyfingers committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    3d22193 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2015

  1. Configuration menu
    Copy the full SHA
    6ac6247 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b62e292 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2015

  1. Updated package.json

    deadlyfingers committed Sep 30, 2015
    Configuration menu
    Copy the full SHA
    3eef53c View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. Merge pull request #48 from thaliproject/story_0_readme

    Story 0 readme updated with bower components install
    deadlyfingers committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    50c280a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d6e58a View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2015

  1. Configuration menu
    Copy the full SHA
    b0fc2f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2015

  1. Configuration menu
    Copy the full SHA
    27026a6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1e0211f View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2015

  1. Configuration menu
    Copy the full SHA
    b698889 View commit details
    Browse the repository at this point in the history
  2. Updated readme

    deadlyfingers committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    f829f7d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #46 from thaliproject/story_0_dadougla

    Story 0 - Automatic refresh
    deadlyfingers committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    4784b5a View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

  1. Configuration menu
    Copy the full SHA
    fcfb082 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2015

  1. Configuration menu
    Copy the full SHA
    83e0e37 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d485db4 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #57 from thaliproject/story_0_dadougla

    Story 0 dadougla
    mpodwysocki committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    3f40d98 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eee01d5 View commit details
    Browse the repository at this point in the history
  5. Updated readme

    deadlyfingers committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    2504486 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. Make it easier to run on localhost.

    The main fix is to assign the mock object to `global.Mobile` rather than
    to defining it with `var Mobile`, because otherwise, the definition would apply
    only within the current module.
    
    The trigger for the mockups was moved behind a more explicit MOCK_MOBILE
    environment variable rather than NODE_ENV, because the latter is a fairly
    commonly used and we don't want these mocks to accidentally apply, for example,
    in a Cordova-based environment.
    
    The readme is updated with steps needed after a fresh clone to be able to run
    on localhost.
    
    Fixes #58.
    vjrantal committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    7821ef8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #59 from vjrantal/fix-58

    Make it easier to run on localhost.
    vjrantal committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    afda44e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    07ccf45 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2015

  1. Configuration menu
    Copy the full SHA
    93af1d2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6dba904 View commit details
    Browse the repository at this point in the history
  3. Updated readme r1

    deadlyfingers committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    a2861bf View commit details
    Browse the repository at this point in the history
  4. Merge pull request #61 from thaliproject/story_0_dadougla

    Story 0 using thali module 2.0.1 to fix #60
    deadlyfingers committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    8378311 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2015

  1. Updated readme

    deadlyfingers committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    28f4d60 View commit details
    Browse the repository at this point in the history
  2. Merge with master

    deadlyfingers committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    7984db2 View commit details
    Browse the repository at this point in the history