Commit Graph

697 Commits (af8c3ff1fd51fe7a7e9eb82719efcafee4970f59)

Author SHA1 Message Date
eric af8c3ff1fd merge from master 2013-03-19 10:02:06 -04:00
eric bd9a746422 merge in master 2013-03-18 21:50:22 -04:00
Andromeda Yelton dc8dea0768 moving countdown out of context to models.py, standardizing button appearance 2013-03-15 15:51:17 -04:00
eric 9dbdafed7d There IS a setting for the items per page! 2013-03-15 12:32:29 -04:00
Andromeda Yelton db0eec3b6c Merge branch 'master' into work_page_CTAs 2013-03-13 11:30:28 -04:00
eric 54d0aa1d59 merge master into seo
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
Andromeda Yelton dd1180ab30 notification description field limited to 100 characters 2013-03-12 16:12:11 -04:00
Andromeda Yelton 2da23dbd64 Merge branch 'master' into work_page_CTAs
Conflicts:
	frontend/templates/work.html
	frontend/views.py
	static/css/campaign.css
2013-03-12 15:59:24 -04:00
Andromeda Yelton 655a0a4f35 Merge branch 'master' into comment_notifications 2013-03-12 15:01:45 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
thatandromeda 99ba3499a7 Update signals.py 2013-03-12 11:58:33 -03:00
eric 57ebbc087e merge master into work_page_CTAs 2013-03-11 22:39:48 -04:00
eric f3543bd914 googlebot likes the wishlist feeds- give it more 2013-03-09 17:38:47 -05:00
eric c037764289 sitemaps! [#25581139] 2013-03-09 17:37:33 -05:00
eric d3077c988b links should not point to http from https 2013-03-09 13:29:03 -05:00
eric 22b17d08fa this was causing googlebot crawl errors 2013-03-09 11:52:42 -05:00
eric a2329de3b1 merge master into improve_registration 2013-03-08 17:14:22 -05:00
Raymond Yee 861d8355b3 Merge branch 'scrub_descriptions' 2013-03-08 14:11:38 -08:00
eric 80536a491a superlogin- failed logins check for socialauth and if so, as user to use it
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
eric b327818e89 merge manager_supporter_messages 2013-03-07 15:12:22 -05:00
eric 0f6f433551 official comments now sent to ALL wishers except for commenter 2013-03-07 15:08:21 -05:00
eric 05d37163ea despam descriptions in db
wasn't real happy with this: https://unglue.it/work/66938/ so I looked
for other spammy descriptions in the db
2013-03-07 11:37:40 -05:00
eric a44a505157 optimize the shit out of work lists [#45623361]
so, it turns out you need a migration to apply db-index changes to your
db. blazing speed ensues.
2013-03-06 21:54:12 -05:00
Raymond Yee 0abeb92a23 on_ml is already boolean 2013-03-06 07:27:51 -08:00
eric d6a8dedfaa mailchimp ops now example.org aware, test users, now all changed to example.org 2013-03-06 09:39:06 -05:00
Raymond Yee cc6a9b1200 Merge pull request #132 from Gluejar/mailchimp_integration
mailchimp integration [finish #37732465]
2013-03-05 19:14:09 -08:00
eric a56222426e set queueing to use the master switch
use NOTIFICATION_QUEUE_ALL = False in m.py for testing
2013-03-04 23:11:50 -05:00
eric 392a275ded test that everything's chimpy 2013-03-04 17:19:39 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric 99c434d940 [fix #45405325] fix merge subjects, also added test 2013-03-01 13:13:14 -05:00
eric a53c99e295 decided that supporter_message signal belonged in core 2013-03-01 09:46:52 -05:00
eric d08ca3efbd Turns out site was already in context for notifications as "current_site"
Also, added sender to notification calls for messages and comments
2013-02-28 16:04:41 -05:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
eric 9811012bf3 fix rare bugs 2013-02-25 18:31:37 -05:00
eric 242cb66451 mitigate bug for campaigns that didn't get a success date 2013-02-21 15:57:49 -05:00
eric 596d19596c UI work for managers to contact supporters [#36991391] 2013-02-21 15:10:01 -05:00
Raymond Yee da3d542587 Merge pull request #120 from Gluejar/no_staff_in_ungluers_list
No staff in ungluers list
2013-02-19 08:38:27 -08:00
Raymond Yee df0c781f67 change instance for bookloader test -- old example no longer in Google Books 2013-02-18 09:17:15 -08:00
Andromeda Yelton e7bf70fadf only filter out staff when there are lots of options 2013-02-18 09:09:54 -05:00
Andromeda Yelton eb7d77dc5d don't display staff in ungluers list 2013-02-06 15:05:16 -05:00
Andromeda Yelton cd40fe99ef making it faster 2013-02-04 13:32:21 -05:00
Andromeda Yelton fa7e0b20de addressing feedback 2013-01-04 15:12:35 -05:00
Andromeda Yelton 8867724ae9 make a work's rightsholders accessible from the templates 2013-01-03 13:18:00 -05:00
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -05:00
eshellman a6186e3bc6 Merge pull request #90 from Gluejar/prettier_acks
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
eric e305a1ee74 Merge branch 'master' into prettier_acks 2013-01-02 10:53:05 -05:00
eshellman c22403356c Merge pull request #99 from Gluejar/correct_ungluing_date
add success_date property to campaign so we can accurately report it whe...
2012-12-31 12:28:47 -08:00
Andromeda Yelton f4a269f5ac returning empty string rather than False 2012-12-31 15:02:39 -05:00
Andromeda Yelton 47c44b20d5 add success_date property to campaign so we can accurately report it when it differs from campaign deadline 2012-12-31 11:00:45 -05:00