Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Timeline Collection #398

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Timeline Collection #398

wants to merge 58 commits into from

Commits on Oct 2, 2011

  1. attempting a clean merge of Timeline, some very funky things happened… 

    … w/ git so not sure
    @quartzjer
    quartzjer committed Oct 2, 2011
    Configuration menu
    Copy the full SHA
    aec0e73 View commit details
    Browse the repository at this point in the history

  2. cleaning up merge tirds

    @quartzjer
    quartzjer committed Oct 2, 2011
    Configuration menu
    Copy the full SHA
    98ce09e View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2011

  1. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Oct 14, 2011
    Configuration menu
    Copy the full SHA
    2163f54 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2011

  1. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    babe16e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Oct 21, 2011
    Configuration menu
    Copy the full SHA
    007866e View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2011

  1. lots of fixes, pretty solid response support, and early link-based de… 

    …duping
    @quartzjer
    quartzjer committed Nov 2, 2011
    Configuration menu
    Copy the full SHA
    2ffc000 View commit details
    Browse the repository at this point in the history

  2. fixes to make links more usable

    @quartzjer
    quartzjer committed Nov 2, 2011
    Configuration menu
    Copy the full SHA
    c5efafd View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Nov 2, 2011
    Configuration menu
    Copy the full SHA
    503269f View commit details
    Browse the repository at this point in the history

  4. make a bit more sane, still could use a nice refactoring

    @quartzjer
    quartzjer committed Nov 2, 2011
    Configuration menu
    Copy the full SHA
    b33cb83 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2011

  1. adding instagram support and checking text-based dedup

    @quartzjer
    quartzjer committed Nov 5, 2011
    Configuration menu
    Copy the full SHA
    f321b0a View commit details
    Browse the repository at this point in the history

  2. instagram merging and from bugfix

    @quartzjer
    quartzjer committed Nov 5, 2011
    Configuration menu
    Copy the full SHA
    3b6c761 View commit details
    Browse the repository at this point in the history

  3. fix a regression

    @quartzjer
    quartzjer committed Nov 5, 2011
    Configuration menu
    Copy the full SHA
    99bc058 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2011

  1. cleaning up the api endpoints

    @quartzjer
    quartzjer committed Nov 6, 2011
    Configuration menu
    Copy the full SHA
    8a0b798 View commit details
    Browse the repository at this point in the history

  2. added twitter rt and reply support, lots of api cleanup and bugfixing

    @quartzjer
    quartzjer committed Nov 6, 2011
    Configuration menu
    Copy the full SHA
    9fbbc00 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2011

  1. more timeline fixes and start of a simple viewer

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    09cf8ce View commit details
    Browse the repository at this point in the history

  2. better update processing and adding ref resolving

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    6e887ea View commit details
    Browse the repository at this point in the history

  3. when a bad response happens, handle the error

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    d27ed1c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    1f48e84 View commit details
    Browse the repository at this point in the history

  5. ooh, 4sq shouts

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    2a13169 View commit details
    Browse the repository at this point in the history

  6. take both kinds of ids

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    d0cc404 View commit details
    Browse the repository at this point in the history

  7. sort default by time, and handle ids better

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    eaf49d8 View commit details
    Browse the repository at this point in the history

  8. more bugfixes, and process links on an update

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    66f4a23 View commit details
    Browse the repository at this point in the history

  9. simple viewer updates

    @quartzjer
    quartzjer committed Nov 7, 2011
    Configuration menu
    Copy the full SHA
    8deab93 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2011

  1. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Nov 13, 2011
    Configuration menu
    Copy the full SHA
    eb67142 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2011

  1. wasnt handling real link events properly, fixed

    @quartzjer
    quartzjer committed Nov 14, 2011
    Configuration menu
    Copy the full SHA
    18196af View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2011

  1. tiny safety check

    @quartzjer
    quartzjer committed Nov 18, 2011
    Configuration menu
    Copy the full SHA
    d8098ab View commit details
    Browse the repository at this point in the history

  2. fix merge conflict

    @quartzjer
    quartzjer committed Nov 18, 2011
    Configuration menu
    Copy the full SHA
    bf72faf View commit details
    Browse the repository at this point in the history

  3. trying to add some more query options to test

    @quartzjer
    quartzjer committed Nov 18, 2011
    Configuration menu
    Copy the full SHA
    75f5753 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2011

  1. merge conflict

    @quartzjer
    quartzjer committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    fdc7c8a View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2011

  1. updated Timeline collection to handle idrs

    @smurthas
    smurthas committed Dec 16, 2011
    Configuration menu
    Copy the full SHA
    03a2638 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2011

  1. Merge pull request #1 from smurthas/timeline 

    updated Timeline collection to handle idrs
    @quartzjer
    quartzjer committed Dec 22, 2011
    Configuration menu
    Copy the full SHA
    de5a197 View commit details
    Browse the repository at this point in the history

  2. tweak

    @quartzjer
    quartzjer committed Dec 22, 2011
    Configuration menu
    Copy the full SHA
    cc4e6f7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:quartzjer/Locker

    @quartzjer
    quartzjer committed Dec 22, 2011
    Configuration menu
    Copy the full SHA
    7fa5846 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2011

  1. merge conflict

    @quartzjer
    quartzjer committed Dec 24, 2011
    Configuration menu
    Copy the full SHA
    c150cf7 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2011

  1. general cleanups

    @quartzjer
    quartzjer committed Dec 26, 2011
    Configuration menu
    Copy the full SHA
    af6fabc View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2011

  1. converting fixtures to new event format

    @quartzjer
    quartzjer committed Dec 27, 2011
    Configuration menu
    Copy the full SHA
    754809c View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2011

  1. fixed up and tested all the fixtures, very close

    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    fc931d7 View commit details
    Browse the repository at this point in the history

  2. added instagram-4sq deduping (plus time based), reorgd the code some,… 

    … and more testing, nearly ready
    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    cd4a4f9 View commit details
    Browse the repository at this point in the history

  3. add facebook story support

    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    8ef2d4a View commit details
    Browse the repository at this point in the history

  4. easier to test it, can expand responses

    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    ef1961c View commit details
    Browse the repository at this point in the history

  5. more facebook fuzzies

    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    d0ccd95 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    e629286 View commit details
    Browse the repository at this point in the history

  7. adding event generation support

    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    1704fd5 View commit details
    Browse the repository at this point in the history

  8. letting things happen more fluidly, and enabling deep update again

    @quartzjer
    quartzjer committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    6888fa5 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2011

  1. safely serialize things, if stuff truly happens in parallel the dedup… 

    … may not catch
    @quartzjer
    quartzjer committed Dec 29, 2011
    Configuration menu
    Copy the full SHA
    005eb70 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    4091986 View commit details
    Browse the repository at this point in the history

  2. bring up to locker upstream current, fix logger references and generi… 

    …c pathing
    @quartzjer
    quartzjer committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    0828ea3 View commit details
    Browse the repository at this point in the history

  3. updating test app and removing synclet depreciated code

    @quartzjer
    quartzjer committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    46864fc View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Jan 28, 2012
    Configuration menu
    Copy the full SHA
    d4bcfa3 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2012

  1. basic work load scheduling management signals by core

    @quartzjer
    quartzjer committed Jan 31, 2012
    Configuration menu
    Copy the full SHA
    aa565f5 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2012

  1. in-progress reorg for dynamic updating

    @quartzjer
    quartzjer committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    da31166 View commit details
    Browse the repository at this point in the history

  2. background syncing seems to be working now

    @quartzjer
    quartzjer committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    92c035a View commit details
    Browse the repository at this point in the history

  3. better status update in test app, update links to enable querying of … 

    …just encounters, and some better state handling during sync
    @quartzjer
    quartzjer committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    8c5f3d3 View commit details
    Browse the repository at this point in the history

  4. merge conflict fix

    @quartzjer
    quartzjer committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    05c6766 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    8f135e9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @quartzjer
    quartzjer committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    accf22d View commit details
    Browse the repository at this point in the history

  3. starting to migrate to sqlite-cursor since mongo can't handle the tim… 

    …eline
    @quartzjer
    quartzjer committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    860f739 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2012

  1. merge conflict again ugh

    @quartzjer
    quartzjer committed Mar 7, 2012
    Configuration menu
    Copy the full SHA
    15285da View commit details
    Browse the repository at this point in the history