Commit graph

11299 commits

Author SHA1 Message Date
Samuel Clay
d4daf1ac5a Merge branch 'master' into dashboard_river
* master:
  Attempting to add logging to socket.io.
  Reloading feeds when adding a subscription.
2016-12-05 13:50:36 -08:00
Samuel Clay
b222ee06d0 Attempting to add logging to socket.io. 2016-12-05 13:35:05 -08:00
Samuel Clay
93fb81150e Reloading feeds when adding a subscription. 2016-12-05 12:46:09 -08:00
Samuel Clay
a0ef96e744 Merge branch 'master' into dashboard_river
* master:
  Updating psutil dependency.
2016-12-02 19:10:58 -08:00
Samuel Clay
814224689f Updating psutil dependency. 2016-12-02 19:10:54 -08:00
Samuel Clay
a65ec943bf Updating psutil dependency deprecation. 2016-12-02 19:10:01 -08:00
Samuel Clay
a650df9f90 Updating psutil dependency deprecation. 2016-12-02 19:08:45 -08:00
Samuel Clay
4099a07f07 Fixing last remaining known issue with dashboard stories. 2016-12-02 19:04:48 -08:00
Samuel Clay
1daf756502 Merge branch 'master' into dashboard_river
* master:
  Updating all dependencies in prep for upgrading to django 1.10 (from 1.5.0).
  Not sur ewhy supervisor isn't starting on boot.
  Updating to ubuntu 16.04 LTS
2016-12-02 17:12:42 -08:00
Samuel Clay
9d3c394c79 Updating all dependencies in prep for upgrading to django 1.10 (from 1.5.0). 2016-12-02 17:03:21 -08:00
Samuel Clay
1d4500d0ad Not sur ewhy supervisor isn't starting on boot. 2016-12-02 13:06:16 -08:00
Samuel Clay
853e5d0c0f Updating to ubuntu 16.04 LTS 2016-12-02 12:37:23 -08:00
Samuel Clay
702090fdcc Transitions on the sideoption buttons were causing delays. 2016-12-01 19:25:59 -08:00
Samuel Clay
d91c47d856 Fixing accidental layout override. 2016-12-01 19:23:38 -08:00
Samuel Clay
e237257b3d Forget paging when transfering dashboard stories, but preserve the stories already there. 2016-12-01 18:05:41 -08:00
Samuel Clay
1b46f190f1 Handling intelligence in dashboard river module. This is ready to launch! 2016-12-01 16:54:13 -08:00
Samuel Clay
07454cf3cc Dashbaord stories now reflect read state. Just need focus. 2016-12-01 16:22:51 -08:00
Samuel Clay
da754eca84 Syncing read status on dashboard to river. 2016-12-01 15:06:19 -08:00
Samuel Clay
6232e902e3 Merge branch 'master' into dashboard_river
* master:
  Android v5.0.0b3.
  basic support for notifications (#966)
  clean up feed dao, add support for notification config from server (#966)
  don't let stuck actions block sync entirely
  option to require confirmation for range-marks (#965)
  remove commented code
2016-12-01 14:58:18 -08:00
Samuel Clay
8bc174e590 Android v5.0.0b3. 2016-12-01 14:58:12 -08:00
Samuel Clay
fc680a197e Free users are restricted even on the dashboard river. 2016-12-01 14:51:53 -08:00
Samuel Clay
11b3a1edff Filling out dashboard stories to handle hidden stories. Needs focus stories handling and marking read elsewhere. 2016-12-01 14:27:18 -08:00
Samuel Clay
587e7fb2a6 Mimicking river on dashboard w.r.t. visible feeds (unread vs read). 2016-12-01 12:47:01 -08:00
Samuel Clay
85e08cbedc Merge pull request #970 from dosiecki/master
Android: Confirmations, Better Sync, Beta Notifications
2016-12-01 15:41:26 -05:00
dosiecki
a85a6099db basic support for notifications (#966) 2016-12-01 05:56:48 -08:00
dosiecki
ed198a1e07 clean up feed dao, add support for notification config from server (#966) 2016-12-01 00:48:15 -08:00
dosiecki
4cdf0fb457 don't let stuck actions block sync entirely 2016-12-01 00:06:08 -08:00
Samuel Clay
4e1bc928a8 Fixing issue with scrolling story titles. 2016-11-30 20:06:24 -08:00
Samuel Clay
3b9371bf05 Cleaning up layout on story titles. 2016-11-30 19:39:49 -08:00
Samuel Clay
933e395468 Select story in feed 2016-11-30 19:27:11 -08:00
Samuel Clay
52db1011a9 Separating dashboard river and regularly stories. 2016-11-30 18:53:32 -08:00
Samuel Clay
9ec30fcfe8 Further refining styling 2016-11-30 18:16:53 -08:00
Samuel Clay
6ceee35a66 Overriding layout on dashboard. 2016-11-30 17:55:25 -08:00
Samuel Clay
0a1dacff59 Merge branch 'master' into dashboard_river
* master:
  Original page server dependencies.
  Fixing original page server.
  Attempting to fix original pages.
  Adding node02 to handle new upgraded websockets.
  In case mongodb isn't connected on favicon server.
  In case mongodb isn't connected on favicon server.
  Moving to new v2 of socket.io to allow existing real-time users to still work.
  Logging favicon mongo host.
  Fixing nodejs redis flush/quit command.
  Better logging for favicons.
  Updating to latest mongodb for nodejs lib.
  Upgrading favicon server to latest express.
  Fixing SSL node server, used for debugging.
  Upgrading to latest socket.io.
  Updating node dependencies.
2016-11-30 17:41:05 -08:00
Samuel Clay
576a776f1a Original page server dependencies. 2016-11-30 17:17:50 -08:00
Samuel Clay
3a93ad7248 Fixing original page server. 2016-11-30 17:17:40 -08:00
Samuel Clay
ca6853fc6d Attempting to fix original pages. 2016-11-30 16:09:26 -08:00
Samuel Clay
5a053ab573 Adding node02 to handle new upgraded websockets. 2016-11-30 15:26:42 -08:00
dosiecki
7d2dffc576 option to require confirmation for range-marks (#965) 2016-11-30 14:07:28 -08:00
Samuel Clay
11fb7dd841 In case mongodb isn't connected on favicon server. 2016-11-30 13:45:54 -08:00
Samuel Clay
7dcb16605e In case mongodb isn't connected on favicon server. 2016-11-30 13:44:50 -08:00
Samuel Clay
7fcc8a4c71 Moving to new v2 of socket.io to allow existing real-time users to still work. 2016-11-30 13:43:13 -08:00
Samuel Clay
74da2c1fff Logging favicon mongo host. 2016-11-30 12:57:29 -08:00
Samuel Clay
e3393ba238 Fixing nodejs redis flush/quit command. 2016-11-30 12:47:20 -08:00
Samuel Clay
95a6d4ce09 Better logging for favicons. 2016-11-30 12:38:31 -08:00
Samuel Clay
332a9a55ca Updating to latest mongodb for nodejs lib. 2016-11-30 12:29:24 -08:00
Samuel Clay
f8028c316c Upgrading favicon server to latest express. 2016-11-30 12:09:49 -08:00
Samuel Clay
5edf17e08f Fixing SSL node server, used for debugging. 2016-11-29 18:47:44 -08:00
Samuel Clay
406d196f87 Upgrading to latest socket.io. 2016-11-29 18:30:12 -08:00
Samuel Clay
23bdbb85a1 Updating node dependencies. 2016-11-29 18:29:50 -08:00