Commit Graph

4248 Commits

Author SHA1 Message Date
Pcoder a062c0091f
Merge pull request #645 from pcoder/5126/allow_apps_to_be_iframed
5126/allow apps to be iframed
2018-07-18 21:56:57 +02:00
PCoder 1291b49ec3 Reformat base.py 2018-07-18 21:49:11 +02:00
PCoder 4a19bd1971 Set X_FRAME_OPTIONS from env 2018-07-18 21:48:39 +02:00
PCoder d6a404d49d Add missing placeholder 2018-07-16 22:38:29 +02:00
PCoder 13e33cbb7a Remove unused import 2018-07-16 20:44:09 +02:00
PCoder 15e435d220 Remove unused ^comic/$ url 2018-07-14 20:05:18 +02:00
PCoder 098a9065f1 Update Changelog for 2.0.2 2018-07-14 19:05:14 +02:00
PCoder c97e2c55f3 Add missing content block in the blog_ungleich.html template file 2018-07-14 19:03:04 +02:00
PCoder a5929b3e86 Update Changelog 2018-07-14 18:41:28 +02:00
Pcoder aec92d4c80
Merge pull request #643 from pcoder/bugfix_blog_template
Move placeholder to blog_ungleich.html
2018-07-14 18:14:18 +02:00
M.Ravi b3cdbbcae2 Move placeholder to blog_ungleich
This was the cause why the structure/content switch was not available on the blog page
2018-07-11 18:51:16 +02:00
Pcoder 5c6528aa03
Merge pull request #642 from pcoder/fix_de_translation
Fix DE translation
2018-07-07 21:50:20 +02:00
PCoder 28cac31a93 Update Changelog for 2.0 2018-07-07 21:45:32 +02:00
PCoder b580ac24f6 Change string formatting 2018-07-07 21:30:40 +02:00
PCoder 3ccefbdb74 Reorganize imports 2018-07-07 21:29:44 +02:00
PCoder d9bcdf22b7 Add missing param in DE translation 2018-07-07 03:01:37 +02:00
PCoder 2ada3ccc6f Update Changelog 2018-07-07 02:35:22 +02:00
Pcoder 0caf3da3bd
Merge pull request #530 from ungleich/task/3747/multiple_cards_support
Task/3747/multiple cards support
2018-07-07 02:28:29 +02:00
PCoder 33bd2e1760 Improve import_usercarddetails management command 2018-07-07 02:15:38 +02:00
PCoder 34ed51a643 Don't dissociate card if transaction fails 2018-07-07 02:03:42 +02:00
PCoder 0f26917f35 Fix PEP8 warning 2018-07-07 01:54:45 +02:00
PCoder 678167978c Add check to forbid user from deleting the last card 2018-07-07 01:50:46 +02:00
PCoder ebcbb26276 Add another DE translation - UPDATE 2018-07-07 01:38:03 +02:00
PCoder e18b8a527a Add missing DE translation 2018-07-07 01:35:52 +02:00
PCoder e60b93d126 Add management command import_usercarddetails 2018-07-07 01:28:25 +02:00
PCoder 8d42ca3200 Remove token parameter from stripe_utils.get_card_details
and add additional paramters to uniquely identify a card
2018-07-07 01:08:49 +02:00
PCoder 4c06a9e730 Add de translations by MalcolmA 2018-07-06 19:33:26 +02:00
PCoder 1f2743a65d Makemessages for datacenterlight, hosting and utils 2018-07-06 01:19:44 +02:00
PCoder 0db4a113e6 Add some styles and do not let user remove card if he has only one 2018-07-05 23:06:47 +02:00
PCoder 5cd62abc70 Refactor code 2018-07-05 20:36:43 +02:00
PCoder 1e214f7b21 Improve comment 2018-07-05 20:35:34 +02:00
PCoder 6b663d82a1 Remove unused variable 2018-07-05 20:35:00 +02:00
PCoder baa2817f57 Update BillingAddressFormSignup: add email validation 2018-07-05 10:00:12 +02:00
PCoder 9035f98060 Update UserCardDetail get method 2018-07-05 09:58:57 +02:00
PCoder faa0604fae Remove redundant code 2018-07-05 09:58:07 +02:00
PCoder 8d7b01d7e2 Disable dissociating card on subscription failure 2018-07-05 09:57:47 +02:00
PCoder e9ac699be8 Add card detail creation code in various landing cases 2018-07-05 09:57:18 +02:00
PCoder ec0216790f Remove redundant code 2018-07-05 09:55:45 +02:00
PCoder 9bf8992ff4 Landing flow: set/get token/card_id 2018-07-04 02:53:43 +02:00
PCoder dc28186fe9 Add styles for landing payment choices 2018-07-04 02:03:50 +02:00
PCoder 8e742852a5 Show all cards in landing and hosting payment page 2018-07-04 02:03:08 +02:00
PCoder 3d8237a34a Get and show all card details in the landing flow, if the user is logged in 2018-07-04 00:50:44 +02:00
PCoder c118e86230 Remove unused context parameters -- introduced during merge 2018-07-03 23:56:42 +02:00
PCoder d98a683b2a Do a get on UserCardDetail only when fingerprint, exp_month and exp_year are known 2018-07-03 23:23:02 +02:00
PCoder 1c5ff1f9dd Add UserCardDetail in the landing non-logged in flow 2018-07-03 23:22:10 +02:00
PCoder 9904a71d38 Rename usercarddetail migration 2018-07-03 22:34:59 +02:00
PCoder c9d01ba95f Fix some errors 2018-07-03 21:52:44 +02:00
PCoder 6d2b011925 Merge master into task/3747/multiple_cards_support 2018-07-03 21:29:04 +02:00
PCoder cb911e05c5 Update Changelog 2018-07-01 22:45:18 +02:00
Pcoder 1fa260aaf5
Merge pull request #624 from pcoder/task/3934/move_hosting_order_out_of_celery_task
Task/3934/Create hostingorder outside celery task
2018-07-01 22:39:08 +02:00