Commit Graph

Select branches

Hide Pull Requests

bugfix/fix-feed-filters

clean-old-templates

develop

feature-coffee-history

feature-expenses-claim

feature-member-emails

feature-nobot

feature-refactor-webapp-styles

feature/signup-allow-user-deletion

main

master

production

revert-7554c1e7

rewrite-publishable-db-models

Mono Color

• efbfe64d1e Merge branch 'develop' into 'master' Jan Tuomi 2017-10-12 10:30:02 +03:00
• 54c9ef8dce Fix pep8 Jan Tuomi 2017-10-12 10:15:15 +03:00
• df7eb2af5e Remove unused print Jan Tuomi 2017-10-12 10:06:14 +03:00
• e8fafeda84 Fix things Jan Tuomi 2017-10-12 00:56:28 +03:00
• d6239139e0 Fix board member label Jan Tuomi 2017-10-11 23:20:53 +03:00
• a7b8be9c87 Change custom and preset roles to checkboxes henu 2017-10-11 23:15:42 +03:00
• 4e53098e23 Make some styles Jan Tuomi 2017-10-11 23:14:37 +03:00
• bb01b8ae7c Fix merge artifact Jan Tuomi 2017-10-11 22:45:39 +03:00
• 04931eec42 Add email stuff Jan Tuomi 2017-10-11 22:40:19 +03:00
• e7e21fb1ee Remove activate from nav item henu 2017-10-11 22:42:31 +03:00
• 2a03e5003a Fix bootstrap on kaehmy navigation henu 2017-10-11 22:39:42 +03:00
• 7c55359ae3 Kaehmy translations Aarni 2017-10-11 22:35:05 +03:00
• c508ce7714 Fix webapp URL to support /-ending Aarni 2017-10-11 21:56:28 +03:00
• fd09d83daa Add statistics page Aarni 2017-10-11 21:45:35 +03:00
• b67db50dbb Add m2m relation to custom role henu 2017-10-11 21:32:50 +03:00
• 438ae7e8f7 Add commenting form Jan Tuomi 2017-10-11 21:19:25 +03:00
• 70ccc88c86 Fix phone number field henu 2017-10-11 21:17:46 +03:00
• 3061e0a4fe Merge branch 'feature-kaehmy' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-kaehmy henu 2017-10-11 20:50:51 +03:00
• 56557aba50 Own navbar for kaehmy Aarni 2017-10-11 20:34:10 +03:00
• cd3166627b Fix merge conflict henu 2017-10-11 20:31:12 +03:00
• 2cf41c9cb9 Add custom role creation to kaehmy form henu 2017-10-11 20:26:38 +03:00
• 7725afdee5 Phone number field for kaehmys Aarni 2017-10-11 20:09:30 +03:00
• d349916fef Fix pep8 on webapp forms henu 2017-10-11 19:43:08 +03:00
• c193f1ae54 Add comment count and collapse Jan Tuomi 2017-10-11 19:37:15 +03:00
• 61911b8256 Add submit for kaehmy forms Aarni 2017-10-11 19:19:44 +03:00
• 646f40b2cc Fix kaehmy urls Aarni 2017-10-11 19:10:30 +03:00
• b61874bcbb Add comments Jan Tuomi 2017-10-11 19:04:59 +03:00
• 074c4897a7 Form and associated view for Kaehmy Aarni 2017-10-11 18:55:20 +03:00
• c36f227bf0 Add text field to KaehmyForm Jan Tuomi 2017-10-11 18:45:28 +03:00
• bd45742953 Edit models and create list view Jan Tuomi 2017-10-11 18:36:26 +03:00
• cc9794d6a8 Merge branch 'develop' into 'master' Jan Tuomi 2017-10-03 14:40:29 +03:00
• df931fb3e5 Fix pagination for 'add many' confirm view Jan Tuomi 2017-10-03 14:39:39 +03:00
• 19ff70d0bd Merge branch 'develop' into 'master' Jan Tuomi 2017-10-02 21:07:34 +03:00
• 5666825738 Add option to choose delimiter in CSV import Jan Tuomi 2017-10-02 20:56:49 +03:00
• d1343f8b58 Fix export csv error Jan Tuomi 2017-10-02 20:35:19 +03:00
• 1b9539aa9c Merge branch 'webapp-model-permissions' into develop Jan Tuomi 2017-09-29 00:05:29 +03:00
• 4099e5fa24 Fix broken tests Jan Tuomi 2017-09-29 00:05:17 +03:00
• bfc462a332 Merge develop to branch Jan Tuomi 2017-09-28 23:42:51 +03:00
• 8f06190bd0 Use django-suit for SIK Admin Jan Tuomi 2017-09-28 23:36:12 +03:00
• 285a0e7dbf Fix decorators in webapp Jan Tuomi 2017-09-28 20:29:54 +03:00
• 3901c21c67 Fix decorators in members Jan Tuomi 2017-09-28 20:28:19 +03:00
• 69d26deef9 Rework infoscreen permissions Jan Tuomi 2017-09-28 19:57:50 +03:00
• 75d9fb1dbb Create new permission groups and fix member register permissions Jan Tuomi 2017-09-28 18:46:51 +03:00
• 51a30d637f WIP webapp permissions Jan Tuomi 2017-09-28 09:22:56 +03:00
• ff801f5e08 Merge branch 'feature-webapp-views' into 'develop' Henri Varjotie 2017-09-27 19:53:43 +03:00
• 5e4afb2fff Add urls and views for navigation bar henu 2017-09-27 19:47:15 +03:00
• 8028496b78 Add international and sosso pages. henu 2017-09-27 19:46:36 +03:00
• 37ffd4fe0b Add event calendar page. henu 2017-09-27 19:46:09 +03:00
• 8a674bf527 Add contact page henu 2017-09-27 19:45:47 +03:00
• 7c27365f1e Add views and urls for jobs and freshmen henu 2017-09-27 19:24:30 +03:00
• 8ce0b9a0d6 Add freshmen and jobs dummy pages henu 2017-09-27 19:23:34 +03:00
• 55d0b11ec6 Add translations for main page views henu 2017-09-27 19:22:58 +03:00
• d0db00f9ad Add Guild page template henu 2017-09-27 18:50:45 +03:00
• d82e3ec4d9 Merge branch 'develop' into 'master' Jan Tuomi 2017-09-26 15:39:43 +03:00
• 5e33a8e30c Add tests for sähköpiikki API user Jan Tuomi 2017-09-26 15:30:23 +03:00
• 61f5c293db Implement token auth for sähköpiikki Jan Tuomi 2017-09-26 14:39:21 +03:00
• e10af28c4d Remove unused log statement Jan Tuomi 2017-09-26 13:06:27 +03:00
• 864b3787c8 Add sahkopiikki user create command Jan Tuomi 2017-09-26 11:30:34 +03:00
• d0825e96bc Merge branch 'develop' into 'master' Jan Tuomi 2017-09-25 23:33:05 +03:00
• d3e763aa05 Fix search logic for full names Jan Tuomi 2017-09-25 23:06:44 +03:00
• a981f6a31f Merge branch 'develop' into 'master' Jan Tuomi 2017-09-25 22:49:13 +03:00
• 51e16df08b Fix model form issues Jan Tuomi 2017-09-25 22:19:00 +03:00
• f6aa86d032 Add missing dependency Jan Tuomi 2017-09-25 22:00:48 +03:00
• 982e6bf928 Add autocomplete search to "add payment" and add search bar to table views Jan Tuomi 2017-09-25 21:55:49 +03:00
• 7ce28c3a48 Add autocomplete widget and fix some errors Jan Tuomi 2017-09-25 20:45:13 +03:00
• 91a0694ae5 Fix timezone issues and create coffee view unit test Jan Tuomi 2017-09-25 19:45:58 +03:00
• e00f1edaa0 Fix pep8 Jan Tuomi 2017-09-25 19:21:19 +03:00
• 6954cc7f10 Refactor members views Jan Tuomi 2017-09-25 19:18:23 +03:00
• 7eeec5da63 Add new translations Jan Tuomi 2017-09-25 13:41:26 +03:00
• 524c6bbb9e Merge branch 'develop' into 'master' Jan Tuomi 2017-09-25 12:21:19 +03:00
• 42d51ca8ca Fix for NaN message when coffee is brewing Teemu Mikkonen 2017-09-25 12:03:22 +03:00
• ac4902f867 Merge branch 'develop' into 'master' Jan Tuomi 2017-09-24 16:31:08 +03:00
• 010fab5be1 Move static dir and fix eslint issues Jan Tuomi 2017-09-24 16:21:45 +03:00
• dd69a0c395 Split coffee.html to multiple files Jan Tuomi 2017-09-24 15:46:43 +03:00
• 78bfa9fbcb Add ALLOWED_HOSTS to sample settings Jan Tuomi 2017-09-24 15:28:22 +03:00
• 416be8e2cd Merge branch 'develop' into 'master' Jan Tuomi 2017-09-24 15:05:46 +03:00
• ef58c8c98f Split settings.py into 2 Jan Tuomi 2017-09-24 13:42:27 +03:00
• 518ea5bf7d Add exception handling Jan Tuomi 2017-09-24 13:31:19 +03:00
• a11943aec6 Move MQTT settings to settings.py Jan Tuomi 2017-09-24 13:28:38 +03:00
• 8b98dcf1ce Delegate a bunch of logic to the ESP Jan Tuomi 2017-09-24 13:16:01 +03:00
• 1c4be69964 Add pickle serializer to settings sample Jan Tuomi 2017-09-24 12:42:16 +03:00
• 4cee5582da Merge branch 'develop' into 'master' Jan Tuomi 2017-09-20 23:47:25 +03:00
• e5ca83a794 Merge branch 'feature-pep8-fixes' into 'develop' Jan Tuomi 2017-09-20 23:36:04 +03:00
• a99544f967 Fix more pep8 badlings Jan Tuomi 2017-09-20 23:35:41 +03:00
• 68f587f776 Merge branch 'develop' into feature-pep8-fixes Jan Tuomi 2017-09-20 23:32:41 +03:00
• 0b779c4799 Fix pep8 errors Jan Tuomi 2017-09-20 23:27:09 +03:00
• 5d1238c23d Change prints to logs Jan Tuomi 2017-09-20 23:19:45 +03:00
• b0edaae32e Remove conflict resolver and add dynamic payments Jan Tuomi 2017-09-20 23:17:55 +03:00
• df4f1a8f56 Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-pep8-fixes henu 2017-09-20 21:16:47 +03:00
• 43e54af141 Fix webapp and sikweb py files pep8 henu 2017-09-20 21:15:46 +03:00
• 08710b3705 Fix members pep8 and add docstrings henu 2017-09-20 21:00:58 +03:00
• ecc0ac965e Fix infoscreen pep8 and add docstrings henu 2017-09-20 20:08:26 +03:00
• 7a435bcbc6 Simple Ohlhafv challenge machine Aarni 2017-09-20 19:27:36 +03:00
• f738e76726 Merge branch 'feature-header-template' into 'develop' Henri Varjotie 2017-09-20 19:11:53 +03:00
• e294707aed Increase logo width to 100% henu 2017-09-20 18:52:57 +03:00
• 593b380ecf Add link to header img henu 2017-09-20 18:52:36 +03:00
• c811b65280 Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-header-template henu 2017-09-20 18:44:41 +03:00
• ec5c206c8e Include header to base html file henu 2017-09-20 18:44:03 +03:00
• 3b6f2988df Add logo to header henu 2017-09-20 18:43:34 +03:00
• 33215343ec Add header logo and header css files henu 2017-09-20 18:42:56 +03:00