Commit Graph

3350 Commits (89221fbe82cfb41d1d1c25bebccf5b58e60b79bb)

Author SHA1 Message Date
eric 89221fbe82 ajax submission and error handling 2013-02-25 18:32:22 -05:00
eric 9811012bf3 fix rare bugs 2013-02-25 18:31:37 -05:00
eric 596d19596c UI work for managers to contact supporters [#36991391] 2013-02-21 15:10:01 -05:00
eshellman c153c1f490 Merge pull request #126 from Gluejar/s3_storage
S3 storage
2013-02-14 15:24:08 -08:00
Raymond Yee 95bf4d8ba9 Merge branch 's3_storage' of github.com:Gluejar/regluit into s3_storage 2013-02-11 11:28:13 -08:00
Raymond Yee 4f46760ab9 Remove prefix for CKEDITOR uploading on production 2013-02-11 11:24:32 -08:00
Raymond Yee e1318b5d1e Don't have any directory prefixes for CKEDITOR uploading in just 2013-02-11 19:18:16 +00:00
Raymond Yee c253fd3909 update-just should also do a pip install 2013-02-11 10:54:37 -08:00
Raymond Yee ccb331c6ff Put in S3 keys for just and production 2013-02-11 10:47:03 -08:00
Raymond Yee c25b13f4c9 specifying specific commit for django-ckeditor 2013-02-08 15:18:58 -08:00
Raymond Yee 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
Raymond Yee d076fc1e31 Merge branch 'master' into s3_storage 2013-02-08 10:49:02 -08:00
Raymond Yee 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
Raymond Yee 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
eric 1713998c4c add google site tools verification while we're at it 2013-02-08 12:40:45 -05:00
Raymond Yee 3b92187315 Merge branch 'master' of github.com:Gluejar/regluit into s3_storage 2013-02-08 07:55:48 -08:00
eric 02f10de83a review of html title tag for all pages 2013-02-08 10:12:28 -05:00
eshellman 5baa519d40 Merge pull request #122 from Gluejar/bind_hijax_properly
Bind hijax properly
2013-02-07 06:22:01 -08:00
Andromeda Yelton 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
Andromeda Yelton 46d373d9dd reformat URL reference for consistency with the rest 2013-02-07 09:10:20 -05:00
thatandromeda 08ad67a447 Merge pull request #121 from Gluejar/fix_url_hygiene
handle undefined facets
2013-02-07 05:26:54 -08:00
eric cf8b862738 handle undefined facets 2013-02-06 18:14:56 -05:00
eshellman d2c6730d47 Merge pull request #117 from Gluejar/unglued_tabs_hijax
Unglued tabs hijax
2013-02-06 08:49:49 -08:00
eshellman baa39878ab Merge pull request #119 from Gluejar/better_remove_language
addresses [#29777727]
2013-02-06 08:33:26 -08:00
eshellman e5643db0d3 Merge pull request #118 from Gluejar/smashwords_link
adding smashwords link to FAQ menu and improving URL hygiene
2013-02-06 08:31:19 -08:00
Andromeda Yelton 7b15a80f79 Merge branch 'smashwords_link' of github.com:Gluejar/regluit into smashwords_link 2013-02-06 11:25:17 -05:00
Andromeda Yelton 12e2c9fcea now faq subsection is expanded on smashwords page too 2013-02-06 11:24:05 -05:00
eric aa535ca38c asking RHs to set price to zero 2013-02-06 11:23:16 -05:00
Andromeda Yelton f998b1f93b addresses [#29777727] 2013-02-06 11:15:49 -05:00
Andromeda Yelton 852eec9a72 add that back in to highlight tabs properly 2013-02-06 09:57:27 -05:00
Andromeda Yelton 30dcab3d88 adding smashwords link to FAQ menu and improving URL hygiene 2013-02-06 09:09:20 -05:00
Raymond Yee f7cea12e12 settings for using django-storages and s3boto 2013-02-04 12:33:57 -08:00
Andromeda Yelton cd40fe99ef making it faster 2013-02-04 13:32:21 -05:00
Raymond Yee 1461abca6b Added django-storages==1.1.6 2013-02-04 17:49:25 +00:00
Raymond Yee fa930e8864 Add some instructions about configuring for ckeditor 2013-02-04 09:10:17 -08:00
Andromeda Yelton 1afdd5e21f bugfixing 2013-02-04 12:09:38 -05:00
Andromeda Yelton b952bbb897 now can bind to download links not present at page creation, so needs delegated event handling 2013-02-04 12:09:29 -05:00
Andromeda Yelton 8c07df1fb1 making load of books ajaxy to spare reload of rest of page 2013-02-04 11:28:58 -05:00
Raymond Yee 415aa84878 Added CKEDITOR_UPLOAD_PREFIX = 'https://unglue.it/static/media/' to prod.py 2013-02-04 07:58:26 -08:00
Andromeda Yelton 1c1f1faf72 first pass at separating unglued list into 3 tabs 2013-02-04 10:09:08 -05:00
Raymond Yee a5c0bc8f76 Merge pull request #115 from Gluejar/libraries
should have been removed, whoops -> ok
2013-02-01 10:29:50 -08:00
Andromeda Yelton fbe5774fa2 should have been removed, whoops 2013-02-01 13:28:14 -05:00
Raymond Yee e96e05b4dc Merge pull request #114 from Gluejar/press_updates
updating --> looks fine
2013-02-01 10:24:29 -08:00
Andromeda Yelton 7a357edca1 updating 2013-02-01 10:05:05 -05:00
Raymond Yee 130478ca57 Added CKEDITOR_UPLOAD_PREFIX 2013-01-30 06:07:50 +00:00
Raymond Yee 04cf65c994 Merge pull request #113 from Gluejar/libraries
Libraries
2013-01-26 18:39:40 -08:00
Andromeda Yelton 45c166155b Merge branch 'libraries' of github.com:Gluejar/regluit into libraries 2013-01-26 17:36:40 -08:00
Andromeda Yelton ae67b55de3 addressing feedback 2013-01-26 17:35:52 -08:00
eric 028e16866c resolve conflicts for merge master into libraries 2013-01-24 17:08:40 -05:00
eric efa847a5e1 fix html 2013-01-24 16:55:05 -05:00