Commit Graph

4403 Commits (7f94ffb808ad1174dc3f528cf5237a042d20d05c)

Author SHA1 Message Date
eric db6648cc07 edition editor can now delete authors [#66337430] 2014-03-07 16:42:57 -05:00
Raymond Yee 0f52acfe45 Merge pull request #308 from Gluejar/fix_twitter_avatars
fix twitter avatars [#66896902]
2014-03-06 16:21:40 -08:00
eric f27b111117 fix twitter avatars [#66896902] 2014-03-06 17:53:37 -05:00
Raymond Yee 38764a12d3 Merge pull request #302 from Gluejar/add_marvin
Add marvin, update ibooks, readmill instructions
2014-03-05 19:47:41 -08:00
Raymond Yee ade5b7209c Merge pull request #307 from Gluejar/landing_page_cc
Give more prominence to CC books on landing page
2014-03-05 19:25:03 -08:00
eric 7fba1a212b Give more prominence to CC books on landing page 2014-03-05 14:02:12 -05:00
Raymond Yee 8af7dfcb88 Merge pull request #306 from Gluejar/t4u_check_launched
the request for money is only shown if the campaign is active, or in tes...
2014-03-04 16:46:52 -08:00
eric 4d0d42f5ae the request for money is only shown if the campaign is active, or in test mode 2014-03-04 15:49:59 -05:00
Raymond Yee d200966a8d Merge pull request #305 from Gluejar/faq_rh
various improvements in documentation
2014-03-04 09:20:11 -08:00
eric a1d5f5f5d9 various improvements in documentation 2014-03-03 22:11:43 -05:00
Raymond Yee 3fb757b390 Merge pull request #301 from Gluejar/t4u_download
T4u download
2014-03-03 17:31:05 -08:00
eric 7ada015a39 One more instance of wish list 2014-03-03 20:24:54 -05:00
eric 6bcbf05095 assorted references to "wish list"
Still need work on press page
2014-03-03 18:21:01 -05:00
eric a3ec4b062d fix bugs found by Raymond 2014-03-03 16:51:33 -05:00
Raymond Yee 54cd6a42c6 Merge branch 't4u_download' into add_marvin 2014-03-03 11:37:25 -08:00
Raymond Yee 256c60fbfc Merge branch 'master' into t4u_download
Conflicts:
	core/models.py
2014-03-03 11:08:50 -08:00
Raymond Yee 614ae3bb08 Merge branch 't4u_download' of github.com:Gluejar/regluit into t4u_download 2014-03-03 08:09:31 -08:00
Raymond Yee 2a90442ab7 Merge pull request #304 from Gluejar/unglued_b2u_mobi
less fake test
2014-03-01 20:01:14 -08:00
eric 4d2054af07 less fake test 2014-03-01 22:42:26 -05:00
Raymond Yee f9b6b7abbf Merge pull request #303 from Gluejar/unglued_b2u_mobi
fix two bugs
2014-03-01 17:04:43 -08:00
eric 3986124464 fix two bugs 2014-03-01 17:13:57 -05:00
Raymond Yee 4f124e63f4 Merge pull request #292 from Gluejar/unglued_b2u_mobi
Unglued b2u mobi, mobi testing, and require file review
2014-02-28 17:22:35 -08:00
Raymond Yee 2a55277302 Campaign moved from payment to core 2014-02-28 15:32:50 -08:00
eric 0660103961 wishlist text hiding in javascript 2014-02-25 23:17:44 -05:00
Raymond Yee 6a463383a3 Merge branch 't4u_download' into add_marvin 2014-02-25 19:32:44 -08:00
Raymond Yee c292a6b3be Merge branch 'master' into add_marvin 2014-02-25 19:32:31 -08:00
Raymond Yee ae531e0d7d Merge branch 'master' into t4u_download 2014-02-25 19:10:01 -08:00
eric ccafd90625 Add ebookfile status and links to info page. 2014-02-25 14:47:16 -05:00
eric e72f55f919 it turns out that offer editing didn't quite work 2014-02-25 14:29:54 -05:00
eric 482d9be31d add b2u test links to campaign management page 2014-02-25 13:58:33 -05:00
eric bd829aff25 On reflection, files_reviewed was a bad idea 2014-02-25 12:54:14 -05:00
Raymond Yee 7fda4abd1c Merge branch 'master' into unglued_b2u_mobi 2014-02-24 14:44:13 -08:00
Raymond Yee 4fd68bb494 Merge pull request #294 from Gluejar/better_sendtokindle
improved send-to-kindle
2014-02-24 14:42:05 -08:00
eric acfeb35c39 added an image of Facebook embedded browser in iPhone iOS7
we should probably be looking as adding iPhone stylesheets, but…
2014-02-24 17:18:05 -05:00
eric cc0f5d9fdb update for marvin, mavericks, read mill on android
for mavericks- ibooks should be pre-installed.
Readmill now available on Android.
Marvin is linking to us, we’re reciprocating
2014-02-24 16:58:16 -05:00
Raymond Yee 5547a54332 Merge branch 'master' into better_sendtokindle 2014-02-24 10:30:24 -08:00
Raymond Yee a11e5a61fc Merge pull request #293 from Gluejar/useability_tweaks
Useability tweaks to campaign creation
2014-02-24 10:11:17 -08:00
Raymond Yee 62737954cb Merge branch 'master' into useability_tweaks 2014-02-24 10:07:09 -08:00
Raymond Yee a87065f70e Merge branch 'master' into unglued_b2u_mobi 2014-02-21 13:24:20 -08:00
eric 1c9c953e30 fix email notice 2014-02-21 15:23:56 -05:00
eric 665fd94e73 decrudify and update emailshare 2014-02-21 14:12:20 -05:00
eric 92e870d2b7 Merge branch 'master' into t4u_download 2014-02-21 13:18:04 -05:00
eric e66c54e3dc fix test failures 2014-02-21 13:16:55 -05:00
eric e8dc4121fa show beg always with an offer id; auto set the price for libraries 2014-02-20 16:53:30 -05:00
eric c7abcb357b report anonymous contributions 2014-02-20 16:31:13 -05:00
eric 678eb02847 Thanks works with anonymous user 2014-02-20 15:56:10 -05:00
eric 737cf91c66 complete switch to "Faves/Favorites" language 2014-02-19 23:16:28 -05:00
eric b5fd630bfc Thanks mostly works. 2014-02-19 22:18:23 -05:00
Raymond Yee 7cf5d81b55 Merge pull request #300 from Gluejar/unglueit_file_name
updating bucket name on unglue.it
2014-02-19 17:24:39 -08:00
Raymond Yee 58896c9b2b updating bucket name on unglue.it 2014-02-19 17:22:45 -08:00