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

Commit Graph

  • e18f28ab7f Migration file for max_length change Aarni 2017-09-20 18:09:09 +03:00
  • 5e4a41d52a Unite some CharField max_lengths Aarni 2017-09-20 18:06:01 +03:00
  • f006c6ceef Fix JSONField and add migration files Aarni 2017-09-20 18:01:44 +03:00
  • c0e8ba21ee Create header template file henu 2017-09-20 17:50:57 +03:00
  • 62be06ea6e Remove copypasta verbose_name Aarni 2017-09-13 19:24:13 +03:00
  • 68b37dea91 Registration model Aarni 2017-09-13 19:21:47 +03:00
  • 064b07e75a Ohlhafv model Aarni 2017-09-13 19:06:59 +03:00
  • 160f5adc59 Merge branch 'develop' into 'master' Jan Tuomi 2017-09-19 21:05:07 +03:00
  • 7570d0c131 Add filtering to coffee data Jan Tuomi 2017-09-19 21:04:48 +03:00
  • b8267e411c Merge branch 'develop' into 'master' Jan Tuomi 2017-09-19 19:32:06 +03:00
  • f534244dd8 Fix logging in all modules Jan Tuomi 2017-09-19 19:31:43 +03:00
  • ab2fcf04eb Merge branch 'develop' into 'master' Jan Tuomi 2017-09-19 17:02:36 +03:00
  • b507bc5f27 Attempt to hotfix coffee scale crash Jan Tuomi 2017-09-19 17:01:56 +03:00
  • 4a79ed341e Merge branch 'develop' into 'master' Jan Tuomi 2017-09-19 00:06:29 +03:00
  • a63504619a Add weird fix to MQTT module Jan Tuomi 2017-09-19 00:05:58 +03:00
  • d4d63ac99d Call fetch when opening coffee scale page Jan Tuomi 2017-09-18 23:59:49 +03:00
  • a813b502fc Random coffee scale fixes Jan Tuomi 2017-09-18 23:58:45 +03:00
  • 7b8c5f3d8f Merge branch 'develop' into 'master' Jan Tuomi 2017-09-18 23:17:11 +03:00
  • 5da4b52bde Move coffee scale to web2.0 Jan Tuomi 2017-09-18 23:16:19 +03:00
  • 170635a8db Merge branch 'develop' into 'master' Jan Tuomi 2017-09-18 20:21:58 +03:00
  • 7bdd970845 Fix translation import issue Jan Tuomi 2017-09-18 20:20:21 +03:00
  • a86f71b422 Merge branch 'develop' into 'master' Jan Tuomi 2017-09-18 19:10:09 +03:00
  • f800f5c342 Allow all hosts on dev server Jan Tuomi 2017-09-15 20:58:46 +03:00
  • 040c9641ea Prune old images on deploy host after deployment Jan Tuomi 2017-09-15 20:36:24 +03:00
  • 7e36fd5768 Change docker-compose pull to docker pull Jan Tuomi 2017-09-15 20:18:22 +03:00
  • 12027a5a80 Fix things Jan Tuomi 2017-09-15 20:11:44 +03:00
  • 84ca084533 Fuck bash Jan Tuomi 2017-09-15 19:31:45 +03:00
  • 572834f165 Use secret variables in CI jobs Jan Tuomi 2017-09-15 19:25:14 +03:00
  • 8c03fbbca9 Commit missing files Jan Tuomi 2017-09-15 19:15:49 +03:00
  • 754f108f57 Add remark Jan Tuomi 2017-09-15 19:13:17 +03:00
  • adb152727e Fix key permission problem Jan Tuomi 2017-09-15 18:50:30 +03:00
  • ff778d15ee Deploy only after publish Jan Tuomi 2017-09-15 18:41:58 +03:00
  • f6afacb93f Add ssh client to deploy stage Jan Tuomi 2017-09-15 18:32:02 +03:00
  • ba795a2162 Split deploy to stages Jan Tuomi 2017-09-15 18:22:07 +03:00
  • 880114b214 Remove another brainfart Jan Tuomi 2017-09-15 18:05:06 +03:00
  • 8f3d10f5d0 Remove docker-compose dep from CI Jan Tuomi 2017-09-15 17:58:22 +03:00
  • 34a60e5458 Remove brainfart Jan Tuomi 2017-09-15 17:41:14 +03:00
  • db637453b9 Remove installation of docker-compose from .gitlab-ci.yml Jan Tuomi 2017-09-15 17:27:09 +03:00
  • 8c71dbe2ed Remove curl dependency Jan Tuomi 2017-09-15 17:12:23 +03:00
  • 04c69995ff Try to fix openssh problems Jan Tuomi 2017-09-15 17:03:51 +03:00
  • 150c52a0fb Add docker image to deploy stage Jan Tuomi 2017-09-15 16:45:51 +03:00
  • e5d2520454 Add dind service Jan Tuomi 2017-09-15 16:31:15 +03:00
  • 54090c9cb0 Let's try this again Jan Tuomi 2017-09-15 16:29:33 +03:00
  • 1dfa7ae352 Add docker installation to CI Jan Tuomi 2017-09-15 16:02:35 +03:00
  • 26ee4bbfea Add docker-compose to CI Jan Tuomi 2017-09-15 15:52:55 +03:00
  • 5e98932132 Fix .gitlab-ci.yml Jan Tuomi 2017-09-15 15:42:48 +03:00
  • b0235d6089 Add deployment stuffs Jan Tuomi 2017-09-15 15:40:17 +03:00
  • 2c9c1a76c8 Remove runserver from deploy config Jan Tuomi 2017-09-14 19:25:45 +03:00
  • 41c9aab595 Add automatic deployment Jan Tuomi 2017-09-14 15:55:39 +03:00
  • b16bef536e Fix admin site header. Resolve issue #71 Juhana Luomanen 2017-09-13 19:42:45 +03:00
  • d438c7b16a Use more appropriate fields instead of TextFields Aarni 2017-09-13 18:44:17 +03:00
  • 4f62dce814 Use django-auditlog 😏 Jan Tuomi 2017-06-17 13:47:31 +03:00
  • c9aef9dba4 Created audit log models Jan Tuomi 2017-06-15 19:32:17 +03:00
  • cc3564bf42 Fix pep8 errors Jan Tuomi 2017-06-08 09:29:27 +03:00
  • 94c2c16874 Add missing migrations Jan Tuomi 2017-06-08 09:25:03 +03:00
  • 81deba5472 Add kaehmy models to admin Joel Lavikainen 2017-06-07 19:21:28 +03:00
  • 543d432154 Add kaehmyform and message Joel Lavikainen 2017-06-07 19:14:57 +03:00
  • 4503c9b4c2 Resolve model conflicts Ilkka Oksanen 2017-06-07 18:56:52 +03:00
  • bd0522f79a Rework webapp models and add translation framework Ilkka Oksanen 2017-06-07 18:38:04 +03:00
  • 3ad38051ea Add official model and migrations Jan Tuomi 2017-06-07 18:30:37 +03:00
  • eea8c19f50 Create role models Jan Tuomi 2017-06-07 18:00:08 +03:00
  • b37d5f2f55 Fix translation issue in payment form Jan Tuomi 2017-06-04 13:24:54 +03:00
  • 2585c4885b Merge branch 'develop' into 'master' Jan Tuomi 2017-06-01 19:47:59 +03:00
  • 350112c5d1 Merge branch 'feature-infoadmin' into develop Juhana Luomanen 2017-06-01 19:40:18 +03:00
  • 1fd830b51e Add translations to member counter henu 2017-06-01 19:23:51 +03:00
  • e6328fdf87 Add member count to member list henu 2017-06-01 19:16:20 +03:00
  • c36ef9ad3f Fix payment reference issue with duplicate resolver Jan Tuomi 2017-06-01 18:39:26 +03:00
  • a1171afc56 Merge branch 'develop' into feature-infoadmin Juhana Luomanen 2017-06-01 18:04:26 +03:00
  • c3b1510bb8 Add settings tab for changing language Juhana Luomanen 2017-06-01 17:38:25 +03:00
  • 77c6903658 More mobile styles 😄 Jan Tuomi 2017-05-30 21:29:06 +03:00
  • c9f768a5b6 Translations and some styles Jan Tuomi 2017-05-30 20:36:18 +03:00
  • 08c919ded3 Implement responsive styles for mobile Jan Tuomi 2017-05-30 20:23:17 +03:00
  • 5c8dfdfd1d Add settings value for automatic emails Jan Tuomi 2017-05-29 23:26:36 +03:00
  • 0a3e10d1c3 Merge branch 'feature-duplicate-resolver' into 'develop' Jan Tuomi 2017-05-29 23:22:04 +03:00
  • 26f4d28003 Finalize duplicate resolver styles Jan Tuomi 2017-05-29 22:59:38 +03:00
  • 3a8d988033 Implement conflict resolution logic Jan Tuomi 2017-05-29 22:00:29 +03:00
  • bb769583f2 Modify the order of infoitems Juhana Luomanen 2017-05-29 11:41:39 +03:00
  • 013bbeae7a Add some localizations Juhana Luomanen 2017-05-29 09:54:12 +03:00
  • 09e8c93e8d Create view and model for duplicate member conflicts Jan Tuomi 2017-05-28 23:40:47 +03:00
  • cc9768b895 Mobile login screen and translations Jan Tuomi 2017-05-28 22:03:02 +03:00
  • ca9d875131 Add missing div Juhana Luomanen 2017-05-28 15:32:57 +03:00
  • d3d721abeb Make infoadmin tabs more descriptive Juhana Luomanen 2017-05-28 14:43:39 +03:00
  • d06bdd7e23 Fix header width Juhana Luomanen 2017-05-28 14:42:44 +03:00
  • 1cc936674c Modify rotation tab to a dropdown menu Juhana Luomanen 2017-05-27 15:11:16 +03:00
  • 362422b86b Clean up login page styles Jan Tuomi 2017-05-27 15:05:57 +03:00
  • 1cba13f4ff Merge branch 'develop' into 'master' Jan Tuomi 2017-05-27 14:32:55 +03:00
  • 8b73cf86bb Only install pep8 for CI lint job Jan Tuomi 2017-05-27 14:19:01 +03:00
  • 95fe21d599 Fix style problem where hamburger menu button was on top of page title Jan Tuomi 2017-05-27 13:59:13 +03:00
  • 88f4e57078 Merge branch 'bugfix-sidebar' into 'develop' Jan Tuomi 2017-05-27 13:54:35 +03:00
  • 3e2fb90a16 Add tab for rotation management Juhana Luomanen 2017-05-27 13:53:33 +03:00
  • 362c341966 Fix sidebar styles Jan Tuomi 2017-05-27 13:53:23 +03:00
  • 700896e3f8 Move slides and rotations under tabs Juhana Luomanen 2017-05-27 13:33:03 +03:00
  • dd5cd50a3e Prettify about page Jan Tuomi 2017-05-27 13:02:36 +03:00
  • 9974b3c02c Add tabs for slides and rotations Juhana Luomanen 2017-05-27 13:00:30 +03:00
  • 63e669ff0c Merge branch 'develop' into 'master' Jan Tuomi 2017-05-27 12:40:35 +03:00
  • 6b3e105bb7 Make lights go green again 💚 Jan Tuomi 2017-05-27 12:15:59 +03:00
  • 7d2953b389 Add throttles.py for DRF Jan Tuomi 2017-05-27 11:50:00 +03:00
  • 9276f4cafb Merge feature-sidebar with conflicts Jan Tuomi 2017-05-27 11:30:22 +03:00
  • 12d7ca0835 Fix settings error Jan Tuomi 2017-05-27 11:13:29 +03:00
  • e9fbc38b4d Remove dead code and fix tokens error Jan Tuomi 2017-05-27 11:04:59 +03:00