Commit Graph

4654 Commits (4b36988115570f4faf5c82de70d7efa86f3bbfd0)

Author SHA1 Message Date
Raymond Yee f0d1116d58 Merge pull request #355 from Gluejar/add_dropbox
close the anchor tags!
2014-05-22 13:38:58 -07:00
eric aa70595842 close the anchor tags! 2014-05-22 16:36:26 -04:00
Raymond Yee 0523458d5c Merge pull request #353 from Gluejar/add_dropbox
fix test
2014-05-22 11:19:53 -07:00
eric fa221f484e landing page now shows three categories
site favorites is now omitted.
useless "withs" removed
category removed if no campaigns
category labels now are calls to action
2014-05-22 14:08:15 -04:00
eric a55c31d3ff fix test 2014-05-22 13:19:05 -04:00
Raymond Yee a83bd18b35 Merge pull request #352 from Gluejar/add_dropbox
Add dropbox
2014-05-22 08:58:10 -07:00
eric ba3878a4b3 remove call-to-action color on send-to-kindle if user not logged in 2014-05-21 15:24:00 -04:00
eric 314847459b remove readmill, add dropbox 2014-05-20 12:19:34 -04:00
Raymond Yee bfb2eba78e Merge pull request #351 from Gluejar/fix_null_thanks
can't thank the author with None
2014-05-19 09:19:13 -07:00
eric b7e4b6defe can't thank the author with None
The thought originally was the user could enter 0. But that's not how
we're doing it
2014-05-19 12:09:47 -04:00
Raymond Yee f2b34ddde9 Merge pull request #350 from Gluejar/license_in_moreinfo
add rights for ebooks without campaigns that we list
2014-05-15 13:51:52 -07:00
eric 358a67928a add rights for ebooks without campaigns that we list 2014-05-15 15:18:11 -04:00
Raymond Yee 4d359b53c1 Merge pull request #348 from Gluejar/list_by_license
List by license [#70951010]
2014-05-14 09:14:03 -07:00
Raymond Yee 7b3d4a3f56 Merge pull request #349 from Gluejar/refresh_landing_press
refresh press links
2014-05-08 23:25:35 -07:00
eric 62c1538a76 refresh press links 2014-05-08 23:32:23 -04:00
eric 8ea10de26a bold the active license type 2014-05-08 13:17:00 -04:00
eric b6c58c4e35 add in active campaigns that match specific license 2014-05-08 13:10:57 -04:00
eric 199f862c5f typo 2014-05-08 12:59:39 -04:00
eric 9303f2639e added to page tests 2014-05-08 11:57:22 -04:00
eric 052f5adbc0 add license descriptions and badges to the pages 2014-05-08 11:54:09 -04:00
eric a3ae7e3177 fix test errors. yay tests. 2014-05-08 10:49:59 -04:00
eric d102854d02 add license-specific view to CC display 2014-05-08 10:22:35 -04:00
eric de6b8555d1 move CC constants into a module 2014-05-08 10:21:50 -04:00
Raymond Yee 66f63c3a3c Merge pull request #342 from Gluejar/fix_double_click
adding a note on how we'll have to deal with this branch because of git ...
2014-05-07 15:47:49 -07:00
Raymond Yee d6116e477f delete README_fix_double_click.md 2014-05-07 15:45:38 -07:00
Raymond Yee d3a988ced9 Merge branch 'fix_double_click' 2014-05-07 15:37:38 -07:00
Raymond Yee c92219f673 Revert "Reverting changes made to fix double click problem -- and moving changes to fix_double_click"
This reverts commit 643d8d358d.
2014-05-07 15:37:19 -07:00
Raymond Yee 94cc760596 Merge pull request #347 from Gluejar/fix_crontab
Fix crontab
2014-05-05 17:52:21 -07:00
Raymond Yee faec10e80a Merge branch 'master' into fix_crontab 2014-05-05 17:51:24 -07:00
Raymond Yee 1867964938 need a LF at end for crontab 2014-05-05 17:46:15 -07:00
Raymond Yee e59f97e5c2 Merge pull request #346 from Gluejar/fix_crontab
set the SHELL, PATH in crontab for just/please
2014-05-05 17:07:10 -07:00
Raymond Yee 918d295509 set the SHELL, PATH in crontab for just/please 2014-05-05 17:04:27 -07:00
Raymond Yee 10bfb0ca27 Merge pull request #345 from Gluejar/refix_b2u_calculator
Refix b2u calculator [#70704708] and [#70681088]
2014-05-05 14:25:18 -07:00
Raymond Yee 91fe83d3a0 Merge pull request #344 from Gluejar/fix_thanks_purchase
Fix thanks purchase
2014-05-05 14:24:19 -07:00
eric 362890e313 improve wording about revenue goal on campaign management page 2014-05-05 16:26:48 -04:00
eric a7b9581919 fix calculator
update_left() was setting current_total to zero
2014-05-05 15:55:20 -04:00
eric da7d6ccfc5 fix send_to_kindle 2014-05-05 12:21:59 -04:00
eric 935c7b4a4c fix issue when an anonymous user logs in (rare) 2014-05-05 12:21:44 -04:00
eric c85a13b05c acq shouldn't be in context for THANKS 2014-05-05 10:15:29 -04:00
eric 53ea120aae acknowledgement missing for logged in users 2014-05-05 10:15:05 -04:00
Raymond Yee d8a8a897d6 Merge pull request #341 from Gluejar/booxtream-account-info
our production account
2014-05-02 14:46:38 -07:00
Raymond Yee bddf0bceae Merge pull request #343 from Gluejar/skip_goodreads_tests
Skipping Goodreads test
2014-05-02 14:21:44 -07:00
Raymond Yee 6bf70c4f79 Skipping Goodreads test 2014-05-02 14:20:37 -07:00
Raymond Yee 4bc527734c adding a note on how we'll have to deal with this branch because of git revert 2014-05-02 14:06:09 -07:00
Raymond Yee 643d8d358d Reverting changes made to fix double click problem -- and moving changes to fix_double_click
Revert "move post monkey subscribe into a task"

This reverts commit 9556c4a792.
2014-05-02 13:59:04 -07:00
Raymond Yee f5fdcb17cd I'd like to have locals.py as the last item in the file 2014-05-02 11:19:05 -07:00
eric ac7d77965d our production account 2014-05-02 14:14:44 -04:00
eric e4cb8f741c prevent double clicks on reg button
This definitely prevents to problem from occurring!
2014-05-02 14:09:01 -04:00
eric 9556c4a792 move post monkey subscribe into a task
I'm not able to verify that this works better
2014-05-02 14:07:59 -04:00
Raymond Yee 3866e7e162 Merge pull request #340 from Gluejar/update_news
point to launch announce on blog
2014-05-01 11:21:15 -07:00