Code

Timeline Collection#398

Code

Open

quartzjer wants to merge 58 commits intoLockerProject:masterLockerProject/Locker:masterfrom quartzjer:masterquartzjer/Locker:masterCopy head branch name to clipboard

+3,998-15

Commits

Commits on Oct 2, 2011

• attempting a clean merge of Timeline, some very funky things happened w/ git so not sure

  quartzjer

  committed
  aec0e73

  Copy full SHA for aec0e73

• cleaning up merge tirds

  quartzjer

  committed
  98ce09e

  Copy full SHA for 98ce09e

Commits on Oct 14, 2011

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  2163f54

  Copy full SHA for 2163f54

Commits on Oct 21, 2011

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  babe16e

  Copy full SHA for babe16e

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  007866e

  Copy full SHA for 007866e

Commits on Nov 2, 2011

• lots of fixes, pretty solid response support, and early link-based deduping

  quartzjer

  committed
  2ffc000

  Copy full SHA for 2ffc000

• fixes to make links more usable

  quartzjer

  committed
  c5efafd

  Copy full SHA for c5efafd

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  503269f

  Copy full SHA for 503269f

• make a bit more sane, still could use a nice refactoring

  quartzjer

  committed
  b33cb83

  Copy full SHA for b33cb83

Commits on Nov 5, 2011

• adding instagram support and checking text-based dedup

  quartzjer

  committed
  f321b0a

  Copy full SHA for f321b0a

• instagram merging and from bugfix

  quartzjer

  committed
  3b6c761

  Copy full SHA for 3b6c761

• fix a regression

  quartzjer

  committed
  99bc058

  Copy full SHA for 99bc058

Commits on Nov 6, 2011

• cleaning up the api endpoints

  quartzjer

  committed
  8a0b798

  Copy full SHA for 8a0b798

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

  quartzjer

  committed
  9fbbc00

  Copy full SHA for 9fbbc00

Commits on Nov 7, 2011

• more timeline fixes and start of a simple viewer

  quartzjer

  committed
  09cf8ce

  Copy full SHA for 09cf8ce

• better update processing and adding ref resolving

  quartzjer

  committed
  6e887ea

  Copy full SHA for 6e887ea

• when a bad response happens, handle the error

  quartzjer

  committed
  d27ed1c

  Copy full SHA for d27ed1c

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  1f48e84

  Copy full SHA for 1f48e84

• ooh, 4sq shouts

  quartzjer

  committed
  2a13169

  Copy full SHA for 2a13169

• take both kinds of ids

  quartzjer

  committed
  d0cc404

  Copy full SHA for d0cc404

• sort default by time, and handle ids better

  quartzjer

  committed
  eaf49d8

  Copy full SHA for eaf49d8

• more bugfixes, and process links on an update

  quartzjer

  committed
  66f4a23

  Copy full SHA for 66f4a23

• simple viewer updates

  quartzjer

  committed
  8deab93

  Copy full SHA for 8deab93

Commits on Nov 13, 2011

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  eb67142

  Copy full SHA for eb67142

Commits on Nov 14, 2011

• wasnt handling real link events properly, fixed

  quartzjer

  committed
  18196af

  Copy full SHA for 18196af

Commits on Nov 18, 2011

• tiny safety check

  quartzjer

  committed
  d8098ab

  Copy full SHA for d8098ab

• fix merge conflict

  quartzjer

  committed
  bf72faf

  Copy full SHA for bf72faf

• trying to add some more query options to test

  quartzjer

  committed
  75f5753

  Copy full SHA for 75f5753

Commits on Dec 14, 2011

• merge conflict

  quartzjer

  committed
  fdc7c8a

  Copy full SHA for fdc7c8a

Commits on Dec 16, 2011

• updated Timeline collection to handle idrs

  smurthas

  committed
  03a2638

  Copy full SHA for 03a2638

Commits on Dec 22, 2011

• Merge pull request #1 from smurthas/timeline

  Show description for de5a197
  quartzjer

  committed
  de5a197

  Copy full SHA for de5a197

• tweak

  quartzjer

  committed
  cc4e6f7

  Copy full SHA for cc4e6f7

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

  quartzjer

  committed
  7fa5846

  Copy full SHA for 7fa5846

Commits on Dec 24, 2011

• merge conflict

  quartzjer

  committed
  c150cf7

  Copy full SHA for c150cf7

Commits on Dec 26, 2011

• general cleanups

  quartzjer

  committed
  af6fabc

  Copy full SHA for af6fabc

Commits on Dec 27, 2011

• converting fixtures to new event format

  quartzjer

  committed
  754809c

  Copy full SHA for 754809c

Commits on Dec 28, 2011

• fixed up and tested all the fixtures, very close

  quartzjer

  committed
  fc931d7

  Copy full SHA for fc931d7

• added instagram-4sq deduping (plus time based), reorgd the code some, and more testing, nearly ready

  quartzjer

  committed
  cd4a4f9

  Copy full SHA for cd4a4f9

• add facebook story support

  quartzjer

  committed
  8ef2d4a

  Copy full SHA for 8ef2d4a

• easier to test it, can expand responses

  quartzjer

  committed
  ef1961c

  Copy full SHA for ef1961c

• more facebook fuzzies

  quartzjer

  committed
  d0ccd95

  Copy full SHA for d0ccd95

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  e629286

  Copy full SHA for e629286

• adding event generation support

  quartzjer

  committed
  1704fd5

  Copy full SHA for 1704fd5

• letting things happen more fluidly, and enabling deep update again

  quartzjer

  committed
  6888fa5

  Copy full SHA for 6888fa5

Commits on Dec 29, 2011

• safely serialize things, if stuff truly happens in parallel the dedup may not catch

  quartzjer

  committed
  005eb70

  Copy full SHA for 005eb70

Commits on Jan 19, 2012

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  4091986

  Copy full SHA for 4091986

• bring up to locker upstream current, fix logger references and generic pathing

  quartzjer

  committed
  0828ea3

  Copy full SHA for 0828ea3

• updating test app and removing synclet depreciated code

  quartzjer

  committed
  46864fc

  Copy full SHA for 46864fc

Commits on Jan 28, 2012

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  d4bcfa3

  Copy full SHA for d4bcfa3

Commits on Jan 31, 2012

• basic work load scheduling management signals by core

  quartzjer

  committed
  aa565f5

  Copy full SHA for aa565f5

Commits on Feb 2, 2012

• in-progress reorg for dynamic updating

  quartzjer

  committed
  da31166

  Copy full SHA for da31166

• background syncing seems to be working now

  quartzjer

  committed
  92c035a

  Copy full SHA for 92c035a

• better status update in test app, update links to enable querying of just encounters, and some better state handling during sync

  quartzjer

  committed
  8c5f3d3

  Copy full SHA for 8c5f3d3

• merge conflict fix

  quartzjer

  committed
  05c6766

  Copy full SHA for 05c6766

Commits on Feb 4, 2012

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  8f135e9

  Copy full SHA for 8f135e9

• Merge remote-tracking branch 'upstream/master'

  quartzjer

  committed
  accf22d

  Copy full SHA for accf22d

• starting to migrate to sqlite-cursor since mongo can't handle the timeline

  quartzjer

  committed
  860f739

  Copy full SHA for 860f739

Commits on Mar 7, 2012

• merge conflict again ugh

  quartzjer

  committed
  15285da

  Copy full SHA for 15285da