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

Commit Graph

  • ced6f648b2 Add Apyitem + urls to backend okalintu 2017-03-29 17:42:27 +03:00
  • ba02327591 Add url to serve ÄPY statistics okalintu 2017-03-29 17:26:25 +03:00
  • b52570c2df Add missing dot after event dates okalintu 2017-03-29 17:10:19 +03:00
  • 1f0647bec9 Fix incorrect format string in error message okalintu 2017-03-29 17:08:33 +03:00
  • af6a56e238 modify buch of http's to https okalintu 2017-03-29 16:54:26 +03:00
  • 65fd899e43 Add more translations Jan Tuomi 2017-03-29 16:42:18 +03:00
  • acd9007372 Add translations Jan Tuomi 2017-03-29 16:25:06 +03:00
  • 435d96112e Merge branch 'master' into develop Jan Tuomi 2017-03-29 16:13:14 +03:00
  • 0f4bce1a4f Merge branch 'feature-events' into 'develop' Jan Tuomi 2017-03-29 15:47:28 +03:00
  • 11a24089cf Add "sane" styles for event screen okalintu 2017-03-29 15:04:33 +03:00
  • 0e8cad7589 Add barebone skeleton for infoscreens event view okalintu 2017-03-27 12:29:36 +03:00
  • 9b834032db Add sqlite3 files to .gitignore okalintu 2017-03-29 13:51:10 +03:00
  • dd01b44445 Add submitted to request serializer henu 2017-03-29 06:47:02 +03:00
  • 409321ad83 Merge branch 'hotfix-members-https' into 'master' Jan Tuomi 2017-03-28 13:07:36 +03:00
  • bd5cf096ff Change http to https when using Angular CDN Jan Tuomi 2017-03-28 13:05:00 +03:00
  • d531d1b339 Merge branch 'hotfix-coffee' into 'master' Jan Tuomi 2017-03-27 18:11:02 +03:00
  • d8f96faf6e HOTFIX: fix ka.dy.fi url again okalintu 2017-03-27 16:39:19 +03:00
  • d65be00dbb Merge branch 'hotfix-coffee' into 'master' Jan Tuomi 2017-03-27 15:00:11 +03:00
  • 2356f44a3d HOTFIX: change url ka.dy.fi to https okalintu 2017-03-27 12:32:59 +03:00
  • bede518a5d Remove members_index.html Jan Tuomi 2017-03-22 19:55:04 +02:00
  • 312ed57714 Move changes from feature-member Jan Tuomi 2017-03-22 19:09:58 +02:00
  • 29a52a852c Add max-width to table cells in infoscreen admin Juhana Luomanen 2017-03-22 17:34:44 +02:00
  • c35c2f0cd9 add production image building files to scripts/production okalintu 2017-03-22 16:19:13 +02:00
  • 306a5b48a1 Modify coffeeinfoitem into generic websiteinfoitem Joel Lavikainen 2017-03-08 18:29:01 +02:00
  • 404b1411af Add all branches to GitLab CI Jan Tuomi 2017-03-08 17:50:59 +02:00
  • ae13a371c6 Merge branch 'revert-broken-rest' into 'master' Jan Tuomi 2017-03-08 17:41:27 +02:00
  • e3147c3ef9 Fix broken redirect in member addition okalintu 2017-03-08 17:40:50 +02:00
  • 08b4c17044 Revert "[Members] Made frontend to use mainly rest api" Jan Tuomi 2017-03-08 17:23:41 +02:00
  • 69501df872 Merge branch 'develop' into 'master' Jan Tuomi 2017-03-06 14:57:19 +02:00
  • cd90a7bf20 Add master branch to CI Jan Tuomi 2017-03-06 14:54:31 +02:00
  • e628b37e0d Add error check to createdefaultadmin command Jan Tuomi 2017-03-06 02:13:32 +02:00
  • 1c40fab8ae Small fix to after_script Jan Tuomi 2017-03-06 02:06:36 +02:00
  • 0ed36a63a4 Add cleanup commands to GitLab CI Jan Tuomi 2017-03-06 02:01:47 +02:00
  • 804afeb057 Add installer script to readme Jan Tuomi 2017-03-06 01:50:11 +02:00
  • 0c1e836902 Fix more SQL Jan Tuomi 2017-03-06 01:25:04 +02:00
  • 9a349f093a Fix SQL in db/init.sql Jan Tuomi 2017-03-06 01:15:02 +02:00
  • 5d4bc772bd Skip writing .pyc files in docker container Jan Tuomi 2017-03-06 00:27:21 +02:00
  • 6e966b07d8 Fix test command in GitLab CI config Jan Tuomi 2017-03-06 00:18:05 +02:00
  • e7dac97e93 Fix problem with TTY allocation in GitLab CI Jan Tuomi 2017-03-06 00:13:04 +02:00
  • 09a0bbc070 Update autoinstall.sh Jan Tuomi 2017-03-05 23:52:26 +02:00
  • 403a44d859 Change docker install method in autoinstall.sh Jan Tuomi 2017-03-05 23:46:43 +02:00
  • d9766eefa9 Fix typo in config Jan Tuomi 2017-03-03 12:52:04 +02:00
  • 4416c35d36 Add GitLab CI config for testing Jan Tuomi 2017-03-03 12:49:11 +02:00
  • 307ddbdca6 Add one click installer scripts/autoinstall.sh Jan Tuomi 2017-03-03 02:02:40 +02:00
  • bf9aad4f4c Add coverage test module django_nose Jan Tuomi 2017-03-02 13:09:36 +02:00
  • 338b9ead70 Fix sössö image dimensions Resolve #38 Juhana 2017-03-01 20:31:43 +02:00
  • 0255b4dabe Change info item input type to numbers Juhana 2017-03-01 17:26:58 +02:00
  • 75418da403 [Members] Made frontend to use mainly rest api Henri Varjotie 2017-03-01 18:41:36 +02:00
  • da9f20a131 Change docker installation instructions Jan Tuomi 2017-03-01 18:31:00 +02:00
  • 78f5111594 Add display type and sort by name to info items Juhana 2017-03-01 17:11:58 +02:00
  • d9ffbbabbf Merge branch 'develop' into 'master' Jan Tuomi 2017-03-01 16:25:58 +02:00
  • 6834e4d940 Fix image scaling in infoscreen References #32 Juhana 2017-03-01 16:19:51 +02:00
  • a2114813dd Merge branch 'develop' into 'master' Jan Tuomi 2017-03-01 15:57:06 +02:00
  • c037fa0bbb Edit .gitignore Jan Tuomi 2017-03-01 15:53:17 +02:00
  • 72231f1912 Add display names to info items for readability Jan Tuomi 2017-02-22 22:41:44 +02:00
  • b081102f43 Fix log out button position Jan Tuomi 2017-02-22 20:22:54 +02:00
  • 1f1869796a Fix image scaling in infoscreen Resolves #32 Juhana 2017-03-01 14:13:20 +02:00
  • 7d863e2104 Merge branch 'docker' into 'develop' Jan Tuomi 2017-02-24 16:35:57 +02:00
  • 878bca0eba More pedantry Jan Tuomi 2017-02-24 16:31:31 +02:00
  • 97e05316ae Be pedantic about readme.md Jan Tuomi 2017-02-24 16:23:47 +02:00
  • 700d08af55 add windows specific docker instructions and clarified few points Ilkka Oksanen 2017-02-24 15:38:12 +02:00
  • 817a96f7f8 fix syntax typo in readme.md Ilkka Oksanen 2017-02-24 15:22:00 +02:00
  • 7e84c9fac7 add docker installation guide to readme.md Ilkka Oksanen 2017-02-24 15:01:37 +02:00
  • 160fa026bb added docker config for develop settings Ilkka Oksanen 2017-02-24 14:37:02 +02:00
  • 79a06a44ea Added member static files to gitignore henu 2017-02-22 18:39:42 +02:00
  • bb206712e4 Implemented rest api to member requests henu 2017-02-22 18:37:34 +02:00
  • 98240b3513 Merge branch 'develop' into 'master' Jan Tuomi 2017-02-22 18:15:35 +02:00
  • 9dcfef3dac Fix .gitignore Jan Tuomi 2017-02-22 17:50:46 +02:00
  • 7b486d640b Added custom permission class to members rest api henu 2017-02-22 18:02:15 +02:00
  • 4beefd13a4 Added django rest framework to members henu 2017-02-22 17:13:15 +02:00
  • 0dbb40c525 Merge branch 'develop' into 'master' Jan Tuomi 2017-02-22 15:58:59 +02:00
  • 5fc218323c Fix deprecation warnings Jan Tuomi 2017-02-22 15:43:19 +02:00
  • bafc094f40 Add missing setting entries Juhana 2017-02-22 15:31:09 +02:00
  • beb36064f9 Add entry to urls.py for media files Juhana 2017-02-22 15:19:15 +02:00
  • 22e8e3d995 Fix footer styles Jan Tuomi 2017-02-12 17:23:38 +02:00
  • 255b3bfe83 Add dummy SIKAdmin at /sikadmin Jan Tuomi 2017-02-12 00:49:22 +02:00
  • 8d53885820 Add more translations Jan Tuomi 2017-02-10 21:23:40 +02:00
  • ea2ea26f45 Add some translations Jan Tuomi 2017-02-10 21:18:34 +02:00
  • 70e66cb7da Add preview button for rotations Jan Tuomi 2017-02-10 19:35:13 +02:00
  • 85a7415c5c Add missing options to settings-sample.py Jan Tuomi 2017-02-10 18:58:29 +02:00
  • 09ada09723 Merge branch 'template-overhaul' into develop Jan Tuomi 2017-02-10 18:54:23 +02:00
  • 236d080b53 Translate infoscreen admin page Jan Tuomi 2017-02-10 18:50:54 +02:00
  • 8cd8882fb9 New functionality for timetable: header-row with clock on it and animated row deletion Juuso Käenmäki 2017-02-10 18:02:23 +02:00
  • cbfbae2984 Merge branch 'develop' into 'master' Jan Tuomi 2017-02-06 12:35:14 +02:00
  • 7ee3f69740 Add footer with language controls Jan Tuomi 2017-02-06 01:10:25 +02:00
  • c34e31c0e5 Add some translations for i18n Jan Tuomi 2017-02-05 23:02:04 +02:00
  • 8f4c8701ae Fix CORS header issue in infoscreen Jan Tuomi 2017-02-05 18:27:46 +02:00
  • d0185a708f Fix application page errors Jan Tuomi 2017-02-05 17:20:05 +02:00
  • 990d6b853f Move templates in members app to templates dir Jan Tuomi 2017-02-05 16:39:49 +02:00
  • e5e284b80d Add coffeeinfoitem Tatoma 2017-02-01 19:19:56 +02:00
  • 54148fdfb3 Fix for HSL-api querys Juuso Käenmäki 2017-02-01 18:14:22 +02:00
  • d236c1e8f8 Fix for syntax-error on infoscreen/static/js/infoscreen_controllers.js Juuso Käenmäki 2017-02-01 17:54:37 +02:00
  • 582168b4d3 Added margin to recaptcha henu 2017-02-01 17:53:47 +02:00
  • 41658675dc Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop Juuso Käenmäki 2017-02-01 17:41:13 +02:00
  • bb5ec67eb6 Fixes for hsl-timetable. Juuso Käenmäki 2017-02-01 17:31:48 +02:00
  • 558d624076 Fix ESLint errors Jan Tuomi 2017-02-01 17:27:00 +02:00
  • 84f66a88c9 Merge branch 'develop' into 'master' Jan Tuomi 2017-01-27 12:53:43 +02:00
  • 95c016ce11 Fixed hsl_ftecher.py Juuso Käenmäki 2017-01-26 14:38:25 +02:00
  • 59f3040143 Brush up styles in the login form Jan Tuomi 2017-01-26 14:05:02 +02:00
  • 811f002463 Merge branch 'develop' into 'master' Jan Tuomi 2017-01-25 19:28:57 +02:00