Commit graph

4216 commits

Author SHA1 Message Date
PCoder
e27317aeab Move rss icon from the header to the footer 2018-08-07 23:24:02 +02:00
PCoder
a8bf22a5b9 Merge branch 'master' into add_rss_feed_link 2018-08-07 22:41:15 +02:00
PCoder
5366745188 Update Changelog 2018-08-07 22:39:43 +02:00
Pcoder
8bce9c82a9
Merge pull request #650 from pcoder/bugfix/5293/change_to_terminate_hard
Bugfix/5293/Change VM terminate action from terminate to terminate hard
2018-08-07 22:29:57 +02:00
Pcoder
e16aab6951
Merge pull request #649 from pcoder/bug/5308/correct_ipv6_vm_name
Bug/5308/Correct IPv6 VM name
2018-08-07 22:28:37 +02:00
PCoder
48936ace51 Revert back commenting out unwanted templates
Todo in another pull request
2018-08-07 21:59:50 +02:00
PCoder
0a3f51361f Add RSS feed icon and link 2018-08-07 21:58:50 +02:00
PCoder
0ddbdb045f Remove unused CMS templates 2018-08-07 21:48:25 +02:00
PCoder
93d489334f Load cms_templates later
These templates are/were used in digitalglarus and hence are
obsolete now. Later can be removed after testing.
2018-08-07 21:44:57 +02:00
PCoder
6546814d62 Change VM terminate action from terminate to terminate hard 2018-08-04 09:52:42 +02:00
PCoder
07c7a64c5a Leave 'ipv6only' as a part of the VM name if it starts with it 2018-08-04 08:47:43 +02:00
PCoder
df10e84418 Add owner's email to the subject 2018-07-25 22:04:44 +02:00
PCoder
a5cdfab306 Send an email to admin if the VM is still there after 30 seconds
of the VM terminate calll
2018-07-25 21:54:15 +02:00
PCoder
59b020c0d4 Replace all occurrences of logger.info with logger.error 2018-07-25 21:41:05 +02:00
PCoder
15db1c88d7 Add release date for 2.0.3 2018-07-18 22:14:35 +02:00
PCoder
be2831818d Update Changelog for 2.0.3 2018-07-18 22:08:47 +02:00
Pcoder
a51064448a
Merge pull request #644 from pcoder/remove_unused_comic_url
Remove unused ^comic/$ url
2018-07-18 22:03:49 +02:00
PCoder
62d23b8a5c Update Changelog 2018-07-18 22:02:21 +02:00
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