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

316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
henu ea36d4b193 Fix member serializers, add own requirements to gitignore 2017-03-29 19:12:46 +03:00
henu dd01b44445 Add submitted to request serializer 2017-03-29 06:47:02 +03:00
Jan Tuomi 312ed57714 Move changes from feature-member 2017-03-22 19:09:58 +02:00
Juhana Luomanen 29a52a852c Add max-width to table cells in infoscreen admin 2017-03-22 17:34:44 +02:00
okalintu c35c2f0cd9 add production image building files to scripts/production 2017-03-22 16:19:13 +02:00
Joel Lavikainen 306a5b48a1 Modify coffeeinfoitem into generic websiteinfoitem 
Resolve #31
 2017-03-08 18:30:38 +02:00
Jan Tuomi 404b1411af Add all branches to GitLab CI 2017-03-08 17:50:59 +02:00
Jan Tuomi 69501df872 Merge branch 'develop' into 'master' 
Merge CI tests and fixes



See merge request !11
 2017-03-06 14:57:19 +02:00
Jan Tuomi cd90a7bf20 Add master branch to CI 2017-03-06 14:54:31 +02:00
Jan Tuomi e628b37e0d Add error check to createdefaultadmin command 2017-03-06 02:13:32 +02:00
Jan Tuomi 1c40fab8ae Small fix to after_script 2017-03-06 02:06:36 +02:00
Jan Tuomi 0ed36a63a4 Add cleanup commands to GitLab CI 2017-03-06 02:01:47 +02:00
Jan Tuomi 804afeb057 Add installer script to readme 2017-03-06 01:50:11 +02:00
Jan Tuomi 0c1e836902 Fix more SQL 2017-03-06 01:25:04 +02:00
Jan Tuomi 9a349f093a Fix SQL in db/init.sql 2017-03-06 01:15:02 +02:00
Jan Tuomi 5d4bc772bd Skip writing .pyc files in docker container 2017-03-06 00:27:21 +02:00
Jan Tuomi 6e966b07d8 Fix test command in GitLab CI config 2017-03-06 00:18:05 +02:00
Jan Tuomi e7dac97e93 Fix problem with TTY allocation in GitLab CI 2017-03-06 00:13:04 +02:00
Jan Tuomi 09a0bbc070 Update autoinstall.sh 2017-03-05 23:52:26 +02:00
Jan Tuomi 403a44d859 Change docker install method in autoinstall.sh 2017-03-05 23:46:43 +02:00
Jan Tuomi d9766eefa9 Fix typo in config 2017-03-03 12:52:04 +02:00
Jan Tuomi 4416c35d36 Add GitLab CI config for testing 2017-03-03 12:49:11 +02:00
Jan Tuomi 307ddbdca6 Add one click installer scripts/autoinstall.sh 2017-03-03 12:21:45 +02:00
Jan Tuomi bf9aad4f4c Add coverage test module django_nose 2017-03-02 13:10:17 +02:00
Juhana 338b9ead70 Fix sössö image dimensions Resolve #38 2017-03-01 20:41:37 +02:00
Juhana 0255b4dabe Change info item input type to numbers 2017-03-01 20:41:37 +02:00
Henri Varjotie 75418da403 [Members] Made frontend to use mainly rest api 2017-03-01 18:41:41 +02:00
Jan Tuomi da9f20a131 Change docker installation instructions 2017-03-01 18:31:00 +02:00
Juhana 78f5111594 Add display type and sort by name to info items 2017-03-01 17:11:58 +02:00
Jan Tuomi d9ffbbabbf Merge branch 'develop' into 'master' 
Hotfix for infoscreen image scaling

References #32

See merge request !10
 2017-03-01 16:25:58 +02:00
Juhana 6834e4d940 Fix image scaling in infoscreen 
References #32
 2017-03-01 16:19:51 +02:00
Jan Tuomi a2114813dd Merge branch 'develop' into 'master' 
Merge develop to master



See merge request !9
 2017-03-01 15:57:06 +02:00
Jan Tuomi c037fa0bbb Edit .gitignore 2017-03-01 15:53:17 +02:00
Jan Tuomi 72231f1912 Add display names to info items for readability 2017-03-01 15:11:45 +02:00
Jan Tuomi b081102f43 Fix log out button position 2017-03-01 15:11:45 +02:00
Juhana 1f1869796a Fix image scaling in infoscreen 
Resolves #32
 2017-03-01 14:13:20 +02:00
Jan Tuomi 7d863e2104 Merge branch 'docker' into 'develop' 
Docker config



See merge request !8
 2017-02-24 16:35:57 +02:00
Jan Tuomi 878bca0eba More pedantry 2017-02-24 16:31:31 +02:00
Jan Tuomi 97e05316ae Be pedantic about readme.md 2017-02-24 16:23:47 +02:00
Ilkka Oksanen 700d08af55 add windows specific docker instructions and clarified few points 2017-02-24 15:38:12 +02:00
Ilkka Oksanen 817a96f7f8 fix syntax typo in readme.md 2017-02-24 15:22:00 +02:00
Ilkka Oksanen 7e84c9fac7 add docker installation guide to readme.md 2017-02-24 15:01:37 +02:00
Ilkka Oksanen 160fa026bb added docker config for develop settings 2017-02-24 14:37:02 +02:00
henu 79a06a44ea Added member static files to gitignore 2017-02-22 18:39:42 +02:00
henu bb206712e4 Implemented rest api to member requests 2017-02-22 18:37:34 +02:00
Jan Tuomi 98240b3513 Merge branch 'develop' into 'master' 
Develop



See merge request !7
 2017-02-22 18:15:35 +02:00
Jan Tuomi 9dcfef3dac Fix .gitignore 2017-02-22 17:51:19 +02:00
henu 7b486d640b Added custom permission class to members rest api 2017-02-22 18:02:15 +02:00
henu 4beefd13a4 Added django rest framework to members 2017-02-22 17:13:15 +02:00
Jan Tuomi 0dbb40c525 Merge branch 'develop' into 'master' 
Develop



See merge request !6
 2017-02-22 15:58:59 +02:00