Commit graph

1983 commits

Author SHA1 Message Date
Samuel Clay
539fb5869f Adding fake stories to training page in tutorial. Just need to hook up the slider to hide/show the stories. 2011-05-19 20:03:28 -04:00
Samuel Clay
e180f8a224 Merge branch 'master' into tutorial 2011-05-19 19:13:57 -04:00
Samuel Clay
c2b1d7eb35 Fixing the infernal FeedNotFound error whenever a dupe feed is created in the middle of another transaction. Yarr! 2011-05-19 19:04:10 -04:00
Samuel Clay
3be758d8ac Intelligence on step 2. Not interactive yet, just needs the stories. 2011-05-19 12:27:32 -04:00
Samuel Clay
247a0b824d Finishing page 2, adding page 5 which has links to twitter, get satisfaction, the blog (even loads the blog), and is a good last page. 2011-05-18 22:33:42 -04:00
Samuel Clay
aaf83ed7a0 Merge branch 'master' into tutorial 2011-05-18 17:51:58 -04:00
Samuel Clay
a909c675b8 Cleaning up mongo backup. 2011-05-18 14:59:05 -04:00
Samuel Clay
7d13d508de Merge branch 'master' of github.com:samuelclay/NewsBlur 2011-05-18 14:36:54 -04:00
Samuel Clay
06a46993d2 Backup mongo + psql. Removing ridiculous FeedUpdateHistory table. 2011-05-18 14:36:31 -04:00
Samuel Clay
7bc60ec784 Switching to mongoengine dev on github. 2011-05-18 14:23:43 -04:00
Samuel Clay
c029c863cd Finishing up copy changes for step 2 - views. Laying out step 4 - tips. 2011-05-18 10:19:02 -04:00
Samuel Clay
48cd442625 Tips and tricks is fully tricked out. Now need to pare it down by a lot. 2011-05-17 11:05:38 -04:00
Samuel Clay
7b77d0b997 Partially stubbing out step 2 and 4. 2011-05-16 23:13:49 -04:00
Samuel Clay
58a24c32c7 Adding collapsed folder icon. Also fixing scroll on story manage menu in feed view. 2011-05-16 11:34:05 -04:00
Samuel Clay
b22bbf98b8 Feed icons for recommended feeds. 2011-05-14 12:50:11 -04:00
Samuel Clay
5adf024dda Finishing all boilerplate to the tutorial. This includes the preference to show/hide tutorial, and hiding the dashboard module. 2011-05-13 10:15:56 -04:00
Samuel Clay
913fc49c3a Adding profile field for completing the tutorial. 2011-05-12 18:15:15 -04:00
Samuel Clay
4275966b72 Merge branch 'master' into tutorial 2011-05-12 18:13:46 -04:00
Samuel Clay
a4965d696e Merge branch 'master' of github.com:samuelclay/NewsBlur 2011-05-12 17:56:38 -04:00
Samuel Clay
8a68abb22c Missing JSON response context for api/signup and api/logout. 2011-05-12 17:56:24 -04:00
Samuel Clay
2de8f6dc2e Cleaning up index page by removing howitworks random start and a bit of logic. 2011-05-11 20:25:01 -04:00
Samuel Clay
0bf05d11b5 Finishing paging. Now just need to add the page layouts and hiding preference. 2011-05-11 20:18:33 -04:00
Samuel Clay
03d370b040 Adding paging to tutorial. Also adding the tutorial dashboard image. Colorful. 2011-05-11 12:27:28 -04:00
Samuel Clay
d195b3803c Deleting feeds from folders if they are coming from the toplevel (i.e. no folder specified). This is to handle the cases where we no longer know the feed's folder, but we're deleting it anyhow. Only deletes the first case, anyway. Not ideal, but pretty close. 2011-05-11 09:51:16 -04:00
Samuel Clay
53d9724e0e Adding in tutorial module on dashboard, hooking up tutorial launcher button and tutorail launcher menu item to open the new tutorial dialog. 2011-05-10 18:30:35 -04:00
Samuel Clay
aa1e8c10b5 Merge branch 'master' into tutorial 2011-05-10 18:20:52 -04:00
Samuel Clay
0139cf439f Working out a better fix for oauthtokens that are missing. 2011-05-10 13:53:51 -04:00
Samuel Clay
ecca990d88 Working out a better fix for oauthtokens that are missing. 2011-05-10 13:50:46 -04:00
Samuel Clay
7c91ef2001 Emergency bug fix for missing oauthtokens during reader import. 2011-05-10 13:49:00 -04:00
Samuel Clay
9f3cd3d05b Stubbing in the new tutorial. 2011-05-09 20:59:52 -04:00
Samuel Clay
14d412422b 9 line changes and we get scrolling on the dashboard. Much needed relief. 2011-05-09 18:33:46 -04:00
Samuel Clay
7b9df8dadc Anonymous users will see a warning on sending an email. Also removing FeedIcon model (having switched to the mongo MFeedIcon model). 2011-05-09 10:35:46 -04:00
Samuel Clay
1eb844fde6 Obvious defects in sending emails. Adding logging. 2011-05-09 10:17:42 -04:00
Samuel Clay
9ed4cd6bbb Merge branch 'master' into timezone_features
Conflicts:
	apps/reader/views.py
	templates/reader/feeds.xhtml
	utils/templatetags/utils_tags.py
2011-05-08 20:45:32 -04:00
Samuel Clay
e00dc9914b Text change in emailed stories for plain text version. 2011-05-08 20:37:06 -04:00
Samuel Clay
f124d24450 Cleaning up from address in shared stories. 2011-05-08 20:34:52 -04:00
Samuel Clay
e24a32d329 Cleaning up from address in shared stories. 2011-05-08 20:32:02 -04:00
Samuel Clay
0b4527c3f0 Cleaning up emailed stories. 2011-05-08 20:24:37 -04:00
Samuel Clay
ff09a6f262 Fixing bookmarklet add_site when the token is bad. 2011-05-08 19:52:41 -04:00
Samuel Clay
5d4c7565e9 Story text in shared/emailed stories. Extracting text for plain/text emails. 2011-05-08 19:41:50 -04:00
Samuel Clay
56e0292197 Using new django1.3 logging. Adding SQL middleware for use in development. Pretty SQL. 2011-05-08 19:25:58 -04:00
Samuel Clay
390f8489dc jQuery 1.5.1 -> jQuery 1.6.1pre. 2011-05-07 21:33:42 -04:00
Samuel Clay
c6ebb58cf8 Merge branch 'master' of github.com:samuelclay/NewsBlur into send_email 2011-05-07 21:12:24 -04:00
Samuel Clay
03d74d5313 Cleaning up the send email dialog (as well as the add site dialog). Everything looks great, save for an email icon and a bit more validation. 2011-05-07 21:12:13 -04:00
Samuel Clay
7b56516f48 Removing 'Less than [a minute ago]' from feedback date. 2011-05-07 18:52:11 -04:00
Samuel Clay
da7e36db2e Sending html/text emails based on user input. Just need to add some validation and potential cleanups. The form is kinda ugly. 2011-05-07 17:58:53 -04:00
Samuel Clay
504d7d94da Adding feedback archiving for instant loads. Feedback is now on the dashboard. 2011-05-07 17:22:41 -04:00
Samuel Clay
54a10301b9 Adding community feedback to whats new module on dashboard. 2011-05-07 12:06:51 -04:00
Samuel Clay
c7af661047 Removing unneccessary logging. 2011-05-06 11:04:03 -04:00
Samuel Clay
079e0b0ded Front-end complete. Need to send the email now. 2011-05-06 10:06:13 -04:00