TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: TTMK/web2.0-backend:production
Branches Tags
TTMK/web2.0-backend:main TTMK/web2.0-backend:production TTMK/web2.0-backend:develop TTMK/web2.0-backend:revert-7554c1e7 TTMK/web2.0-backend:master TTMK/web2.0-backend:feature/signup-allow-user-deletion TTMK/web2.0-backend:rewrite-publishable-db-models TTMK/web2.0-backend:bugfix/fix-feed-filters TTMK/web2.0-backend:clean-old-templates TTMK/web2.0-backend:feature-nobot TTMK/web2.0-backend:feature-expenses-claim TTMK/web2.0-backend:feature-member-emails TTMK/web2.0-backend:feature-coffee-history TTMK/web2.0-backend:feature-refactor-webapp-styles
...
pull from: TTMK/web2.0-backend:master
Branches Tags
TTMK/web2.0-backend:production TTMK/web2.0-backend:main TTMK/web2.0-backend:develop TTMK/web2.0-backend:revert-7554c1e7 TTMK/web2.0-backend:master TTMK/web2.0-backend:feature/signup-allow-user-deletion TTMK/web2.0-backend:rewrite-publishable-db-models TTMK/web2.0-backend:bugfix/fix-feed-filters TTMK/web2.0-backend:clean-old-templates TTMK/web2.0-backend:feature-nobot TTMK/web2.0-backend:feature-expenses-claim TTMK/web2.0-backend:feature-member-emails TTMK/web2.0-backend:feature-coffee-history TTMK/web2.0-backend:feature-refactor-webapp-styles

95 Commits
production ... master

Author SHA1 Message Date
Simeon Pursiainen 8164094b44 Edit email.html 2025-01-23 19:13:16 +00:00
Simeon Pursiainen fd12f35e2e Update .gitlab-ci.yml file 2025-01-23 19:09:37 +00:00
Simeon Pursiainen f69615437a Edit email.html 2025-01-23 19:06:02 +00:00
Simeon Pursiainen 533f367b4e Edit Hafv date 2025-01-21 21:18:06 +00:00
Simeon Pursiainen 93202d8a11 skip ci 2025-01-21 20:59:13 +00:00
Simeon Pursiainen e1e1adc397 Changed date for 2025 Hafv 2025-01-21 13:15:02 +00:00
tommi s 0df2d4ab46 Merge branch 'develop' into 'master' 
Develop to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!98
 2023-10-05 13:45:16 +00:00
tommi s 738051355b Merge branch 'develop' into 'master' 
fixes

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!97
 2023-10-04 18:02:38 +00:00
tommi s 1cf67c7686 Merge branch 'develop' into 'master' 
Edit signup email contact address

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!96
 2023-10-04 17:26:31 +00:00
tommi s 2ff0cab544 Merge branch 'develop' into 'master' 
Kaehmy dates update

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!95
 2023-10-03 20:42:29 +00:00
tommi s 2169bad90d Merge branch 'develop' into 'master' 
Develop to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!93
 2023-09-15 09:21:19 +00:00
Aarni Halinen c79d824a8a Merge branch 'develop' into 'master' 
Prod deploy: Add log level to gunicorn

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!92
 2023-03-27 16:30:59 +00:00
Ilari Ojakorpi 1e14f98f9d Merge branch 'develop' into 'master' 
Develop

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!91
 2023-03-05 18:03:40 +00:00
Ilari Ojakorpi f51611bbee Merge branch 'develop' into 'master' 
Develop to Master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!90
 2023-02-07 14:58:52 +00:00
Ilari Ojakorpi 4373f37dfe Merge branch 'develop' into 'master' 
Merge Develop to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!89
 2022-12-29 13:53:51 +00:00
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
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
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
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
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
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
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
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
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
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
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 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
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
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 c45bcc5442 Merge branch 'develop' into 'master' 
Prod deploy: Fix Filebrowser authentication cookie

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!66
 2022-07-24 18:26:38 +00:00
Aarni Halinen 2383e2089d Merge branch 'develop' into 'master' 
Prod deploy: Add algorithms for FileBrowser JWT verification

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!65
 2022-07-24 17:35:33 +00:00
Ilari Ojakorpi 5f467323b5 Merge branch 'develop' into 'master' 
Merge 'Develop' into master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!64
 2022-07-06 19:50:50 +00:00
Ilari Ojakorpi a9c122c0d4 Merge branch 'develop' into 'master' 
heevi email fix

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!62
 2022-05-26 09:28:20 +00:00
Ilari Ojakorpi d4a219290b Merge branch 'develop' into 'master' 
Merge develop into master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!61
 2022-05-22 23:08:42 +00:00
Ilari Ojakorpi e74580fdde Merge branch 'develop' into 'master' 
Merge develop into master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!60
 2022-05-19 20:58:32 +00:00
Aarni Halinen 8c90471eb1 Merge branch 'develop' into 'master' 
Prod deploy: Webhooks (new TG bot setup)

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!55
 2022-01-14 00:50:18 +00:00
Aarni Halinen fc73424665 Merge branch 'develop' into 'master' 
Prod deploy: Fix Ohlhafv emails

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!52
 2022-01-13 20:12:13 +00:00
Aarni Halinen b610a8af6e Merge branch 'develop' into 'master' 
Prod deploy: Disable sentry performance monitoring

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!51
 2021-11-17 17:30:51 +00:00
Toni Lyttinen 6022b11dc1 Merge branch 'develop' into 'master' 
Prod deploy: Sentry & update Ohlhafv page

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!49
 2021-11-17 16:22:34 +00:00
Oskari Ponkala 72ea31a887 Merge branch 'develop' into 'master' 
Develop

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!47
 2021-10-05 08:44:31 +00:00
Oskari Ponkala 40b824355b Merge branch 'develop' into 'master' 
Develop

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!45
 2021-06-01 08:45:26 +00:00
Aarni Halinen 5f69f34bf3 Merge branch 'develop' into 'master' 2021-05-16 18:43:23 +03:00
Aarni Halinen c0db047cd9 Merge branch 'develop' into 'master' 2021-05-16 18:18:00 +03:00
Aarni Halinen e2c32e81a7 Merge branch 'develop' into 'master' 
Prod deploy: Python 3.9, poetry & dependency updates, SendGrid, Managed DB

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!41
 2021-05-16 14:54:43 +00:00
Toni Lyttinen 6a65ca32d7 Merge branch 'develop' into 'master' 
Merge feed list order fix to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!39
 2021-04-08 10:22:38 +00:00
Aarni Halinen 99739cd035 Merge branch 'develop' into 'master' 
1st Live deploy

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!37
 2021-03-31 21:02:11 +00:00
Aarni Halinen 8454e67a92 Merge branch 'develop' into 'master' 
Prod deploy

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!36
 2021-03-30 17:08:29 +00:00
Aarni Halinen 33c7c20140 Merge branch 'develop' into 'master' 
Prod deploy

* Soft deletes

* sahkoinsinoorikilta.fi domain

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!34
 2021-01-19 15:42:22 +00:00
Aarni Halinen 5a77b1546d Merge branch 'develop' into 'master' 
Azure deploy & Signup flow

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!32
 2020-12-12 12:11:09 +00:00
Toni Lyttinen 81971b6da4 Merge branch 'develop' into 'master' 
added "toimikunta-appro" date to kaehmy.html

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!28
 2020-10-28 13:39:45 +00:00
Toni Lyttinen a68fa9a6d6 Merge branch 'develop' into 'master' 
Kaehmy fix Merge

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!27
 2020-10-20 18:43:07 +00:00
Toni Lyttinen 034e04a788 Merge branch 'develop' into 'master' 
Merge kaehmy changes to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!26
 2020-10-07 08:48:06 +00:00
Aarni Halinen d416fda39e Merge branch 'develop' into 'master' 
SIK100 Seminar email hack

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!23
 2020-08-31 01:11:31 +00:00
Aarni Halinen e4fbb58026 Merge branch 'develop' into 'master' 
API serializers for signups

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!22
 2020-08-29 12:09:55 +00:00
Aarni Halinen 56dfd57698 Merge branch 'develop' into 'master' 
Serialize SignupForm visible

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!20
 2020-07-25 09:23:14 +00:00
Aarni Halinen 8632aa01da Merge branch 'develop' into 'master' 
Signup modifications to production

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!19
 2020-07-24 19:29:20 +00:00
Aarni Halinen 8b1f668d38 Merge branch 'develop' into 'master' 
Dependency bump, move volumes under static file server

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!17
 2020-03-05 19:21:53 +00:00
Toni Lyttinen 027bf5e7bd Merge branch 'develop' into 'master' 
Color updates to Ohlhalv

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!16
 2020-02-02 14:42:40 +00:00
Toni Lyttinen be22fea3f2 Merge branch 'develop' into 'master' 
Updated ohlhafv challenge buttoncolor to match the page background

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!15
 2020-02-02 14:26:23 +00:00
Toni Lyttinen 5e434408b0 Merge branch 'develop' into 'master' 
New Ohlhafv graphics

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!14
 2020-02-02 14:00:17 +00:00
Toni Lyttinen 41762e920f Updated background color to match image 2020-02-02 13:10:41 +00:00
Aarni Halinen f390e1fb1f Merge branch 'develop' into 'master' 
api.sika.sik.party

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!13
 2019-12-18 18:39:27 +00:00
Aarni Halinen 4e35a73a4b Merge branch 'develop' into 'master' 
Update admin login url

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!12
 2019-12-17 19:44:45 +00:00
Aarni Halinen 6955659acb Merge branch 'develop' into 'master' 
Add filebrowser

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!11
 2019-12-17 17:24:04 +00:00
Aarni Halinen dbc7811651 Merge branch 'develop' into 'master' 
Update PG, Hackathon commits

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!10
 2019-12-17 16:39:12 +00:00
Aarni Halinen 6c4a26eb44 Merge branch 'develop' 2019-10-10 01:05:24 +03:00
Aarni Halinen fb9dbe2cd2 Merge branch 'develop' 2019-10-10 00:46:11 +03:00
Aarni Halinen b346c2122a Merge branch 'develop' into 'master' 
Python 3.7 and path fixes

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!7
 2019-10-09 21:11:12 +00:00
Aarni Halinen c9c814e405 Merge branch 'develop' 2019-10-09 22:21:57 +03:00
Aarni Halinen 0f72a7ea21 Merge branch 'develop' 2019-10-09 21:18:16 +03:00
Aarni Halinen 135c0309b5 Merge branch 'develop' 2019-10-09 19:33:45 +03:00
Aarni Halinen bd4551a222 Merge branch 'develop' 2019-10-09 19:03:50 +03:00
Aarni Halinen 7fee47f150 Merge branch 'develop' 2019-10-08 23:16:19 +03:00
Aarni Halinen b0dd95fa86 Merge branch 'develop' 2019-10-08 22:17:28 +03:00
Aarni Halinen 9516dbbbea Merge branch 'develop' 2019-10-08 20:55:09 +03:00
Aarni Halinen 5b2546217c Merge branch 'develop' 2019-10-08 19:57:06 +03:00
Aarni Halinen 2646914b8a Merge branch 'develop' 2019-10-08 19:43:01 +03:00
Aarni Halinen 17c00e519b Merge branch 'develop' 2019-10-08 13:04:42 +03:00
Aarni Halinen 389771d106 Merge branch 'develop' 2019-10-08 12:41:51 +03:00
Aarni Halinen ed4e226186 Merge branch 'develop' 2019-10-08 10:19:30 +03:00
Aarni Halinen bc7a8ebd17 Merge branch 'develop' 2019-10-08 10:01:29 +03:00
Aarni Halinen cfdac40d3b Merge branch 'develop' 2019-10-08 09:41:07 +03:00
Aarni Halinen ec4be22552 Merge branch 'develop' 2019-10-08 01:00:41 +03:00
Aarni Halinen 06d5e3c6f4 Merge branch 'develop' 2019-10-08 00:46:46 +03:00
Aarni Halinen 89cd91dbad Merge branch 'develop' 2019-10-08 00:32:54 +03:00
Aarni Halinen 44c091f2d5 Merge branch 'develop' 2019-10-08 00:05:15 +03:00
Aarni Halinen c1b3bedf8d Merge branch 'develop' 2019-10-07 23:53:24 +03:00
Aarni Halinen 3c16029e88 Merge branch 'develop' 2019-10-07 22:03:17 +03:00
Aarni Halinen 41d6f17716 Merge branch 'develop' 2019-10-07 21:28:27 +03:00
Aarni Halinen 2649afdd4b Merge branch 'develop' 2019-10-07 21:19:28 +03:00
Aarni Halinen 8ee514326a Merge branch 'develop' 2019-10-07 21:10:43 +03:00
Aarni Halinen 48e34ece4f Merge branch 'develop' 2019-10-07 20:31:48 +03:00
Aarni Halinen d2af34bf0c Merge branch 'develop' 2019-10-07 19:59:34 +03:00
Aarni Halinen ddf4ad7b8d Merge branch 'develop' 2019-10-07 19:57:32 +03:00
Aarni Halinen 3169191a0d Merge branch 'develop' into 'master' 
New Sika & Membership application

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!3
 2019-10-07 16:04:32 +00:00
2 changed files with 4 additions and 1 deletions
Expand all files Collapse all files
.gitlab-ci.yml
+3
View File
@@ -24,6 +24,9 @@ audit:
stage: audit
only:
- pushes
- develop
except:
- master
needs: []
before_script:
- pip install poetry==1.3.1
templates/ohlhafv/email.html
+1 -1
View File
@@ -5,6 +5,6 @@
{{ challenge.message }}
{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 16.2" %}.
{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 13.2" %}.
{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}