8249819e27
Merge branch 'develop' into feature-payment
2017-03-29 19:15:48 +03:00
ea36d4b193
Fix member serializers, add own requirements to gitignore
2017-03-29 19:12:46 +03:00
842930b24e
Merge branch 'feature-addmigrations' into 'develop'
...
Feature addmigrations
See merge request !20
2017-03-29 19:10:28 +03:00
63a28e872e
Add migrations back to the repo
2017-03-29 19:01:55 +03:00
6c74ef0ea4
Merge branch 'develop' into 'master'
...
Develop
See merge request !18
2017-03-29 18:54:55 +03:00
a9d7b0629e
Merge branch 'feature-apyscreen' into 'develop'
...
Feature apyscreen
See merge request !19
2017-03-29 18:53:36 +03:00
1f032aec88
Refuctor apy dimensions
2017-03-29 18:50:55 +03:00
84b46ecd44
Prettify apy deal site
2017-03-29 18:44:35 +03:00
80c50cb1de
Add apy top dealers site
2017-03-29 18:05:02 +03:00
375e861d55
Merge backend and frontend for apy
...
Merge branch 'feature-apyscreen' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-apyscreen
2017-03-29 17:46:27 +03:00
ae75dc3834
Add frontend controllers for apy deals
2017-03-29 17:45:42 +03:00
ced6f648b2
Add Apyitem + urls to backend
2017-03-29 17:42:27 +03:00
ba02327591
Add url to serve ÄPY statistics
2017-03-29 17:26:25 +03:00
b52570c2df
Add missing dot after event dates
...
Nearly killed by grammar nazis
2017-03-29 17:10:19 +03:00
1f0647bec9
Fix incorrect format string in error message
2017-03-29 17:08:33 +03:00
af6a56e238
modify buch of http's to https
2017-03-29 16:54:26 +03:00
65fd899e43
Add more translations
2017-03-29 16:42:18 +03:00
acd9007372
Add translations
2017-03-29 16:25:06 +03:00
435d96112e
Merge branch 'master' into develop
2017-03-29 16:13:14 +03:00
0f4bce1a4f
Merge branch 'feature-events' into 'develop'
...
Feature events
See merge request !16
2017-03-29 15:47:28 +03:00
11a24089cf
Add "sane" styles for event screen
2017-03-29 15:04:33 +03:00
0e8cad7589
Add barebone skeleton for infoscreens event view
2017-03-29 13:53:48 +03:00
9b834032db
Add sqlite3 files to .gitignore
...
Enable use of sqlite as dev db
without it polluting the git repo
2017-03-29 13:51:10 +03:00
dd01b44445
Add submitted to request serializer
2017-03-29 06:47:02 +03:00
409321ad83
Merge branch 'hotfix-members-https' into 'master'
...
Change http to https when using Angular CDN
See merge request !15
2017-03-28 13:07:36 +03:00
bd5cf096ff
Change http to https when using Angular CDN
2017-03-28 13:05:00 +03:00
d531d1b339
Merge branch 'hotfix-coffee' into 'master'
...
HOTFIX: fix ka.dy.fi url again
See merge request !14
2017-03-27 18:11:02 +03:00
d8f96faf6e
HOTFIX: fix ka.dy.fi url again
2017-03-27 16:39:19 +03:00
d65be00dbb
Merge branch 'hotfix-coffee' into 'master'
...
HOTFIX: change url ka.dy.fi to https
See merge request !13
2017-03-27 15:00:11 +03:00
2356f44a3d
HOTFIX: change url ka.dy.fi to https
2017-03-27 12:32:59 +03:00
312ed57714
Move changes from feature-member
2017-03-22 19:09:58 +02:00
29a52a852c
Add max-width to table cells in infoscreen admin
2017-03-22 17:34:44 +02:00
c35c2f0cd9
add production image building files to scripts/production
2017-03-22 16:19:13 +02:00
306a5b48a1
Modify coffeeinfoitem into generic websiteinfoitem
...
Resolve #31
2017-03-08 18:30:38 +02:00
404b1411af
Add all branches to GitLab CI
2017-03-08 17:50:59 +02:00
ae13a371c6
Merge branch 'revert-broken-rest' into 'master'
...
Revert "[Members] Made frontend to use mainly rest api"
Remove broken/not ready commit from going into production.
This reverts commit 75418da403!12
2017-03-08 17:41:27 +02:00
e3147c3ef9
Fix broken redirect in member addition
2017-03-08 17:40:50 +02:00
08b4c17044
Revert "[Members] Made frontend to use mainly rest api"
...
This reverts commit 75418da403
2017-03-08 17:23:41 +02:00
69501df872
Merge branch 'develop' into 'master'
...
Merge CI tests and fixes
See merge request !11
2017-03-06 14:57:19 +02:00
cd90a7bf20
Add master branch to CI
2017-03-06 14:54:31 +02:00
e628b37e0d
Add error check to createdefaultadmin command
2017-03-06 02:13:32 +02:00
1c40fab8ae
Small fix to after_script
2017-03-06 02:06:36 +02:00
0ed36a63a4
Add cleanup commands to GitLab CI
2017-03-06 02:01:47 +02:00
804afeb057
Add installer script to readme
2017-03-06 01:50:11 +02:00
0c1e836902
Fix more SQL
2017-03-06 01:25:04 +02:00
9a349f093a
Fix SQL in db/init.sql
2017-03-06 01:15:02 +02:00
5d4bc772bd
Skip writing .pyc files in docker container
2017-03-06 00:27:21 +02:00
6e966b07d8
Fix test command in GitLab CI config
2017-03-06 00:18:05 +02:00
e7dac97e93
Fix problem with TTY allocation in GitLab CI
2017-03-06 00:13:04 +02:00
09a0bbc070
Update autoinstall.sh
2017-03-05 23:52:26 +02:00
henu