Commit graph

70 commits

Author SHA1 Message Date
PCoder
4147b8f891 Merge remote-tracking branch 'mainRepo/master' into feature/6561/invoices-webhook 2019-06-12 06:25:47 +02:00
c469948901 Merge branch 'william' into 'master'
Add view to check if the vm belongs to a user (for ungleich-cli)

See merge request ungleich-public/dynamicweb!705
2019-05-16 22:01:21 +02:00
5e2e906f48 include pyotp in requeriments 2019-05-12 21:35:28 -04:00
PCoder
5c92aa713b Update cdist version 4.7.0 -> 5.0.1 2019-05-10 07:00:54 +02:00
PCoder
829261af88 Revert back djangocms-blog version to 0.9.0 2019-05-05 13:42:09 +02:00
PCoder
167ce9e4c1 Use the modified djangocms_blog module to remove Category - blah ... 2019-05-04 13:20:13 +02:00
PCoder
68538ac981 Update stripe version (supports stripe.Webhook) 2019-04-13 22:20:09 +02:00
PCoder
0ac2d1ff3f Update djangcocms-blog version (0.7.0 -> 0.9.0) 2018-12-23 14:31:55 +01:00
PCoder
e9cb303b09 Use correct django-multisite version
We had multiple versions of django-multisite in the
requirements.txt. This commit removes the wrong version that
caused server not to start with an error

File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in get_current
  65.             return self._get_site_by_id(site_id)

File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in _get_site_by_id
  37.         return SITE_CACHE[site_id]

File "/usr/local/lib/python3.5/site-packages/multisite/hacks.py" in __getitem__
  124.             raise KeyError(key)
2018-10-22 22:39:22 +02:00
PCoder
062e81408d Update pycryptodome
From 3.4 to 3.6.6
2018-10-18 09:03:08 +02:00
PCoder
7f6a66bc16 Update django-multisite version 2018-02-20 08:25:43 +01:00
PCoder
cb102fe622 Use ungleich's fork of djangocms-multisite 2018-02-20 07:20:01 +01:00
M.Ravi
f62b331919 Add multisite requirements 2018-02-15 10:55:45 +01:00
PCoder
f5db08e3df Update psycopg2 from 2.7.1 to 2.7.3.2 2017-12-28 13:14:59 +01:00
PCoder
f611e25538 Update psycopg2 from 2.6.1 to 2.7.1
psycopg2-2.6.1 was throwing this error while running automated tests:

     Error: could not determine PostgreSQL version from '10.1'
2017-12-15 08:48:53 +01:00
PCoder
29a45e81bf Include cdist 4.7.0 in requirements.txt 2017-09-26 02:24:17 +05:30
PCoder
bb9d22b0f1 Updated requirements.txt 2017-09-13 01:08:22 +05:30
PCoder
abb419fdd7 Updated requirements.txt 2017-09-13 00:04:18 +05:30
M.Ravi
5a4f0241c2 Updated requirements.txt for fetching appropriate cdist and
python-sshpubkeys.
2017-09-12 20:10:34 +02:00
M.Ravi
cf6bd8a7c1 Validating ssh public keys using sshpubkeys 2017-09-07 00:31:15 +02:00
PCoder
277fcdbac1 cdist: Updated requirements.txt 2017-09-05 00:34:22 +05:30
PCoder
6933ad5900 Updated requirements for cdist 2017-09-01 00:51:58 +05:30
M.Ravi
21f51692c4 Improved save_ssh_key celery task 2017-08-28 11:40:59 +02:00
PCoder
464b48000d Added cdist requirement 2017-08-27 12:52:30 +05:30
M.Ravi
63635f158e Updated requirements.txt 2017-08-24 15:39:10 +02:00
PCoder
9c8bddb200 requirements.txt: Added celery, redis, django-celery-results 2017-08-19 08:41:36 +05:30
PCoder
1a7cefcc54 Merged pcoder/set_debug_false into pcoder-set_debug_false 2017-07-07 04:47:15 +05:30
M.Ravi
ceb10d116e Added python-memcached to requirements.txt 2017-07-04 20:44:59 +02:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
Modulos
5ed72bf4bf Change to ungleich/python-oca
The offical python-oca repo does not (yet) support all the funcions we
need.
2017-05-11 04:03:31 +02:00
Modulos
df777f384d Initial commit
Please Note:
This app is going to be developed in a TDD style. Please add test first
and then the corresponding code. This way we can be sure everything
works and it should help us coordinate our work.
2017-05-09 16:33:56 +02:00
M.Ravi
68e81472d5 Fixed a bug related to incorrect opennebula parameter. Added python oca's github repo to the requirements.txt. 2017-04-26 23:26:35 +05:30
M.Ravi
d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
Levi
2a4b6e973d Downgrading django from 1.10 to 1.9. Added supports.html. Added supports view . Fixing post supports style. Working on # #2689 Removing links from supportus.html. . Working on # #2689 FIxed history fonts style and color . Working on # #2689 Finished supportus.html. Working on # #2689 Tagging post. Working on # #2689 Fixing broken links history.html. Working on #2674 Deactivate membership. Working on #2686 Reactivate membership 2016-11-17 21:08:16 -05:00
Levi
a8b9e02ea5 started hosting permissions 2016-06-26 14:50:48 -05:00
Levi
a846f42bf6 Added mark a notification as read feature, Fixed some errors 2016-05-29 13:37:43 -05:00
Levi
5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Levi
2a1bcbc904 added model mommy to requirements.txt 2016-05-12 02:11:18 -05:00
Levi
57b1ab7022 Fixed requirements file 2016-04-29 23:53:36 -05:00
Levi
bad0bd60d0 Fixed requirements file 2016-04-29 23:43:34 -05:00
4389230b60 :Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop
Conflicts:
	dynamicweb/settings-test/__init__.py
	requirements.txt
	templates/cms/ungleich.ch/_footer.html
	templates/cms/ungleich.ch/_header_base.html
	templates/cms/ungleich.ch/_menu.html
	templates/cms/ungleich.ch/base.html
	templates/cms/ungleich.ch/blog.html
	templates/cms/ungleich.ch/page.html
	templates/cms/ungleichch/__init__.py
	templates/cms/ungleichch/_footer.html
	templates/cms/ungleichch/_header_base.html
	templates/cms/ungleichch/_menu.html
	templates/cms/ungleichch/base.html
	templates/cms/ungleichch/blog.html
	templates/cms/ungleichch/page.html
	ungleich/templates/cms/ungleichch/_footer.html
	ungleich/templates/cms/ungleichch/_header_base.html
	ungleich/templates/cms/ungleichch/_menu.html
	ungleich/templates/cms/ungleichch/base_ungleich.html
	ungleich/templates/cms/ungleichch/blog_ungleich.html
	ungleich/templates/cms/ungleichch/page.html
2016-04-22 10:08:33 +02:00
Tomislav R
ddb4de2954 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
039399b95b server push 2016-03-19 21:28:58 +01:00
Tomislav R
baef7e4aa8 fixed requirements 2016-03-16 00:26:49 +01:00
Tomislav R
6223f4a1ef payment app 2016-03-11 19:42:45 +01:00
Tomislav R
f82e0604ca update req file and update directory structure 2016-03-07 19:20:45 +01:00
Tomislav R
0558d6e396 django version update #3 2016-02-29 23:28:31 +01:00
d3238aa8f3 updated requirements
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-07 20:02:56 -06:00
180ad09fab added django-dotenv to requirements.txt
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:43:03 -06:00
df9b0eacaa Merge branch 'feature/digital.glarus.german' into develop 2015-10-04 09:23:56 -06:00