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 |
eric
|
810882ac0f
|
point to launch announce on blog
|
2014-05-01 14:19:49 -04:00 |
Raymond Yee
|
0e8554978b
|
Merge pull request #339 from Gluejar/remove_t4u_extra_links
remove extra links
|
2014-04-30 14:31:52 -07:00 |
eric
|
10256e9eb5
|
remove extra links
in b2u, it was assumed that an acq=> mobi and epub, but t4u uses acqs
just for recording a contribution
|
2014-04-30 17:29:41 -04:00 |
Raymond Yee
|
e93bc62180
|
Merge pull request #338 from Gluejar/fix_personalizer
patch the personalizer
|
2014-04-30 12:22:14 -07:00 |
eric
|
183dea1511
|
patch the personalizer
|
2014-04-30 15:17:10 -04:00 |
Raymond Yee
|
3fbd546974
|
Merge pull request #337 from Gluejar/fix_pub_lists
keep the book panels where they belong
|
2014-04-29 19:07:03 -07:00 |
eric
|
0b4d670226
|
keep the book panels where they belong
|
2014-04-29 21:51:52 -04:00 |
Raymond Yee
|
8e39548740
|
Merge pull request #336 from Gluejar/rh_create_work
rights holder can create new work
|
2014-04-29 18:16:25 -07:00 |
eric
|
0934984f8f
|
rights holder can create new work
|
2014-04-29 21:07:24 -04:00 |
Raymond Yee
|
5ee4f7c4df
|
Merge pull request #335 from Gluejar/improve_lists
Improve lists and landing page for launch
|
2014-04-29 18:01:27 -07:00 |
eric
|
af17403e97
|
add links to campaigns from campaign faqs
|
2014-04-29 20:04:29 -04:00 |
eric
|
958d963f75
|
add campaign list for each campaign type
|
2014-04-29 20:03:33 -04:00 |
eric
|
6e034c58e0
|
unclutter the bottom of the landing page
|
2014-04-29 16:16:00 -04:00 |
Raymond Yee
|
27d11b4598
|
Merge pull request #334 from Gluejar/fix_t4u_ebookfiles
improve edition and upload management for campaigns
|
2014-04-29 13:14:24 -07:00 |
eric
|
ece091b812
|
edition editing and file upload was very confusing
hope this is an improvement
|
2014-04-29 14:53:18 -04:00 |
eric
|
59997cfda1
|
reset selected edition on campaign save
|
2014-04-29 14:51:49 -04:00 |
Raymond Yee
|
daeac45d72
|
Merge pull request #333 from Gluejar/fix_t4u_ebookfiles
missed a commit
|
2014-04-28 13:41:35 -07:00 |
eric
|
390e6864f5
|
missed a commit
|
2014-04-28 16:31:31 -04:00 |
Raymond Yee
|
0e82091ae6
|
Merge pull request #332 from Gluejar/fix_t4u_ebookfiles
one more thing - indicate that download page is missing ebook links
|
2014-04-28 12:19:17 -07:00 |
eric
|
2ee1a1d34d
|
one more thing - indicate that download page is missing ebook links
|
2014-04-28 15:14:46 -04:00 |
Raymond Yee
|
2219e52c98
|
Merge pull request #331 from Gluejar/fix_null_edition
handle exception when no edition
|
2014-04-28 11:27:47 -07:00 |
eric
|
1c923e63b6
|
handle exception when no edition
Occurred for 100 years of solitude probably during regrouping
|
2014-04-28 14:23:43 -04:00 |
Raymond Yee
|
c31e10f9ca
|
Merge pull request #330 from Gluejar/fix_t4u_ebookfiles
pdf and mobi uploaded ebook files now displayed in campaign management
|
2014-04-28 09:21:39 -07:00 |
eric
|
9287825d6e
|
pdf and mobi not displayed in campaign management
|
2014-04-28 10:59:03 -04:00 |
Raymond Yee
|
a95d9c190f
|
Merge pull request #329 from Gluejar/fix_api_error
Fix widget error
|
2014-04-24 06:05:44 -07:00 |
eric
|
d03f16e886
|
add test for widget
|
2014-04-24 07:55:32 -04:00 |
eric
|
13d5bc88fe
|
widget was rather crufty!
|
2014-04-23 19:41:43 -04:00 |
Raymond Yee
|
7de3f1063d
|
Merge pull request #328 from Gluejar/improve_schema_org
Improve schema org
|
2014-04-16 15:42:57 -07:00 |