TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,555 Commits 14 Branches 0 Tags
d8fdc2cc7403665b016d26a5ac82a2bc3624e23d
Commit Graph

1555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilari Ojakorpi d8fdc2cc74 Merge branch 'develop' into 'master' 
Changes to kaehmy categories

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!86
 2022-10-05 11:24:00 +00:00
Ojakoo 5e1390ab6b Changes to kaehmy categories 2022-10-05 14:18:28 +03:00
Ilari Ojakorpi eb2ae3368a Merge branch 'develop' into 'master' 
Develop to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!85
 2022-10-05 10:08:08 +00:00
Ojakoo 99348dc297 Update dparse 2022-10-05 12:58:29 +03:00
Ojakoo 715b309c89 Added new categories for kaehmy 2022-10-05 12:43:52 +03:00
Ilari Ojakorpi f7f63b8670 Merge branch 'develop' into 'master' 
Use html templates for kaehmy emails. No translations for now.

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!84
 2022-09-23 18:01:33 +00:00
Ojakoo 70676d5203 Lint 2022-09-23 20:53:25 +03:00
Ojakoo 037e4ae6e8 Use html templates for kaehmy emails. No translations for now. 2022-09-23 20:30:08 +03:00
Ilari Ojakorpi 53742e5caa Merge branch 'develop' into 'master' 
Update kaehmy page

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!83
 2022-09-23 15:29:08 +00:00
Ojakoo 8d6f13b61d Update privacy policy link 2022-09-23 17:57:36 +03:00
Ojakoo 03982ee620 Update kaehmy dates and change header to html instead of picture. 2022-09-23 17:51:01 +03:00
Ilari Ojakorpi 2affae7bfd Merge branch 'develop' into 'master' 
Develop

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!82
 2022-09-19 08:09:20 +00:00
Ojakoo a8923b63d6 wrap private key 2022-09-13 13:31:58 +03:00
Ojakoo 19975877cb Remove debug stuff 2022-09-13 09:59:55 +03:00
Ojakoo 2e0fad4bb2 Use POSIX format for source 2022-09-12 22:42:01 +03:00
Ojakoo f0179c1840 Change google creds format. Ugly but works. 2022-09-12 22:38:18 +03:00
Ojakoo 37a9750d4d Add group key and dev secrets to stack compose 2022-09-05 13:38:26 +03:00
Ojakoo 5575186570 lint 2022-09-05 12:03:31 +03:00
Ojakoo 9e179d5e06 Added error handling for incorrectly formatted google creds 2022-09-05 10:40:29 +03:00
Ilari Ojakorpi f7659e1e1b Merge branch 'develop' into 'master' 
Modified paths

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!81
 2022-08-17 20:53:54 +00:00
Ojakoo ea9a732803 Modified paths 2022-08-17 23:00:11 +03:00
Ilari Ojakorpi a4ae136e1a Merge branch 'develop' into 'master' 
juuh eli

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!80
 2022-08-16 20:07:54 +00:00
Ojakoo 0026b788b2 juuh eli 2022-08-16 23:00:36 +03:00
Ilari Ojakorpi 570fff1d7d Merge branch 'develop' into 'master' 
Totally works now

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!79
 2022-08-16 19:33:24 +00:00
Ojakoo da3a484f6c wbn? 2022-08-16 22:24:20 +03:00
Ilari Ojakorpi 9d116528b9 Merge branch 'develop' into 'master' 
Develop

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!78
 2022-08-16 18:49:48 +00:00
Ojakoo a310d51f5e or not 2022-08-16 21:43:04 +03:00
Ojakoo 6732e30213 #14 fix paths 2022-08-16 21:26:55 +03:00
Ilari Ojakorpi afbdca1501 Merge branch 'develop' into 'master' 
Enable GOOGLE_SERVICE_ACCOUNT, should work now..

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!77
 2022-08-16 18:14:50 +00:00
Ojakoo 4e59eee200 Enable GOOGLE_SERVICE_ACCOUNT, should work now.. 2022-08-16 20:59:19 +03:00
Aarni Halinen 03e4ccdf5d Merge branch 'develop' into 'master' 
Prod deploy: Fix kaehmy form

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!76
 2022-08-11 08:36:29 +00:00
Aarni Halinen bb0b2a2628 Fix kaehmy form 2022-08-11 11:28:30 +03:00
Aarni Halinen 16454ebdf6 Merge branch 'develop' into 'master' 
Prod deploy: Disable GOOGLE_SERVICE_ACCOUNT for debugging

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!75
 2022-08-11 07:00:05 +00:00
Aarni Halinen 32d636d3ee Disable GOOGLE_SERVICE_ACCOUNT for debugging 2022-08-11 09:52:58 +03:00
Ilari Ojakorpi 2e2464fb5f Merge branch 'develop' into 'master' 
dumdum

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!74
 2022-08-09 18:55:55 +00:00
Ojakoo c91b99cdb1 lol 2022-08-09 21:44:01 +03:00
Ilari Ojakorpi caf2113e49 Merge branch 'develop' into 'master' 
Merge 'develop' into' master'

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!71
 2022-08-09 14:11:42 +00:00
Aarni Halinen ca73eba609 Revert "Install django-suit v2" 
This reverts commit fe46d57108.
 2022-08-06 16:26:15 +03:00
Aarni Halinen fe46d57108 Install django-suit v2 2022-08-06 16:02:58 +03:00
Ojakoo 70e1835a4f Update dependencies 2022-08-06 12:28:43 +03:00
Ojakoo b7f17671d9 Resolve conlict 2022-08-06 12:09:50 +03:00
Ojakoo 34659403a8 lint 2022-08-06 11:03:39 +03:00
Ojakoo 4fbf5fe0a4 Jas list error notification only in prod 2022-08-06 10:17:43 +03:00
Ojakoo c6be0e6562 Add google envs to deploy 2022-08-06 10:07:00 +03:00
Aarni Halinen 3623c7e9f4 Fix TG message template 2022-08-04 00:51:45 +03:00
Aarni Halinen 298db5b78e Merge branch 'remove-baserole' into 'develop' 
Remove webapp BaseRole model

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!67
 2022-08-03 20:44:55 +00:00
Aarni Halinen 1ca6de3090 Fix lint 2022-08-03 23:35:41 +03:00
Aarni Halinen 07d0f2aa47 Remove comment 2022-08-03 23:19:42 +03:00
Aarni Halinen 93e122b8a8 Remove webapp BaseRole 2022-08-03 23:19:40 +03:00
Aarni Halinen 9678b663a0 Update kaehmy BaseRole 2022-08-03 23:18:32 +03:00