 Jan Tuomi
|
3b770343a0
|
Merge branch 'feature-payment' into develop
|
2017-05-10 20:37:29 +03:00 |
|
|
Jan Tuomi
|
56b6cf4893
|
Merge remote-tracking branch 'origin/feature-payment' into feature-payment
|
2017-05-10 19:54:42 +03:00 |
|
|
Jan Tuomi
|
7e2cf03ced
|
Merge remote-tracking branch 'origin/feature-postgres' into develop
|
2017-05-10 19:37:18 +03:00 |
|
|
Jan Tuomi
|
1974af3723
|
Merge branch 'urls-makeover' into develop
|
2017-05-10 19:30:54 +03:00 |
|
|
okalintu
|
33cf10c556
|
Change default email sender to comply with django
|
2017-05-10 17:10:54 +03:00 |
|
|
okalintu
|
fbd5d637a8
|
Tune autoinstall script and settings to postgres
|
2017-04-07 20:39:18 +03:00 |
|
|
okalintu
|
473a3d5cef
|
Modify docker files from mariadb to postgreSQL
|
2017-04-07 15:37:58 +03:00 |
|
|
okalintu
|
1cb8010f1f
|
Add psycopg2 as requirement
|
2017-04-07 13:32:59 +03:00 |
|
|
okalintu
|
94f3c94a14
|
Remove obsolete requirements from requirements.txt
Paramiko and qr-code modules are used no more
|
2017-04-07 13:28:32 +03:00 |
|
|
Jan Tuomi
|
d09bc9d6d7
|
Add --noinput flag to migrate in autoinstall.sh
|
2017-04-07 10:07:44 +03:00 |
|
|
Jan Tuomi
|
3f73a94b83
|
Separate urls.py into modular pieces
|
2017-04-06 21:03:43 +03:00 |
|
|
Jan Tuomi
|
f5dd72c6c4
|
Fix CSV separator stripping bug in csv import
|
2017-04-06 20:32:09 +03:00 |
|
|
Jan Tuomi
|
d028612d55
|
Minor script fixes
|
2017-04-06 19:13:18 +03:00 |
|
|
Jan Tuomi
|
c37aca50bd
|
Do not attempt to start docker daemon
|
2017-04-06 19:04:59 +03:00 |
|
|
Jan Tuomi
|
3f406b0f05
|
Fix DOCKER_OPTS
|
2017-04-06 18:22:03 +03:00 |
|
|
Jan Tuomi
|
56f8a17b67
|
Refine automation scripts
|
2017-04-06 18:18:54 +03:00 |
|
|
Juhana Luomanen
|
3855fb5179
|
Fix add_many_member footer problem
|
2017-03-31 00:25:56 +03:00 |
|
|
Jan Tuomi
|
8a6c274834
|
Merge branch 'cleanup' into 'develop'
Remove boilerplate from infoadmin controllers
See merge request !22
|
2017-03-30 18:18:57 +03:00 |
|
|
Jan Tuomi
|
274ab6ec5b
|
Fix createdefaultadmin.py output
|
2017-03-30 18:17:36 +03:00 |
|
|
okalintu
|
f93cb5aad5
|
Remove boilerplate from infoadmin controllers
|
2017-03-30 15:24:08 +03:00 |
|
|
henu
|
d093a9167c
|
Fix create_dummydata script models
|
2017-03-29 19:38:33 +03:00 |
|
|
henu
|
a947f21652
|
Change memberRequest model to Request model
|
2017-03-29 19:37:56 +03:00 |
|
|
henu
|
8249819e27
|
Merge branch 'develop' into feature-payment
|
2017-03-29 19:15:48 +03:00 |
|
|
henu
|
ea36d4b193
|
Fix member serializers, add own requirements to gitignore
|
2017-03-29 19:12:46 +03:00 |
|
|
Jan Tuomi
|
842930b24e
|
Merge branch 'feature-addmigrations' into 'develop'
Feature addmigrations
See merge request !20
|
2017-03-29 19:10:28 +03:00 |
|
|
Sika Production
|
63a28e872e
|
Add migrations back to the repo
|
2017-03-29 19:01:55 +03:00 |
|
|
Jan Tuomi
|
6c74ef0ea4
|
Merge branch 'develop' into 'master'
Develop
See merge request !18
|
2017-03-29 18:54:55 +03:00 |
|
|
Jan Tuomi
|
a9d7b0629e
|
Merge branch 'feature-apyscreen' into 'develop'
Feature apyscreen
See merge request !19
|
2017-03-29 18:53:36 +03:00 |
|
|
okalintu
|
1f032aec88
|
Refuctor apy dimensions
|
2017-03-29 18:50:55 +03:00 |
|
|
Joel Lavikainen
|
84b46ecd44
|
Prettify apy deal site
|
2017-03-29 18:44:35 +03:00 |
|
|
Joel Lavikainen
|
80c50cb1de
|
Add apy top dealers site
|
2017-03-29 18:05:02 +03:00 |
|
|
Joel Lavikainen
|
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 |
|
|
Joel Lavikainen
|
ae75dc3834
|
Add frontend controllers for apy deals
|
2017-03-29 17:45:42 +03:00 |
|
|
okalintu
|
ced6f648b2
|
Add Apyitem + urls to backend
|
2017-03-29 17:42:27 +03:00 |
|
|
okalintu
|
ba02327591
|
Add url to serve ÄPY statistics
|
2017-03-29 17:26:25 +03:00 |
|
|
okalintu
|
b52570c2df
|
Add missing dot after event dates
Nearly killed by grammar nazis
|
2017-03-29 17:10:19 +03:00 |
|
|
okalintu
|
1f0647bec9
|
Fix incorrect format string in error message
|
2017-03-29 17:08:33 +03:00 |
|
|
okalintu
|
af6a56e238
|
modify buch of http's to https
|
2017-03-29 16:54:26 +03:00 |
|
|
Jan Tuomi
|
65fd899e43
|
Add more translations
|
2017-03-29 16:42:18 +03:00 |
|
|
Jan Tuomi
|
acd9007372
|
Add translations
|
2017-03-29 16:25:06 +03:00 |
|
|
Jan Tuomi
|
435d96112e
|
Merge branch 'master' into develop
|
2017-03-29 16:13:14 +03:00 |
|
|
Jan Tuomi
|
0f4bce1a4f
|
Merge branch 'feature-events' into 'develop'
Feature events
See merge request !16
|
2017-03-29 15:47:28 +03:00 |
|
|
okalintu
|
11a24089cf
|
Add "sane" styles for event screen
|
2017-03-29 15:04:33 +03:00 |
|
|
okalintu
|
0e8cad7589
|
Add barebone skeleton for infoscreens event view
|
2017-03-29 13:53:48 +03:00 |
|
|
okalintu
|
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 |
|
|
henu
|
dd01b44445
|
Add submitted to request serializer
|
2017-03-29 06:47:02 +03:00 |
|
|
Jan Tuomi
|
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 |
|
|
Jan Tuomi
|
bd5cf096ff
|
Change http to https when using Angular CDN
|
2017-03-28 13:05:00 +03:00 |
|
|
Jan Tuomi
|
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 |
|
|
okalintu
|
d8f96faf6e
|
HOTFIX: fix ka.dy.fi url again
|
2017-03-27 16:39:19 +03:00 |
|