Commit graph

305 commits

Author SHA1 Message Date
Samuel Clay
4a82e187c3 Same as 44ac8a027a, but for socialsubs. 2015-09-03 15:18:13 -07:00
Samuel Clay
d0c7e955c7 Showing user ip in social pages. 2015-07-29 13:43:18 -07:00
Samuel Clay
a983d1afe5 Showing user agent in social pages. 2015-07-29 13:37:12 -07:00
Samuel Clay
1a578193a4 Updating to latest pymongo and mongoengine. 2015-07-20 16:44:50 -07:00
Samuel Clay
b27590506c Fixing notuniqueerrors. 2015-07-07 13:34:06 -07:00
Samuel Clay
469e591bde Handling missing shared story when liking a comment. 2015-07-07 13:28:43 -07:00
Samuel Clay
b65c157d86 Adding story_hash to interactions and activities. (For #693). Note that comment_like's may have a null story_hash, although future comment_like's wont. 2015-06-04 15:38:21 -07:00
Samuel Clay
54c5503514 Handling missing twitter usernames. 2015-04-07 10:55:29 -07:00
Samuel Clay
e46d759c18 Adding mark_newer_stories_as_read to socialsubs. Uses story date and not shared date, probably to its detriment. 2015-02-09 16:25:10 -08:00
Samuel Clay
bc75e86074 Adding ratelimit to friends list. 2014-12-08 14:59:30 -08:00
Samuel Clay
a42824e67d Adding user find by id for staff. 2014-09-05 10:46:46 -07:00
Samuel Clay
66daa94ce3 Handling errors with sharing stories. 2014-08-04 15:46:24 -07:00
Samuel Clay
162b0346a5 Only premiums users can share multiple stories from a single feed per day. 2014-06-16 15:51:10 -07:00
Samuel Clay
3ef7a7776d Showing saved/shared story status at bottom on ios. 2014-05-21 12:24:22 -07:00
Samuel Clay
fb061dbb1e Handle find friends case if email is invalid. 2014-03-14 11:51:04 -07:00
Samuel Clay
a46ba555b0 Restricting friend search by email only to staff and exact emails. Thanks to @jmorahan. 2014-03-14 11:44:46 -07:00
Samuel Clay
a03d058874 Better find friends with emails. 2014-03-14 11:04:15 -07:00
Samuel Clay
f6b7a553be Merge branch 'master' into tagging
* master:
  Now forcing image sizing.
  Upgrading feedparser.
  Fixing RSS feed for blurblogs by using permalinks instead of guids.
  Treat 12:00am as occurring at the start of the day
  Adding monit for work server.
  Removing starred stories from mongo backups.
  Logic error.
  New algorithm for figuring out how long to renew.
2014-01-02 13:16:36 -08:00
Samuel Clay
b48f9bb129 Fixing RSS feed for blurblogs by using permalinks instead of guids. 2014-01-02 12:32:16 -08:00
Samuel Clay
65d172ebf3 RSS feed for saved stories. 2013-12-19 11:57:58 -08:00
Samuel Clay
f6bd217eb3 Using timezone-aware relative dates (Today, Yesterdays). 2013-11-22 11:07:14 -08:00
Samuel Clay
a56f44cdef Rewriting short and long date formatting, both for server and ios. Also loading offline stories when server fails half-way through. 2013-11-22 11:06:24 -08:00
Samuel Clay
674356fbed Major refactoring of social blurblog. Also adding a new trimmer, but keeping it turned off. 2013-11-22 11:06:20 -08:00
Samuel Clay
e2e74809dc Fixing missing shared key when sharing a story. 2013-11-22 11:06:19 -08:00
Samuel Clay
db74119842 Using timezone-aware relative dates (Today, Yesterdays). 2013-11-06 23:39:28 -08:00
Samuel Clay
496b6145bb Rewriting short and long date formatting, both for server and ios. Also loading offline stories when server fails half-way through. 2013-10-10 12:58:40 -07:00
Samuel Clay
4acad6e59f Major refactoring of social blurblog. Also adding a new trimmer, but keeping it turned off. 2013-10-07 13:36:10 -07:00
Samuel Clay
d0c4153648 Fixing missing shared key when sharing a story. 2013-10-04 13:05:31 -07:00
Samuel Clay
06eeaaba0b User-dependent days of unread. 14 for free users, 30 for premium. 2013-09-16 17:25:47 -07:00
Samuel Clay
70ea542481 User-dependent days of unread. 14 for free users, 30 for premium. 2013-09-16 16:42:49 -07:00
Samuel Clay
37bb14c13b Merge branch 'master' into tagging
* master: (24 commits)
  Skipping google alerts.
  Fixing a couple exceptions and turning off google news rss feeds temporarily.
  Moving goodies images out of css. New ReadKit image.
  Adding permalink blurblog option. Also adding feed title to unmessaged shares.
  Moving from X-Real-IP to X-Forwarded-For.
  Was using ad hoc and not in house provisioning profile.
  Switching provisioning profiles again.
  Switching to enterprise provisioning profile.
  Fixing provisioning profile.
  Putting out v2.4.4 as a RC.
  Fixing friend user ids when marking stories as read.
  Fixing auto-selection of feeds in feed chooser.
  Moving to simpler read story endpoint.
  Switching provisioning profiles for the year.
  New enterprise build -> 2.4.4. Can be considered an RC1.
  New notifier progress bar.
  Adding messaging to training while offline in both trainer view controller and story detail view controller.
  Users work while offline. Also adding messaging for offline sharing/replying errors.
  Fixing mismatch when marking stories as read when offline.
  Allowing single subscriber feeds to be seen, as it prevented tryfeeds from working.
  ...
2013-09-09 14:18:04 -07:00
Samuel Clay
cff75077b1 Adding permalink blurblog option. Also adding feed title to unmessaged shares. 2013-09-09 12:01:21 -07:00
Samuel Clay
1edf74b8f1 Merge branch 'master' into tagging
* master:
  Handling stats feed count for blurblog itself.
  Showing correct feed titles in blurblog stats.
  Fixing broken social stats.
2013-08-15 17:09:19 -07:00
Samuel Clay
969d92a1d6 Showing correct feed titles in blurblog stats. 2013-08-15 16:32:44 -07:00
Samuel Clay
82f279ea0b Storing user tags and retrieving in all views. 2013-08-13 17:21:41 -07:00
Samuel Clay
9c4e536b9c Stripping tags in blurblog settings. 2013-08-13 14:01:46 -07:00
Samuel Clay
fdd4cdea25 Fixing mistakenly unread stories while searching. 2013-07-29 15:12:46 -07:00
Samuel Clay
12a7767496 Adding search logging. 2013-07-25 17:13:46 -07:00
Samuel Clay
9f30ec5da8 Adding premium-only search message, enforced API-side. Also fixing display bug around hiding the search bar when clearing out query. 2013-07-25 17:05:32 -07:00
Samuel Clay
41b794adf6 Adding search to shared stories, removing from folders. 2013-07-25 11:11:09 -07:00
Samuel Clay
b856ef6199 Fixing exception for malf-romed social page requests. 2013-07-05 17:27:48 -07:00
Samuel Clay
8f5e047772 Removing unused story_db_id field. 2013-07-05 16:53:03 -07:00
Samuel Clay
7b84d65d95 Adding training to new fast river. Ready to ship! 2013-06-28 18:30:20 -07:00
Samuel Clay
85120d3f99 Fixing Twitter sharing by upgrading to API v1.1. 2013-06-12 13:52:43 -07:00
Samuel Clay
3729ca2f72 Fixing unshare story bug. 2013-06-04 15:39:50 -07:00
Samuel Clay
ded52bf397 Returning object on save because mongoengine 0.8.1 no longer automatically returns the object on create. 2013-05-29 19:37:50 -07:00
Samuel Clay
29d9ff46e8 Fixing loading color on blurblogs. 2013-05-22 18:44:56 -07:00
Samuel Clay
76744948be Merge branch 'master' into circular
* master:
  Fixing river blurblog when user has shared one of the stories.

Conflicts:
	apps/social/views.py
2013-05-16 18:27:46 -07:00
Samuel Clay
19316b7689 Fixing river blurblog when user has shared one of the stories. 2013-05-16 18:26:58 -07:00
Samuel Clay
be33aba026 Merge branch 'muserstory_remove' into circular
* muserstory_remove:
  Removing story blurblog permalink, making it called explicitly.

Conflicts:
	apps/social/views.py
2013-05-14 16:38:28 -07:00