Alexey Shabalin 43b60a22b8 Merge remote-tracking branch 'upstream/v3.0' into server ...

# Conflicts:
#	server/src/uds/locale/ru/LC_MESSAGES/djangojs.po
#	server/src/uds/static/modern/main-es2015.js
#	server/src/uds/static/modern/main-es5.js

2021-08-18 17:44:22 +03:00

..

documentation

Merge pull request #41 from Jarli01/patch-1

2019-06-10 23:41:35 +02:00

samples

Fixed sample REST1 for python3 && added reset suport for assigned user service using REST API

2021-03-22 11:42:11 +01:00

src

Merge remote-tracking branch 'upstream/v3.0' into server

2021-08-18 17:44:22 +03:00

templates/admin

removed user template

2018-10-17 10:33:24 +02:00

.env

added -env

2021-06-16 12:11:09 +02:00

.project

upgrading environment

2019-02-12 11:26:04 +01:00

.pydevproject

Several improvements

2019-02-24 12:15:12 +01:00

requirements.txt

updated requirements

2020-09-01 15:11:28 +02:00