800d0ffdeb
cleanup of css and js imports, also mapping
2013-03-08 14:16:24 -05:00
62627a80cf
fix "next" behavior, poor sign-up/pledge flow [ #40841931 ]
...
Sign In lightbox had broken cookie pusher on reg/auth pages.
Many holes had developed that broke return-to-page-after-auth (for
example, sign-in from pledge page).
Sporadic encoding issues.
2013-03-08 02:43:11 -05:00
90d15b5c9b
modify .errorlist style to round both corners- more flexible
2013-03-07 21:54:32 -05:00
339d4653ab
migrate and clean urls
2013-03-07 21:53:32 -05:00
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
14174ecb17
Merge pull request #135 from Gluejar/list_by_a_publisher
...
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 10:22:32 -08:00
760cbe70cf
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 12:45:27 -05:00
8759dad546
Merge pull request #133 from Gluejar/list_by_a_publisher
...
basic by-publisher list [#45617641 ]
2013-03-06 08:37:18 -08:00
f4550628fc
Merge pull request #134 from Gluejar/fix_mailchimp_testing
...
mailchimp ops now example.org aware, test users, now all changed to exam...
2013-03-06 07:28:46 -08:00
0abeb92a23
on_ml is already boolean
2013-03-06 07:27:51 -08:00
d6a8dedfaa
mailchimp ops now example.org aware, test users, now all changed to example.org
2013-03-06 09:39:06 -05:00
cc6a9b1200
Merge pull request #132 from Gluejar/mailchimp_integration
...
mailchimp integration [finish #37732465 ]
2013-03-05 19:14:09 -08:00
d82959c42f
small typo
2013-03-05 19:10:22 -08:00
3c098d547e
Merge pull request #131 from Gluejar/fix_subject_merge
...
[fix #45405325 ] fix merge subjects, also added test
2013-03-05 16:21:31 -08:00
06b43ed8d1
basic by-publisher list [ #45617641 ]
...
a bit slow, but that's a separate issue.
Not conspicuously surfaces yet, look at the links in the editions list
in rights tab.
2013-03-05 16:18:54 -05:00
392a275ded
test that everything's chimpy
2013-03-04 17:19:39 -05:00
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
99c434d940
[ fix #45405325 ] fix merge subjects, also added test
2013-03-01 13:13:14 -05:00
1852c62e32
Merge pull request #128 from Gluejar/more_instructions_for_RHs
...
put PDF instructions, and both video and PDF screencasts, in context of ...
2013-02-19 09:04:10 -08:00
ed5f7e7a6f
Merge pull request #127 from Gluejar/wishes_api
...
works now orderable by num_wishes in API -> looks good/ runs on my laptop
2013-02-19 08:50:19 -08:00
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
ab28b7d492
put PDF instructions, and both video and PDF screencasts, in context of campaign editing area
2013-02-18 16:22:20 -05:00
ef0bb40f9b
telling people this exists
2013-02-18 15:27:29 -05:00
ed06ac4763
allow for ordering by num_wishes
2013-02-18 15:15:53 -05:00
ada52d5d0c
Merge branch 'master' of github.com:Gluejar/regluit
2013-02-18 09:18:10 -08:00
df0c781f67
change instance for bookloader test -- old example no longer in Google Books
2013-02-18 09:17:15 -08:00
e7bf70fadf
only filter out staff when there are lots of options
2013-02-18 09:09:54 -05:00
017a0ee132
Merge pull request #125 from Gluejar/fix_panel_toggle
...
oh, so that's how this works! [fix #44116341 ]
2013-02-18 06:01:50 -08:00
c153c1f490
Merge pull request #126 from Gluejar/s3_storage
...
S3 storage
2013-02-14 15:24:08 -08:00
95bf4d8ba9
Merge branch 's3_storage' of github.com:Gluejar/regluit into s3_storage
2013-02-11 11:28:13 -08:00
4f46760ab9
Remove prefix for CKEDITOR uploading on production
2013-02-11 11:24:32 -08:00
e1318b5d1e
Don't have any directory prefixes for CKEDITOR uploading in just
2013-02-11 19:18:16 +00:00
c253fd3909
update-just should also do a pip install
2013-02-11 10:54:37 -08:00
ccb331c6ff
Put in S3 keys for just and production
2013-02-11 10:47:03 -08:00
f23ad3a9cb
oh, so that's how this works! [ fix #44116341 ]
2013-02-08 18:21:16 -05:00
c25b13f4c9
specifying specific commit for django-ckeditor
2013-02-08 15:18:58 -08:00
68a44d5891
update to boto 2.8.0 to allow django-storages to run ( https://bitbucket.org/david/django-storages/issue/144/_save-uses-unexpected-kwarg-rewind-257 )
2013-02-08 13:58:48 -08:00
d076fc1e31
Merge branch 'master' into s3_storage
2013-02-08 10:49:02 -08:00
295c308a1a
Merge pull request #123 from Gluejar/tweak_libraries
...
review of html title tag for all pages
2013-02-08 10:16:33 -08:00
a6eee0b854
1) use our custom django-ckeditor which tries to integrate django-storages: git+ssh://git@github.com/Gluejar/django-ckeditor.git@centralniak_merge
...
2) set in common.py placeholders for parameters needed by django-storages for S3
2013-02-08 09:57:23 -08:00
1713998c4c
add google site tools verification while we're at it
2013-02-08 12:40:45 -05:00
3b92187315
Merge branch 'master' of github.com:Gluejar/regluit into s3_storage
2013-02-08 07:55:48 -08:00
02f10de83a
review of html title tag for all pages
2013-02-08 10:12:28 -05:00
5baa519d40
Merge pull request #122 from Gluejar/bind_hijax_properly
...
Bind hijax properly
2013-02-07 06:22:01 -08:00
145ba865db
fade back in feedback div, streamline syntax, make sure to bind to hijax links in footer too
2013-02-07 09:10:46 -05:00
46d373d9dd
reformat URL reference for consistency with the rest
2013-02-07 09:10:20 -05:00
08ad67a447
Merge pull request #121 from Gluejar/fix_url_hygiene
...
handle undefined facets
2013-02-07 05:26:54 -08:00
cf8b862738
handle undefined facets
2013-02-06 18:14:56 -05:00
eb7d77dc5d
don't display staff in ungluers list
2013-02-06 15:05:16 -05:00
243f7fe08c
looks weird when there are 0 ungluers
2013-02-06 15:05:05 -05:00
eric
Raymond Yee
Andromeda Yelton