Commit graph

11117 commits

Author SHA1 Message Date
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
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
Samuel Clay
4c40f06c98 Stubbing in dashboard river. Has bugs around loading pages. 2016-11-29 17:26:17 -08:00
Samuel Clay
6f8c2ca780 Fixing styling of tags and font sizing in story header on web. 2016-11-29 13:09:05 -08:00
Daniel
7abd464750 Merge pull request #969 from manderson23/mute
Android: Use ReadingAction for mute/unmute.
2016-11-28 14:32:33 -08:00
Mark Anderson
e1d50f37d1 Use ReadingAction for mute/unmute. 2016-11-27 22:52:59 +00:00
Samuel Clay
cc4f3fbaeb Fixing drag on saved stories and social stories. Also fixing background color on profile activities. 2016-11-27 16:30:57 -05:00
Samuel Clay
f86006794d Fixing username sizing on blurblog. Thanks to J. Leeuwen for finding this. 2016-11-27 15:11:18 -05:00
Samuel Clay
c7d2d5f69e Fixing bug when deleting feeds. 2016-11-25 15:03:18 -05:00
Samuel Clay
b5e0870fa8 Merge pull request #958 from da2x/patch-1
HTTP feed fetcher improvements
2016-11-25 13:02:44 -06:00
Samuel Clay
405a99b9a2 Adding preference for left-swiping feed titles to either show notifications (default) or trainer (old default). 2016-11-24 16:41:41 -05:00
Samuel Clay
1017ba3fe8 Alphabetizing notifications. 2016-11-24 14:47:35 -06:00
Samuel Clay
1e6ea0be67 Saving notifications on iOS. Just need to update local feed dict on save. 2016-11-23 15:37:06 -06:00
Samuel Clay
d18d9ab7b9 Mutli select segmented control. Now just need to save and we're done. 2016-11-23 15:15:18 -06:00
Samuel Clay
13851105a3 Selecting correct notification filter. Notification type will need a custom segmented control to handle multiple selections. 2016-11-23 15:05:30 -06:00
Samuel Clay
ca1455e46e Finished styling notifications on ios. Needs web hookup. 2016-11-23 14:37:49 -06:00
Samuel Clay
671b0667ae Feeds are now loaded in notifications table. Now to build the cells and save notification types. 2016-11-23 13:22:12 -06:00
Samuel Clay
47a7126c91 Stubbing in notifications table. Now needs notification feed cells. 2016-11-23 13:22:12 -06:00
Samuel Clay
56c03d113a Stubbing in notifications editor on iOS. 2016-11-23 13:22:12 -06:00
Samuel Clay
8969ed2145 Hiding notifications from non-staff on web in feed popover. 2016-11-22 18:36:41 -08:00
Samuel Clay
e49e5a41b9 Android v5.0.0b2 2016-11-22 17:33:13 -08:00
Samuel Clay
844cd18688 Fixing date/author/tags size on web. 2016-11-22 17:33:13 -08:00
Samuel Clay
7da44d8288 Merge pull request #968 from manderson23/mute
Android: Support for muting feeds
2016-11-22 15:31:05 -08:00
Mark Anderson
8d03d27348 Merge remote-tracking branch 'upstream/master' into mute 2016-11-22 23:03:49 +00:00
Mark Anderson
c5da62ad8a Only include active feeds when marking a folder as read. 2016-11-22 23:03:18 +00:00
Samuel Clay
c1f8b9e873 Merge pull request #967 from dosiecki/master
Android: bugfixes
2016-11-22 13:16:24 -08:00
dosiecki
5ad450e9b7 clarify ambiguous preview option 2016-11-22 13:09:37 -08:00
dosiecki
6313a6f787 fix story row bordering (#963) 2016-11-22 02:33:53 -08:00
dosiecki
848a7645b3 fix crash on thumbnail load 2016-11-22 02:10:51 -08:00
dosiecki
600660e0f9 story row date and author justify to bottom when possible (#963) 2016-11-22 02:09:26 -08:00
Samuel Clay
d293ffcf9d Adding notifications to feed popover on web. 2016-11-21 20:21:44 -08:00
Samuel Clay
e90f0637f9 Fixing bug when testing push notifications. 2016-11-21 18:17:39 -08:00
Samuel Clay
2597f83ae2 Adding user count to notifications tester. 2016-11-21 18:12:52 -08:00