Commit Graph

  • b346c2122a Merge branch 'develop' into 'master' Aarni Halinen 2019-10-09 21:11:12 +00:00
  • 4725432c32 Merge branch 'feature/python-and-swarm-mods' into 'develop' Aarni Halinen 2019-10-09 20:58:25 +00:00
  • 4e5b6c565a Update to python 3.7 and add deploy policies Aarni Halinen 2019-10-09 23:53:35 +03:00
  • 4e216891e6 Remove copy from Dockerfile.prod Aarni Halinen 2019-10-09 23:51:36 +03:00
  • 562738f945 Use env variables for settings.py variables Aarni Halinen 2019-10-09 23:49:57 +03:00
  • 7ffddf41f8 Fix some paths Aarni Halinen 2019-10-09 23:23:16 +03:00
  • c9c814e405 Merge branch 'develop' Aarni Halinen 2019-10-09 22:21:57 +03:00
  • 88f37928ac Downgrade postgres from 12 to 10 Aarni Halinen 2019-10-09 22:21:32 +03:00
  • fcd7ae7c04 Replace kahmyopas.pdf Antti Mäki 2019-10-09 19:01:54 +00:00
  • 0f72a7ea21 Merge branch 'develop' Aarni Halinen 2019-10-09 21:18:16 +03:00
  • 995d42640f Revert "Remove DB volume temporarly" Aarni Halinen 2019-10-09 21:17:43 +03:00
  • 135c0309b5 Merge branch 'develop' Aarni Halinen 2019-10-09 19:33:45 +03:00
  • 13583bd6ab Add depends on DB for backend Aarni Halinen 2019-10-09 19:33:22 +03:00
  • 522c804369 Remove DB name, use same as DB USER Aarni Halinen 2019-10-09 19:32:46 +03:00
  • bd4551a222 Merge branch 'develop' Aarni Halinen 2019-10-09 19:03:50 +03:00
  • 046ae89d29 Remove DB volume temporarly Aarni Halinen 2019-10-09 19:03:40 +03:00
  • 7fee47f150 Merge branch 'develop' Aarni Halinen 2019-10-08 23:16:19 +03:00
  • 9ffec51537 Add ENV population to entrypoint.sh Aarni Halinen 2019-10-08 23:16:09 +03:00
  • c07ec5855a Revert "Read secrets from files to vars" Aarni Halinen 2019-10-08 23:07:45 +03:00
  • c445a4a66c Revert "Read ENV files runtime" Aarni Halinen 2019-10-08 23:07:03 +03:00
  • b0dd95fa86 Merge branch 'develop' Aarni Halinen 2019-10-08 22:17:28 +03:00
  • 96dd77e455 Read ENV files runtime Aarni Halinen 2019-10-08 22:17:18 +03:00
  • 9516dbbbea Merge branch 'develop' Aarni Halinen 2019-10-08 20:55:09 +03:00
  • 84f1f9239b Read secrets from files to vars Aarni Halinen 2019-10-08 20:54:54 +03:00
  • 5b2546217c Merge branch 'develop' Aarni Halinen 2019-10-08 19:57:06 +03:00
  • a24a7f02b9 Add _FILE ending for ENVs Aarni Halinen 2019-10-08 19:56:52 +03:00
  • 2646914b8a Merge branch 'develop' Aarni Halinen 2019-10-08 19:43:01 +03:00
  • d3c50dc608 Try other yml syntax Aarni Halinen 2019-10-08 19:42:49 +03:00
  • 17c00e519b Merge branch 'develop' Aarni Halinen 2019-10-08 13:04:42 +03:00
  • 34a4f027f5 Bump yml version Aarni Halinen 2019-10-08 13:04:30 +03:00
  • 389771d106 Merge branch 'develop' Aarni Halinen 2019-10-08 12:41:51 +03:00
  • 66ed4c0713 Dockerize postgres Aarni Halinen 2019-10-08 12:41:40 +03:00
  • ed4e226186 Merge branch 'develop' Aarni Halinen 2019-10-08 10:19:30 +03:00
  • 1038e9c67e Fix syntax errors Aarni Halinen 2019-10-08 10:19:14 +03:00
  • bc7a8ebd17 Merge branch 'develop' Aarni Halinen 2019-10-08 10:01:29 +03:00
  • 6a3398e8de Bump yml version Aarni Halinen 2019-10-08 10:01:19 +03:00
  • cfdac40d3b Merge branch 'develop' Aarni Halinen 2019-10-08 09:41:07 +03:00
  • 8a87288d25 Add host network config Aarni Halinen 2019-10-08 09:40:53 +03:00
  • 1d4a509c7e Install whitenoise for serving static files Aarni Halinen 2019-10-08 09:34:56 +03:00
  • ec4be22552 Merge branch 'develop' Aarni Halinen 2019-10-08 01:00:41 +03:00
  • 29d2f6b90d Use Docker interface IP to access DB Aarni Halinen 2019-10-08 01:00:29 +03:00
  • 06d5e3c6f4 Merge branch 'develop' Aarni Halinen 2019-10-08 00:46:46 +03:00
  • 5d6cf1fb80 Add execution rights to entry scripåt Aarni Halinen 2019-10-08 00:46:37 +03:00
  • 95e72b7ab2 Add placeholder publish to fix dev server Aarni Halinen 2019-10-08 00:42:44 +03:00
  • 89cd91dbad Merge branch 'develop' Aarni Halinen 2019-10-08 00:32:54 +03:00
  • d17d1fb1b7 Add entrypoint script Aarni Halinen 2019-10-08 00:29:20 +03:00
  • d0d822b8f4 Add network_mode host for DB access Aarni Halinen 2019-10-08 00:22:03 +03:00
  • 44c091f2d5 Merge branch 'develop' Aarni Halinen 2019-10-08 00:05:15 +03:00
  • f6abe6f999 Fix Prod container settings path Aarni Halinen 2019-10-08 00:04:59 +03:00
  • 8a5bbaa229 Remove docker-compose db volumes Aarni Halinen 2019-10-07 23:56:55 +03:00
  • c1b3bedf8d Merge branch 'develop' Aarni Halinen 2019-10-07 23:53:24 +03:00
  • 5750d62fe0 Fix production container Aarni Halinen 2019-10-07 23:47:06 +03:00
  • 3c16029e88 Merge branch 'develop' Aarni Halinen 2019-10-07 22:03:17 +03:00
  • 71e683fbe3 Fix secret namespace Aarni Halinen 2019-10-07 22:03:05 +03:00
  • 41d6f17716 Merge branch 'develop' Aarni Halinen 2019-10-07 21:28:27 +03:00
  • e214144ec3 Add external secrets Aarni Halinen 2019-10-07 21:28:16 +03:00
  • 2649afdd4b Merge branch 'develop' Aarni Halinen 2019-10-07 21:19:28 +03:00
  • 0faf19e319 yml syntax fix Aarni Halinen 2019-10-07 21:19:05 +03:00
  • 8ee514326a Merge branch 'develop' Aarni Halinen 2019-10-07 21:10:43 +03:00
  • 10552c5f2a Try docker secrets Aarni Halinen 2019-10-07 21:10:13 +03:00
  • 48e34ece4f Merge branch 'develop' Aarni Halinen 2019-10-07 20:31:48 +03:00
  • 4181b246a1 Add path to .ENV file on prod server Aarni Halinen 2019-10-07 20:17:02 +03:00
  • c39979e253 Use different python image Aarni Halinen 2019-10-07 20:16:35 +03:00
  • 807c599b85 Typo fix Aarni Halinen 2019-10-07 20:03:07 +03:00
  • d2af34bf0c Merge branch 'develop' Aarni Halinen 2019-10-07 19:59:34 +03:00
  • 9e186c32ba Manual production deploy Aarni Halinen 2019-10-07 19:59:23 +03:00
  • ddf4ad7b8d Merge branch 'develop' Aarni Halinen 2019-10-07 19:57:32 +03:00
  • e3d0709b31 Add new Dockerfile for prod Aarni Halinen 2019-10-07 19:56:55 +03:00
  • 3169191a0d Merge branch 'develop' into 'master' Aarni Halinen 2019-10-07 16:04:32 +00:00
  • bd8fc6b404 New Sika Docker swarm deploy Aarni Halinen 2019-10-07 18:49:29 +03:00
  • 8500ed8fbd Update header.css Antti Mäki 2019-10-06 22:18:21 +00:00
  • cb86c9a2ae Fix Kaehmy PresetRole rendering by removing wrap_label from checkbox_option.html Aarni Halinen 2019-10-06 18:32:17 +03:00
  • bb0f4244c7 Update django-bootstrap3 Aarni Halinen 2019-10-06 18:31:18 +03:00
  • cd2fe4e8f2 Update kaehmy dates Aarni Halinen 2019-10-06 15:34:35 +03:00
  • bf3f1f783c Replace kaehmy_banner.png Antti Mäki 2019-10-06 11:03:09 +00:00
  • 37f509ff76 Replace kaehmy_banner.png Antti Mäki 2019-10-06 11:02:01 +00:00
  • b58dbde83c Minor cleanup Aarni Halinen 2019-09-28 19:52:14 +03:00
  • 0da0a02bac Get Officials by year with query param year Aarni Halinen 2019-09-28 17:41:37 +03:00
  • fef74dd995 Fix brainfart Aarni Halinen 2019-09-26 21:03:26 +03:00
  • 2356365197 Reconstruct migrations (squash merge request) Aarni Halinen 2019-09-26 20:52:11 +03:00
  • 5a29c8c49d Set contact serializer Aarni Halinen 2019-09-26 20:43:13 +03:00
  • e365c394d8 Fix user creation receiver at official creation Aarni Halinen 2019-09-26 20:16:24 +03:00
  • 22371b8f15 Locales Aarni Halinen 2019-09-26 19:22:11 +03:00
  • 32feb46f88 Add occupation model to function as history of roles Aarni Halinen 2019-09-26 19:17:01 +03:00
  • 6c77fe4da6 Update autocomplete-light in requirements Aarni Halinen 2019-09-16 19:59:34 +03:00
  • 5dc7442d03 Update Python version and Django-autocomplete-light Aarni Halinen 2019-09-16 19:57:47 +03:00
  • 9f664737b6 Add Member application emails Aarni Halinen 2019-09-16 19:44:14 +03:00
  • 1c3b4367a2 Fix POST permissions for submit application Aarni Halinen 2019-09-16 17:55:14 +03:00
  • ba9b5d02b2 Add attachment to emails Leo Kivikunnas 2019-09-09 20:29:00 +03:00
  • 3b48012e4f Add nobot app to protect links from bots:wq okalintu 2019-06-08 17:12:59 +03:00
  • 242d143a5e Expenses claim should now send dummy email on POST Leo Kivikunnas 2019-06-03 20:33:28 +03:00
  • 9a9757c914 Moved expenses claim development to its own feature branch Leo Kivikunnas 2019-06-03 19:52:12 +03:00
  • 2bf19d357e Fixed IBAN validation and amount field in exenses claim and added some tests Leo Kivikunnas 2019-06-03 19:35:08 +03:00
  • 7e31f72301 Update docker image to new registry Aarni Halinen 2019-05-27 23:40:27 +03:00
  • 68bb003411 Fix .md file style warnings Aarni Halinen 2019-05-27 23:38:40 +03:00
  • 7133f36e5d cd: web2.0: No such file or directory Antti Mäki 2019-05-27 18:01:39 +00:00
  • c9962c4d8e Fixed style errors Leo Kivikunnas 2019-05-27 20:46:56 +03:00
  • 5832bd1765 Added venv got .eslintignore Leo Kivikunnas 2019-05-27 20:35:45 +03:00
  • 4046d2c753 Started work on expenses claim Leo Kivikunnas 2019-05-27 20:32:18 +03:00
  • 93298618ae Add docker login to deploy dev Aarni Halinen 2019-05-27 17:48:48 +03:00