mravi/uncloud-mravi
1
0
Fork 0
forked from uncloud/uncloud
Code Issues Pull requests Projects Releases Wiki Activity
783 commits 5 branches 0 tags 12 MiB
Commit graph

783 commits

This branch
This branch
All branches
Author SHA1 Message Date
Amal Elshihaby
5564400ef8 Refactor the Payment Model and Handle Order Confirmation Page 2021-07-31 10:26:15 +02:00
Amal Elshihaby
94dac8110e Task #9532 Handle the UI of the login and Signup pages 
Task #9535 Handle the UI of the Checkout Page
 2021-07-30 10:13:50 +02:00
Amal Elshihaby
4a0987766d Change backgroud image 2021-07-30 10:13:38 +02:00
Amal Elshihaby
20ce755303 Task #9534 Handle the UI of the Home Screen 2021-07-30 10:13:25 +02:00
Amal Elshihaby
c4f7913cb1 Task #9553 Handle Environment Variables 2021-07-30 10:13:11 +02:00
Nico Schottelius
8287e73f6b Merge branch 'master' into 'master' 
- Implement a complete cycle for buying a Matrix Chat Host

See merge request uncloud/uncloud!11
 2021-07-19 16:36:11 +02:00
amal
b7aa1c6971 - Added PricingPlan Model 
- Implement a complete cycle for buying a Matrix Chat Host
- Refactor the Payement cycle and stripe related methods
 2021-07-19 16:36:10 +02:00
Nico Schottelius
e205d8d07c Merge branch 'master' of code.ungleich.ch:uncloud/uncloud 2021-06-20 11:58:23 +02:00
Nico Schottelius
a463bcf7bd Late commits 2021-06-20 11:51:27 +02:00
Nico Schottelius
d872357dd1 Fix login -> move to bootstrap5 2021-05-25 20:22:18 +02:00
Nico Schottelius
485f08e25c Cleanup views 2021-05-25 19:55:33 +02:00
Nico Schottelius
745abc48ef Add balance if user is logged in 2021-05-25 19:55:13 +02:00
Nico Schottelius
49f52fd41d [bootstrap] update to bootstrap5 2021-02-13 18:50:28 +01:00
Nico Schottelius
c8ce7dbb40 do not touch local_settings.py on deploy 2021-01-17 15:54:16 +01:00
Nico Schottelius
a920887100 ++bridge update 2021-01-17 15:53:30 +01:00
Nico Schottelius
6b9b15e663 Add deploy.sh 2021-01-17 15:47:37 +01:00
Nico Schottelius
48ce21f833 integrate bootstrap 2021-01-01 13:25:52 +01:00
Nico Schottelius
6c15d2086e implement balance getting 2021-01-01 12:41:54 +01:00
Nico Schottelius
1b06d8ee03 [credit card] implement payment 2020-12-29 01:43:33 +01:00
Nico Schottelius
e225bf1cc0 implement credit card listing 2020-12-28 23:35:34 +01:00
Nico Schottelius
e2c4a19049 Less verbose 2020-12-26 14:48:10 +01:00
Nico Schottelius
74749bf07c fix templating 2020-12-26 14:45:28 +01:00
Nico Schottelius
93e5d39c7b moving vpn to direct configuration 2020-12-26 14:42:53 +01:00
Nico Schottelius
18d4c99571 [doc] workers need access to the database 2020-12-26 13:42:20 +01:00
Nico Schottelius
e51edab2f5 cleanup/in between commit 2020-12-26 11:22:51 +01:00
Nico Schottelius
f7c68b5ca5 Rename template 2020-12-25 17:33:01 +01:00
Nico Schottelius
6efedcb381 hackish way of registering works 2020-12-25 17:29:17 +01:00
Nico Schottelius
df4c0c3060 in between commit to update for cc tests 2020-12-25 10:31:42 +01:00
Nico Schottelius
8dd4b712fb [views] add index view for uncloud 2020-12-25 10:11:13 +01:00
Nico Schottelius
50a395c8ec sort requirements.txt 2020-12-25 10:10:57 +01:00
Nico Schottelius
663d72269a [wireguard] verify key length 2020-12-25 10:08:34 +01:00
Nico Schottelius
a0fbe2d6ed [wireguard] add unique constrain for keys in pool 2020-12-24 17:26:53 +01:00
Nico Schottelius
858aabb5ba Return value from validation 2020-12-20 22:03:43 +01:00
Nico Schottelius
ece2bca831 add new /sizes endpoint 2020-12-20 21:45:47 +01:00
Nico Schottelius
cdab685269 [vpn/doc] update docs 2020-12-20 19:37:12 +01:00
Nico Schottelius
689375a2fe Fix the config task 2020-12-20 19:17:03 +01:00
Nico Schottelius
8f83679c48 test cleaning tasks in a task fails: 
[2020-12-20 18:01:50,264: WARNING/ForkPoolWorker-7] Pruning UncloudTask object (571ffc76-8b40-4cb6-9658-87030834bc6c)...
[2020-12-20 18:01:50,265: ERROR/ForkPoolWorker-7] Task uncloud.tasks.cleanup_tasks[f9fb1480-f122-41c9-bec1-3d6d0f92a22e] raised unexpected: RuntimeError('Never call result.get() within a task!\nSee http://docs.celeryq.org/en/latest/userguide/tasks.html#task-synchronous-subtasks\n')
Traceback (most recent call last):
  File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/app/trace.py", line 405, in trace_task
    R = retval = fun(*args, **kwargs)
  File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/app/trace.py", line 697, in __protected_call__
    return self.run(*args, **kwargs)
  File "/home/nico/vcs/uncloud/uncloud/tasks.py", line 13, in cleanup_tasks
    print(res.get())
  File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/result.py", line 209, in get
    assert_will_not_block()
  File "/home/nico/vcs/uncloud/venv/lib/python3.8/site-packages/celery/result.py", line 37, in assert_will_not_block
    raise RuntimeError(E_WOULDBLOCK)
RuntimeError: Never call result.get() within a task!
See http://docs.celeryq.org/en/latest/userguide/tasks.html#task-synchronous-subtasks
 2020-12-20 19:01:37 +01:00
Nico Schottelius
5e870f04b1 ++celery/tasks 2020-12-20 18:36:46 +01:00
Nico Schottelius
63191c0a88 Remove $ that is not needed in python... 2020-12-20 13:24:55 +01:00
Nico Schottelius
03c0b34446 ++config vpn server 2020-12-20 13:00:36 +01:00
Nico Schottelius
1922a0d92d ++routing tests 2020-12-20 12:54:02 +01:00
Nico Schottelius
2e6c72c093 wireguard/celery fixes 2020-12-20 12:45:36 +01:00
Nico Schottelius
b3626369a2 --syntax error 2020-12-20 12:24:35 +01:00
Nico Schottelius
179baee96d fix celery task routes syntax error 2020-12-20 12:22:50 +01:00
Nico Schottelius
054886fd9c begin phasing in config of vpn via cdist 2020-12-20 12:20:54 +01:00
Nico Schottelius
e2b36c8bca celery test 2020-12-13 19:50:36 +01:00
Nico Schottelius
372fe800cd fill in template values for settings 2020-12-13 19:06:22 +01:00
Nico Schottelius
16f3adef93 [doc] ++requirements alpine 2020-12-13 18:56:47 +01:00
Nico Schottelius
2d62388eb1 phasing in celery 
for configuring the vpn server
 2020-12-13 18:34:43 +01:00
Nico Schottelius
aec79cba74 [vpn] include vpn server public key 2020-12-13 18:05:48 +01:00