Commit Graph

  • 96f630ed2f Fix pycodestyle offenses Jan Tuomi 2017-10-31 16:20:08 +02:00
  • ea48cef206 Start using new HSL API Jan Tuomi 2017-10-31 15:54:09 +02:00
  • 7554750883 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-30 14:50:55 +02:00
  • 2501d034db Split board and non-board applications to 2 tables Jan Tuomi 2017-10-30 14:43:16 +02:00
  • 2285bf02a9 Update pep8 references to pycodestyle Jan Tuomi 2017-10-30 13:38:44 +02:00
  • e75f0cfc67 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-30 13:33:07 +02:00
  • f4cafbe246 Fix typo in requirements.txt Jan Tuomi 2017-10-30 13:25:15 +02:00
  • aaf8cd6e04 Remove deprecated pep8 and start using pycodestyle Jan Tuomi 2017-10-30 13:21:26 +02:00
  • 06cb73b5b4 Add error handling to send_mail Jan Tuomi 2017-10-30 12:49:30 +02:00
  • b09698e859 Implement kaehmy export table Jan Tuomi 2017-10-30 12:47:48 +02:00
  • 8f74c87df5 Reimplement serverside coffee scale okalintu 2017-10-29 23:46:20 +02:00
  • 84f7d86875 Add missing member migration Jan Tuomi 2017-10-29 12:45:04 +02:00
  • 7d3208651a Merge branch 'develop' into 'master' Jan Tuomi 2017-10-29 12:25:12 +02:00
  • c855ffc10f Write translations and fix pep8 Jan Tuomi 2017-10-29 12:11:15 +02:00
  • 331d4b86b9 Fix multiple form and table issues Jan Tuomi 2017-10-28 16:50:38 +03:00
  • e949e93799 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-26 13:52:36 +03:00
  • 402cdc3533 Fix styles that accidentally got into production :D Jan Tuomi 2017-10-26 13:51:00 +03:00
  • 3b3b45b5ee Move MQTT and HSL startup scripts around Jan Tuomi 2017-10-26 08:35:48 +03:00
  • f544cf6183 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-25 22:45:51 +03:00
  • 258f6212b8 Fix even more CI Jan Tuomi 2017-10-25 22:44:58 +03:00
  • 197c7b0a8b Merge branch 'develop' into 'master' Jan Tuomi 2017-10-25 22:36:15 +03:00
  • a659f7aa64 Fix more Gitlab CI Jan Tuomi 2017-10-25 22:35:51 +03:00
  • abb3f6659d Merge branch 'develop' into 'master' Jan Tuomi 2017-10-25 22:21:19 +03:00
  • d68e1973de Fix typo in .gitlab-ci.yml Jan Tuomi 2017-10-25 22:20:42 +03:00
  • 8141ccfa13 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-25 22:08:02 +03:00
  • 6e9b9a0c03 Edit Gitlab CI pipeline Jan Tuomi 2017-10-25 22:00:09 +03:00
  • cc7abbcf32 Improve readme Jan Tuomi 2017-10-25 20:28:43 +03:00
  • fd150a7601 Merge branch 'feature-main-page-bugfixes' into 'develop' Henri Varjotie 2017-10-25 20:17:52 +03:00
  • c1e3481323 Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-main-page-bugfixes henu 2017-10-25 20:06:33 +03:00
  • 17ad7ab2d4 Fix navigation and add sticky footer which is shit henu 2017-10-25 20:02:43 +03:00
  • 7eb4bc146b Fix stuff to make project run on Windows Jan Tuomi 2017-10-25 19:01:04 +03:00
  • 601050baf6 Add full hash, date and latest tag to about.html Aarni 2017-10-25 18:27:44 +03:00
  • 54e54b00e2 Change kaehmy header html class name henu 2017-10-25 18:14:17 +03:00
  • 82ada111e6 Remove settings menu from Infoscreen admin Juhana Luomanen 2017-10-25 17:54:58 +03:00
  • 21aea90c29 Revert previous Jan Tuomi 2017-10-25 17:12:41 +03:00
  • 2893a0bcc9 Add "print" Jan Tuomi 2017-10-25 17:09:47 +03:00
  • 0f640a31b1 Update readme git address Aarni 2017-10-25 16:59:27 +03:00
  • bddc1acdb1 Change default DB to SQLite3 Jan Tuomi 2017-10-25 14:31:19 +03:00
  • 70e732ec5a Start using GitLab's own docker registry Jan Tuomi 2017-10-25 11:30:17 +03:00
  • f395e8de06 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-23 15:51:32 +03:00
  • 8fe5b9b652 Fix newlines in comments and sort filter values Jan Tuomi 2017-10-23 15:50:26 +03:00
  • 7614c127ba Merge branch 'develop' into 'master' Jan Tuomi 2017-10-20 17:46:25 +03:00
  • 131a0e9bb8 Update kaehmyopas Jan Tuomi 2017-10-20 17:45:35 +03:00
  • b2cc29f6af Merge branch 'develop' into 'master' Jan Tuomi 2017-10-19 20:02:02 +03:00
  • 2e099ad635 Add custom kaehmys to filter list Jan Tuomi 2017-10-19 20:01:13 +03:00
  • 7efb8d3e7b Merge branch 'develop' into 'master' Jan Tuomi 2017-10-19 14:26:35 +03:00
  • ae000458b1 Add translation for role models and remove summary field from PresetRole Jan Tuomi 2017-10-19 14:25:28 +03:00
  • 48fa13e37b Merge branch 'develop' into 'master' Jan Tuomi 2017-10-18 12:17:03 +03:00
  • 64452f91a0 Add linebreaks to kaehmy text Jan Tuomi 2017-10-18 12:16:02 +03:00
  • b3aec2b3e4 Add filtering to kaehmy list Jan Tuomi 2017-10-18 12:13:14 +03:00
  • cd94c0d0f4 Sort kaehmys in the correct order Jan Tuomi 2017-10-18 11:16:20 +03:00
  • d5ead73869 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 21:48:46 +03:00
  • 89bb68d222 Also list custom roles in kaehmy form Jan Tuomi 2017-10-17 21:48:19 +03:00
  • a81f305e54 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 21:15:13 +03:00
  • 9383b5ddf9 Add tooltip about kaehmys to statistics page Jan Tuomi 2017-10-17 21:09:18 +03:00
  • dcef7aa49a Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 20:38:57 +03:00
  • bfac4aba9b Fix footer styles on Safari Jan Tuomi 2017-10-17 20:38:32 +03:00
  • e0f571a201 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 20:30:25 +03:00
  • f91eb4cb25 Add kaehmy banner Jan Tuomi 2017-10-17 20:28:48 +03:00
  • d6d2a8cae6 Add language selection to footer Jan Tuomi 2017-10-17 19:45:32 +03:00
  • 84779ccf87 Edit styles and add English translations Jan Tuomi 2017-10-17 19:06:13 +03:00
  • e5e9774681 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 13:33:26 +03:00
  • 7dc6f6438a Fix typo Jan Tuomi 2017-10-17 13:32:26 +03:00
  • 6f18fa0aea Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 13:31:04 +03:00
  • 2df5da5388 Add deadlines Jan Tuomi 2017-10-17 13:30:45 +03:00
  • 87782b65d0 Fix more CSS Jan Tuomi 2017-10-17 13:15:44 +03:00
  • 9a918da2f0 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 13:07:38 +03:00
  • a5a086b283 Fix tooltip styles Jan Tuomi 2017-10-17 13:06:26 +03:00
  • 17d1d4fea2 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-17 12:48:54 +03:00
  • f498c0a787 Fix pep8 Jan Tuomi 2017-10-17 12:45:41 +03:00
  • a7732e136d Add language middleware Jan Tuomi 2017-10-17 12:44:49 +03:00
  • cae33c1156 Add info tooltips to kaehmy roles Jan Tuomi 2017-10-17 12:44:33 +03:00
  • 85fcf6feb9 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 18:42:18 +03:00
  • 99ab2f0b3a Implement nice navbar styles Jan Tuomi 2017-10-16 18:32:28 +03:00
  • 89665d2b48 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 18:13:39 +03:00
  • f531b39587 Edit labels on form fields Jan Tuomi 2017-10-16 18:11:33 +03:00
  • c3478ff47c Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 17:42:00 +03:00
  • ce1cd1b890 Fix pep8 Jan Tuomi 2017-10-16 17:41:31 +03:00
  • b609fd3688 Overall fixes Jan Tuomi 2017-10-16 17:38:39 +03:00
  • b77dd3f50e Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 14:42:28 +03:00
  • e9185b0a03 Fix tg posting problem Jan Tuomi 2017-10-16 14:42:06 +03:00
  • 7009f38652 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 14:17:11 +03:00
  • f461c57b66 Make form nicer Jan Tuomi 2017-10-16 14:16:48 +03:00
  • 4ff426327b Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 12:43:43 +03:00
  • 44c6422c41 Fix kaehmy form error Jan Tuomi 2017-10-16 12:43:27 +03:00
  • d7d0b377f2 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 12:42:36 +03:00
  • c5ad46c411 Add category to role model Jan Tuomi 2017-10-16 12:42:12 +03:00
  • 4f499af4cf Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 11:23:05 +03:00
  • 4074b6d931 Fix pep8 Jan Tuomi 2017-10-16 11:22:29 +03:00
  • 9df18c8bf0 Merge branch 'feature-kaehmy' into develop Jan Tuomi 2017-10-16 11:22:00 +03:00
  • 96919c36fb Add exception handling to Telegram bot Jan Tuomi 2017-10-16 11:21:16 +03:00
  • d98ce8a446 Fix pep8 Jan Tuomi 2017-10-16 11:05:28 +03:00
  • b95b591ab9 Add telegram bot Jan Tuomi 2017-10-16 10:53:59 +03:00
  • 41d4c4f2e4 Add exception handling to Telegram bot Jan Tuomi 2017-10-16 11:21:16 +03:00
  • d9ed6e7b17 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-16 11:14:04 +03:00
  • e358ff35ad Fix pep8 Jan Tuomi 2017-10-16 11:05:28 +03:00
  • b393f3615a Merge branch 'feature-kaehmy' into develop Jan Tuomi 2017-10-16 10:54:30 +03:00
  • cfd2940183 Add telegram bot Jan Tuomi 2017-10-16 10:53:59 +03:00
  • df65cfe355 Merge branch 'feature-kaehmy' into 'develop' Henri Varjotie 2017-10-14 21:40:33 +03:00
  • b2bc3ad43e Prevent creating custom kaehmy role with existing name henu 2017-10-14 21:33:51 +03:00