diff --git a/.gitignore b/.gitignore index 9ec19cf2c771f42fb6d8312e41241e6d55d0f521..c0dcb239aadabe1d68d123e8accd426a494beae7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ db.sqlite3 *.sublime-workspace site_des_eleves/local_settings.py .coverage +collected_static diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b3422a7b013b68c509c0595ff0dd7d1eac77009..45addaff37c42ba121eb9c5c58959ec3ae9acda6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,7 @@ stages: - test - style - scan - -before_script: - - pipenv sync --dev + - deploy services: - mariadb:latest @@ -17,6 +15,14 @@ image: enib-website:ci variables: MYSQL_ROOT_PASSWORD: root_passwd +noop: + tags: + - docker + services: [] + stage: preparation + script: + - sleep 1 + build_ci_image: tags: - shell @@ -24,7 +30,6 @@ build_ci_image: only: - schedules - web - before_script: [] script: - docker build --no-cache -t enib-website:ci . @@ -32,7 +37,6 @@ lock: tags: - docker stage: build - before_script: [] script: pipenv lock artifacts: paths: @@ -42,13 +46,19 @@ locked: tags: - docker stage: test + before_script: + - pipenv sync --dev script: pipenv run test dependencies: [] + needs: + - noop rolling: tags: - docker stage: test + before_script: + - pipenv sync --dev script: pipenv run test dependencies: - lock @@ -57,14 +67,42 @@ flake8: tags: - docker stage: style + services: [] + before_script: + - pipenv sync --dev script: pipenv run flake8 when: always + needs: + - noop dependencies_vuln: tags: - docker stage: scan - before_script: [] + services: [] script: pipenv check dependencies: [] # do not get the updated lockfile when: always + needs: + - noop + +deploy_beta: + tags: + - docker + stage: deploy + services: [] + dependencies: [] # use the manually tested lockfile + only: + - master + environment: + name: beta + url: https://beta.enib.net + before_script: + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + script: + - ssh sde@enib.net beta diff --git a/Dockerfile b/Dockerfile index 3c990207570a26daca146856f32b10aa8f03957a..ad91d29c2f33f463b024bd8d4342e87c7b89969f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN pacman -Syuq --noconfirm --needed \ python-pipenv \ mariadb-clients \ base-devel base \ - postgresql + openssh ENV TZ=Europe/Paris RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..0a5ed638e84636331a6999829d38eea0d7f495f2 --- /dev/null +++ b/Makefile @@ -0,0 +1,51 @@ +# Use development packages or not +DEV= +DEV=--dev + +all: css makemigrations install + +clean: clean_css + +install: sync migrate collectstatic restart + +mrproper: clean clean_pipfile + +collectstatic: css + pipenv run ./manage.py collectstatic --noinput + +restart: + touch uwsgi.ini + +## Migrations ## +makemigrations: + pipenv run ./manage.py makemigrations + +migrate: $(wildcard */migrations/*.py) + pipenv run ./manage.py migrate + +## Pipfile ## +sync: lock + pipenv sync $(DEV) + +lock: Pipfile.lock + +Pipfile.lock: Pipfile + pipenv lock + +clean_pipfile: + rm Pipfile.lock + +## SASS - CSS ## +CSS=static/css/base.css +CSS+=webmail/static/webmail/css/index.css +CSS+=poll/static/poll/css/question.css +CSS+=accounts/static/accounts/css/profile.css +CSS+=accounts/static/accounts/css/edit.css + +css: $(CSS) + +%.css: ../sass/%.sass + sassc -m $< $@ + +clean_css: + rm $(CSS) diff --git a/Pipfile b/Pipfile index 88809dbce3538d7fd33fda70e4eb89b0ab9e3d97..be5e467d5cb0032491b42cfe680a7b6b783893bf 100644 --- a/Pipfile +++ b/Pipfile @@ -10,12 +10,11 @@ freezegun = "*" coverage = "*" [packages] -django = "*" +django = "~=2.2" django-redis-cache = "*" mysqlclient = "*" redis = "*" requests = "*" -psycopg2 = "*" Markdown = "*" Pillow = "*" django-redis-sessions = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 43444cbfa416c14b063a68399b52a6db76cf92f3..9bbbe4da23d92aa0835a47dfc80b422b586a88aa 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "eb5d9726338ce74bec740192b98e97b4aa6a22574a19ef761417af61d32d1dcb" + "sha256": "34b077779c369d92f898a79dadc6b641aa41497238b1721cc5cee12abeca4d03" }, "pipfile-spec": 6, "requires": { @@ -18,10 +18,10 @@ "default": { "certifi": { "hashes": [ - "sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50", - "sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef" + "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3", + "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f" ], - "version": "==2019.9.11" + "version": "==2019.11.28" }, "chardet": { "hashes": [ @@ -32,11 +32,11 @@ }, "django": { "hashes": [ - "sha256:16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86", - "sha256:89c2007ca4fa5b351a51a279eccff298520783b713bf28efb89dfb81c80ea49b" + "sha256:1226168be1b1c7efd0e66ee79b0e0b58b2caa7ed87717909cd8a57bb13a7079a", + "sha256:9a4635813e2d498a3c01b10c701fe4a515d76dd290aaa792ccb65ca4ccb6b038" ], "index": "pypi", - "version": "==2.2.7" + "version": "==2.2.10" }, "django-redis-cache": { "hashes": [ @@ -62,11 +62,11 @@ }, "markdown": { "hashes": [ - "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a", - "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c" + "sha256:5ad7180c3ec16422a764568ad6409ec82460c40d1631591fa53d597033cc98bf", + "sha256:9c71241ec237505535eabff7a38b1307250f16cea174bb1e505c3e032f108867" ], "index": "pypi", - "version": "==3.1.1" + "version": "==3.2" }, "mysqlclient": { "hashes": [ @@ -80,58 +80,31 @@ }, "pillow": { "hashes": [ - "sha256:047d9473cf68af50ac85f8ee5d5f21a60f849bc17d348da7fc85711287a75031", - "sha256:0f66dc6c8a3cc319561a633b6aa82c44107f12594643efa37210d8c924fc1c71", - "sha256:12c9169c4e8fe0a7329e8658c7e488001f6b4c8e88740e76292c2b857af2e94c", - "sha256:248cffc168896982f125f5c13e9317c059f74fffdb4152893339f3be62a01340", - "sha256:27faf0552bf8c260a5cee21a76e031acaea68babb64daf7e8f2e2540745082aa", - "sha256:285edafad9bc60d96978ed24d77cdc0b91dace88e5da8c548ba5937c425bca8b", - "sha256:384b12c9aa8ef95558abdcb50aada56d74bc7cc131dd62d28c2d0e4d3aadd573", - "sha256:38950b3a707f6cef09cd3cbb142474357ad1a985ceb44d921bdf7b4647b3e13e", - "sha256:4aad1b88933fd6dc2846552b89ad0c74ddbba2f0884e2c162aa368374bf5abab", - "sha256:4ac6148008c169603070c092e81f88738f1a0c511e07bd2bb0f9ef542d375da9", - "sha256:4deb1d2a45861ae6f0b12ea0a786a03d19d29edcc7e05775b85ec2877cb54c5e", - "sha256:59aa2c124df72cc75ed72c8d6005c442d4685691a30c55321e00ed915ad1a291", - "sha256:5a47d2123a9ec86660fe0e8d0ebf0aa6bc6a17edc63f338b73ea20ba11713f12", - "sha256:5cc901c2ab9409b4b7ac7b5bcc3e86ac14548627062463da0af3b6b7c555a871", - "sha256:6c1db03e8dff7b9f955a0fb9907eb9ca5da75b5ce056c0c93d33100a35050281", - "sha256:7ce80c0a65a6ea90ef9c1f63c8593fcd2929448613fc8da0adf3e6bfad669d08", - "sha256:809c19241c14433c5d6135e1b6c72da4e3b56d5c865ad5736ab99af8896b8f41", - "sha256:83792cb4e0b5af480588601467c0764242b9a483caea71ef12d22a0d0d6bdce2", - "sha256:846fa202bd7ee0f6215c897a1d33238ef071b50766339186687bd9b7a6d26ac5", - "sha256:9f5529fc02009f96ba95bea48870173426879dc19eec49ca8e08cd63ecd82ddb", - "sha256:a423c2ea001c6265ed28700df056f75e26215fd28c001e93ef4380b0f05f9547", - "sha256:ac4428094b42907aba5879c7c000d01c8278d451a3b7cccd2103e21f6397ea75", - "sha256:b1ae48d87f10d1384e5beecd169c77502fcc04a2c00a4c02b85f0a94b419e5f9", - "sha256:bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1", - "sha256:c6414f6aad598364aaf81068cabb077894eb88fed99c6a65e6e8217bab62ae7a", - "sha256:c710fcb7ee32f67baf25aa9ffede4795fd5d93b163ce95fdc724383e38c9df96", - "sha256:c7be4b8a09852291c3c48d3c25d1b876d2494a0a674980089ac9d5e0d78bd132", - "sha256:c9e5ffb910b14f090ac9c38599063e354887a5f6d7e6d26795e916b4514f2c1a", - "sha256:e0697b826da6c2472bb6488db4c0a7fa8af0d52fa08833ceb3681358914b14e5", - "sha256:e9a3edd5f714229d41057d56ac0f39ad9bdba6767e8c888c951869f0bdd129b0" + "sha256:0a628977ac2e01ca96aaae247ec2bd38e729631ddf2221b4b715446fd45505be", + "sha256:4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946", + "sha256:54ebae163e8412aff0b9df1e88adab65788f5f5b58e625dc5c7f51eaf14a6837", + "sha256:5bfef0b1cdde9f33881c913af14e43db69815c7e8df429ceda4c70a5e529210f", + "sha256:5f3546ceb08089cedb9e8ff7e3f6a7042bb5b37c2a95d392fb027c3e53a2da00", + "sha256:5f7ae9126d16194f114435ebb79cc536b5682002a4fa57fa7bb2cbcde65f2f4d", + "sha256:62a889aeb0a79e50ecf5af272e9e3c164148f4bd9636cc6bcfa182a52c8b0533", + "sha256:7406f5a9b2fd966e79e6abdaf700585a4522e98d6559ce37fc52e5c955fade0a", + "sha256:8453f914f4e5a3d828281a6628cf517832abfa13ff50679a4848926dac7c0358", + "sha256:87269cc6ce1e3dee11f23fa515e4249ae678dbbe2704598a51cee76c52e19cda", + "sha256:875358310ed7abd5320f21dd97351d62de4929b0426cdb1eaa904b64ac36b435", + "sha256:8ac6ce7ff3892e5deaab7abaec763538ffd011f74dc1801d93d3c5fc541feee2", + "sha256:91b710e3353aea6fc758cdb7136d9bbdcb26b53cefe43e2cba953ac3ee1d3313", + "sha256:9d2ba4ed13af381233e2d810ff3bab84ef9f18430a9b336ab69eaf3cd24299ff", + "sha256:a62ec5e13e227399be73303ff301f2865bf68657d15ea50b038d25fc41097317", + "sha256:ab76e5580b0ed647a8d8d2d2daee170e8e9f8aad225ede314f684e297e3643c2", + "sha256:bf4003aa538af3f4205c5fac56eacaa67a6dd81e454ffd9e9f055fff9f1bc614", + "sha256:bf598d2e37cf8edb1a2f26ed3fb255191f5232badea4003c16301cb94ac5bdd0", + "sha256:c18f70dc27cc5d236f10e7834236aff60aadc71346a5bc1f4f83a4b3abee6386", + "sha256:c5ed816632204a2fc9486d784d8e0d0ae754347aba99c811458d69fcdfd2a2f9", + "sha256:dc058b7833184970d1248135b8b0ab702e6daa833be14035179f2acb78ff5636", + "sha256:ff3797f2f16bf9d17d53257612da84dd0758db33935777149b3334c01ff68865" ], "index": "pypi", - "version": "==6.2.1" - }, - "psycopg2": { - "hashes": [ - "sha256:4212ca404c4445dc5746c0d68db27d2cbfb87b523fe233dc84ecd24062e35677", - "sha256:47fc642bf6f427805daf52d6e52619fe0637648fe27017062d898f3bf891419d", - "sha256:72772181d9bad1fa349792a1e7384dde56742c14af2b9986013eb94a240f005b", - "sha256:8396be6e5ff844282d4d49b81631772f80dabae5658d432202faf101f5283b7c", - "sha256:893c11064b347b24ecdd277a094413e1954f8a4e8cdaf7ffbe7ca3db87c103f0", - "sha256:92a07dfd4d7c325dd177548c4134052d4842222833576c8391aab6f74038fc3f", - "sha256:965c4c93e33e6984d8031f74e51227bd755376a9df6993774fd5b6fb3288b1f4", - "sha256:9ab75e0b2820880ae24b7136c4d230383e07db014456a476d096591172569c38", - "sha256:b0845e3bdd4aa18dc2f9b6fb78fbd3d9d371ad167fd6d1b7ad01c0a6cdad4fc6", - "sha256:dca2d7203f0dfce8ea4b3efd668f8ea65cd2b35112638e488a4c12594015f67b", - "sha256:ed686e5926929887e2c7ae0a700e32c6129abb798b4ad2b846e933de21508151", - "sha256:ef6df7e14698e79c59c7ee7cf94cd62e5b869db369ed4b1b8f7b729ea825712a", - "sha256:f898e5cc0a662a9e12bde6f931263a1bbd350cfb18e1d5336a12927851825bb6" - ], - "index": "pypi", - "version": "==2.8.4" + "version": "==7.0.0" }, "pytz": { "hashes": [ @@ -142,11 +115,11 @@ }, "redis": { "hashes": [ - "sha256:3613daad9ce5951e426f460deddd5caf469e08a3af633e9578fc77d362becf62", - "sha256:8d0fc278d3f5e1249967cba2eb4a5632d19e45ce5c09442b8422d15ee2c22cc2" + "sha256:0dcfb335921b88a850d461dc255ff4708294943322bd55de6cfd68972490ca1f", + "sha256:b205cffd05ebfd0a468db74f0eedbff8df1a7bfc47521516ade4692991bb0833" ], "index": "pypi", - "version": "==3.3.11" + "version": "==3.4.1" }, "requests": { "hashes": [ @@ -158,10 +131,10 @@ }, "six": { "hashes": [ - "sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd", - "sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66" + "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a", + "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c" ], - "version": "==1.13.0" + "version": "==1.14.0" }, "sqlparse": { "hashes": [ @@ -172,66 +145,72 @@ }, "urllib3": { "hashes": [ - "sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293", - "sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745" + "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", + "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc" ], - "version": "==1.25.7" + "version": "==1.25.8" } }, "develop": { + "asgiref": { + "hashes": [ + "sha256:7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0", + "sha256:ea448f92fc35a0ef4b1508f53a04c4670255a3f33d22a81c8fc9c872036adbe5" + ], + "version": "==3.2.3" + }, "coverage": { "hashes": [ - "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6", - "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650", - "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5", - "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d", - "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351", - "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755", - "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef", - "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca", - "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca", - "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9", - "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc", - "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5", - "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f", - "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe", - "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888", - "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5", - "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce", - "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5", - "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e", - "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e", - "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9", - "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437", - "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1", - "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c", - "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24", - "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47", - "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2", - "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28", - "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c", - "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7", - "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0", - "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025" + "sha256:15cf13a6896048d6d947bf7d222f36e4809ab926894beb748fc9caa14605d9c3", + "sha256:1daa3eceed220f9fdb80d5ff950dd95112cd27f70d004c7918ca6dfc6c47054c", + "sha256:1e44a022500d944d42f94df76727ba3fc0a5c0b672c358b61067abb88caee7a0", + "sha256:25dbf1110d70bab68a74b4b9d74f30e99b177cde3388e07cc7272f2168bd1477", + "sha256:3230d1003eec018ad4a472d254991e34241e0bbd513e97a29727c7c2f637bd2a", + "sha256:3dbb72eaeea5763676a1a1efd9b427a048c97c39ed92e13336e726117d0b72bf", + "sha256:5012d3b8d5a500834783689a5d2292fe06ec75dc86ee1ccdad04b6f5bf231691", + "sha256:51bc7710b13a2ae0c726f69756cf7ffd4362f4ac36546e243136187cfcc8aa73", + "sha256:527b4f316e6bf7755082a783726da20671a0cc388b786a64417780b90565b987", + "sha256:722e4557c8039aad9592c6a4213db75da08c2cd9945320220634f637251c3894", + "sha256:76e2057e8ffba5472fd28a3a010431fd9e928885ff480cb278877c6e9943cc2e", + "sha256:77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef", + "sha256:7afad9835e7a651d3551eab18cbc0fdb888f0a6136169fbef0662d9cdc9987cf", + "sha256:9bea19ac2f08672636350f203db89382121c9c2ade85d945953ef3c8cf9d2a68", + "sha256:a8b8ac7876bc3598e43e2603f772d2353d9931709345ad6c1149009fd1bc81b8", + "sha256:b0840b45187699affd4c6588286d429cd79a99d509fe3de0f209594669bb0954", + "sha256:b26aaf69713e5674efbde4d728fb7124e429c9466aeaf5f4a7e9e699b12c9fe2", + "sha256:b63dd43f455ba878e5e9f80ba4f748c0a2156dde6e0e6e690310e24d6e8caf40", + "sha256:be18f4ae5a9e46edae3f329de2191747966a34a3d93046dbdf897319923923bc", + "sha256:c312e57847db2526bc92b9bfa78266bfbaabac3fdcd751df4d062cd4c23e46dc", + "sha256:c60097190fe9dc2b329a0eb03393e2e0829156a589bd732e70794c0dd804258e", + "sha256:c62a2143e1313944bf4a5ab34fd3b4be15367a02e9478b0ce800cb510e3bbb9d", + "sha256:cc1109f54a14d940b8512ee9f1c3975c181bbb200306c6d8b87d93376538782f", + "sha256:cd60f507c125ac0ad83f05803063bed27e50fa903b9c2cfee3f8a6867ca600fc", + "sha256:d513cc3db248e566e07a0da99c230aca3556d9b09ed02f420664e2da97eac301", + "sha256:d649dc0bcace6fcdb446ae02b98798a856593b19b637c1b9af8edadf2b150bea", + "sha256:d7008a6796095a79544f4da1ee49418901961c97ca9e9d44904205ff7d6aa8cb", + "sha256:da93027835164b8223e8e5af2cf902a4c80ed93cb0909417234f4a9df3bcd9af", + "sha256:e69215621707119c6baf99bda014a45b999d37602cb7043d943c76a59b05bf52", + "sha256:ea9525e0fef2de9208250d6c5aeeee0138921057cd67fcef90fbed49c4d62d37", + "sha256:fca1669d464f0c9831fd10be2eef6b86f5ebd76c724d1e0706ebdff86bb4adf0" ], "index": "pypi", - "version": "==4.5.4" + "version": "==5.0.3" }, "django": { "hashes": [ - "sha256:16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86", - "sha256:89c2007ca4fa5b351a51a279eccff298520783b713bf28efb89dfb81c80ea49b" + "sha256:1226168be1b1c7efd0e66ee79b0e0b58b2caa7ed87717909cd8a57bb13a7079a", + "sha256:9a4635813e2d498a3c01b10c701fe4a515d76dd290aaa792ccb65ca4ccb6b038" ], "index": "pypi", - "version": "==2.2.7" + "version": "==2.2.10" }, "django-debug-toolbar": { "hashes": [ - "sha256:24c157bc6c0e1648e0a6587511ecb1b007a00a354ce716950bff2de12693e7a8", - "sha256:77cfba1d6e91b9bc3d36dc7dc74a9bb80be351948db5f880f2562a0cbf20b6c5" + "sha256:eabbefe89881bbe4ca7c980ff102e3c35c8e8ad6eb725041f538988f2f39a943", + "sha256:ff94725e7aae74b133d0599b9bf89bd4eb8f5d2c964106e61d11750228c8774c" ], "index": "pypi", - "version": "==2.1" + "version": "==2.2" }, "entrypoints": { "hashes": [ @@ -250,11 +229,11 @@ }, "freezegun": { "hashes": [ - "sha256:2a4d9c8cd3c04a201e20c313caf8b6338f1cfa4cda43f46a94cc4a9fd13ea5e7", - "sha256:edfdf5bc6040969e6ed2e36eafe277963bdc8b7c01daeda96c5c8594576c9390" + "sha256:10336fc80a235847c64033f9727f3847f37db4bd549be1d9f3b5ae0279256c69", + "sha256:6262de2f4bab671f7189bb8a0b9d8751da69a53f0b9813fb8f412681662d872a" ], "index": "pypi", - "version": "==0.3.12" + "version": "==0.3.14" }, "mccabe": { "hashes": [ @@ -293,10 +272,10 @@ }, "six": { "hashes": [ - "sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd", - "sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66" + "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a", + "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c" ], - "version": "==1.13.0" + "version": "==1.14.0" }, "sqlparse": { "hashes": [ diff --git a/accounts/static/accounts/css/edit.css b/accounts/static/accounts/css/edit.css index 53c0b01fac1f97f6c9dc8d017230700598bb2baa..c5277a585f396d67cdd4b05e2bc464729f4472a8 100644 --- a/accounts/static/accounts/css/edit.css +++ b/accounts/static/accounts/css/edit.css @@ -1,17 +1,14 @@ -img{ - display: inline-block; - flex: 1 1 auto; - max-width: 150px; -} - - -.align_left{ - text-align: left; -} +img { + display: inline-block; + flex: 1 1 auto; + max-width: 150px; } +.align_left { + text-align: left; } .addbtn { - width: 100%; - background-color: #bbb; - padding: 0.5em -} + width: 100%; + background-color: #bbb; + padding: 0.5em; } + +/*# sourceMappingURL=edit.css.map */ \ No newline at end of file diff --git a/accounts/static/accounts/css/profile.css b/accounts/static/accounts/css/profile.css index 238e196b7eb6da0082da5a786fd9f19fd89de651..144b056523bca669d7764145c7df4867fb184601 100644 --- a/accounts/static/accounts/css/profile.css +++ b/accounts/static/accounts/css/profile.css @@ -1,8 +1,7 @@ - img { - max-width: 250px; - max-height: 250px; - width: auto; - height: auto; -} + max-width: 250px; + max-height: 250px; + width: auto; + height: auto; } +/*# sourceMappingURL=profile.css.map */ \ No newline at end of file diff --git a/accounts/static/accounts/sass/edit.sass b/accounts/static/accounts/sass/edit.sass new file mode 100644 index 0000000000000000000000000000000000000000..e63d1075b8bcdb601b8ebc72d37a9b60c0283542 --- /dev/null +++ b/accounts/static/accounts/sass/edit.sass @@ -0,0 +1,12 @@ +img + display: inline-block + flex: 1 1 auto + max-width: 150px + +.align_left + text-align: left + +.addbtn + width: 100% + background-color: #bbb + padding: 0.5em diff --git a/accounts/static/accounts/sass/profile.sass b/accounts/static/accounts/sass/profile.sass new file mode 100644 index 0000000000000000000000000000000000000000..6205651ac665ebbd1859973b2bdf9607c7acda05 --- /dev/null +++ b/accounts/static/accounts/sass/profile.sass @@ -0,0 +1,5 @@ +img + max-width: 250px + max-height: 250px + width: auto + height: auto diff --git a/deploy_enib-net.sh b/deploy_enib-net.sh new file mode 100755 index 0000000000000000000000000000000000000000..57b9d628ebf30f3bb8900c39cfd705ca9f0c4b08 --- /dev/null +++ b/deploy_enib-net.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +LOCATION=$SSH_ORIGINAL_COMMAND + +cd $LOCATION + +git pull + +make diff --git a/poll/static/poll/css/question.css b/poll/static/poll/css/question.css index ddcf3554146b2126899e64192fc7d92daa3df2a0..78e2bf3253f9ef839e2f59bc1c9218fddd64c0f8 100644 --- a/poll/static/poll/css/question.css +++ b/poll/static/poll/css/question.css @@ -1,12 +1,15 @@ form ul { list-style: none; padding: 0; } + form label { margin-left: 1em; vertical-align: middle; } + form input[type=radio] { vertical-align: middle; } + form li { padding: 0.5em 0; } -/*# sourceMappingURL=question.css.map */ +/*# sourceMappingURL=question.css.map */ \ No newline at end of file diff --git a/webmail/static/webmail/css/index.css b/webmail/static/webmail/css/index.css index a38eec4f6b377decdb29b47ccdb2c76740167ce9..dd5bda352b212ba3e1292cc52dbfbf6a9e1ed5df 100644 --- a/webmail/static/webmail/css/index.css +++ b/webmail/static/webmail/css/index.css @@ -10,4 +10,4 @@ #main p { padding: 0 2em; } -/*# sourceMappingURL=index.css.map */ +/*# sourceMappingURL=index.css.map */ \ No newline at end of file