b37d5f2f55
Fix translation issue in payment form
2017-06-04 13:24:54 +03:00
350112c5d1
Merge branch 'feature-infoadmin' into develop
2017-06-01 19:40:18 +03:00
1fd830b51e
Add translations to member counter
2017-06-01 19:23:51 +03:00
e6328fdf87
Add member count to member list
2017-06-01 19:16:52 +03:00
c36ef9ad3f
Fix payment reference issue with duplicate resolver
2017-06-01 18:39:26 +03:00
a1171afc56
Merge branch 'develop' into feature-infoadmin
2017-06-01 18:04:26 +03:00
c3b1510bb8
Add settings tab for changing language
2017-06-01 17:38:25 +03:00
77c6903658
More mobile styles 😄
2017-05-30 21:29:06 +03:00
c9f768a5b6
Translations and some styles
2017-05-30 20:36:18 +03:00
08c919ded3
Implement responsive styles for mobile
2017-05-30 20:23:17 +03:00
5c8dfdfd1d
Add settings value for automatic emails
...
Resolves #54
2017-05-29 23:26:36 +03:00
0a3e10d1c3
Merge branch 'feature-duplicate-resolver' into 'develop'
...
Feature duplicate resolver
See merge request !35
2017-05-29 23:22:04 +03:00
26f4d28003
Finalize duplicate resolver styles
...
Also try-except the email sending code
2017-05-29 22:59:38 +03:00
3a8d988033
Implement conflict resolution logic
2017-05-29 22:00:29 +03:00
bb769583f2
Modify the order of infoitems
2017-05-29 11:41:39 +03:00
013bbeae7a
Add some localizations
2017-05-29 09:54:12 +03:00
09e8c93e8d
Create view and model for duplicate member conflicts
2017-05-28 23:40:47 +03:00
cc9768b895
Mobile login screen and translations
2017-05-28 22:03:02 +03:00
ca9d875131
Add missing div
2017-05-28 15:32:57 +03:00
d3d721abeb
Make infoadmin tabs more descriptive
2017-05-28 14:43:39 +03:00
d06bdd7e23
Fix header width
2017-05-28 14:42:44 +03:00
1cc936674c
Modify rotation tab to a dropdown menu
2017-05-27 15:11:16 +03:00
362422b86b
Clean up login page styles
2017-05-27 15:05:57 +03:00
8b73cf86bb
Only install pep8 for CI lint job
2017-05-27 14:19:01 +03:00
95fe21d599
Fix style problem where hamburger menu button was on top of page title
2017-05-27 13:59:13 +03:00
88f4e57078
Merge branch 'bugfix-sidebar' into 'develop'
...
Fix sidebar styles
See merge request !32
2017-05-27 13:54:35 +03:00
3e2fb90a16
Add tab for rotation management
2017-05-27 13:53:33 +03:00
362c341966
Fix sidebar styles
2017-05-27 13:53:23 +03:00
700896e3f8
Move slides and rotations under tabs
2017-05-27 13:33:03 +03:00
dd5cd50a3e
Prettify about page
2017-05-27 13:02:36 +03:00
9974b3c02c
Add tabs for slides and rotations
2017-05-27 13:00:30 +03:00
6b3e105bb7
Make lights go green again 💚
2017-05-27 12:15:59 +03:00
7d2953b389
Add throttles.py for DRF
2017-05-27 11:50:00 +03:00
9276f4cafb
Merge feature-sidebar with conflicts
2017-05-27 11:30:22 +03:00
12d7ca0835
Fix settings error
2017-05-27 11:13:29 +03:00
e9fbc38b4d
Remove dead code and fix tokens error
2017-05-27 11:04:59 +03:00
f587c69435
Make model names translatable
2017-05-27 10:57:16 +03:00
14ed32931b
Fix sidebar transition and styling
2017-05-25 19:17:51 +03:00
54612e31ca
Add REST API support to members
...
Members can be now retrieved one at a time is user has admin rights.
Implemented also permissions and throttle rates to REST API and added
required settings.py modifications to settings-sample.py file.
2017-05-25 17:06:44 +03:00
90177ab9fc
Fix Member model method last_paid
...
The last_paid method used DoesNotExist exception to handle situation
where no proper payment models were found. However, the syntax was
wrong and it should have used Payment.DoesNotExist. This was fixed.
2017-05-25 17:00:31 +03:00
bff2dd2b76
Fix hsl fetcher time minutes type error
2017-05-25 15:00:48 +03:00
2834da0934
Email new member on request and accept
2017-05-24 21:03:55 +03:00
128342c678
Add about.html because Jopi forgot
2017-05-24 20:08:18 +03:00
7f694e5257
Merge branch 'feature-gitversion' into 'develop'
...
Feature gitversion
See merge request !27
2017-05-24 19:40:02 +03:00
386107075c
Fix requirements
2017-05-24 18:42:45 +03:00
66779c17f1
Add git revision hash to UI
...
Closes issue #49
2017-05-24 18:40:01 +03:00
13c3df6ee4
Fix sidebar animation
2017-05-24 18:31:41 +03:00
50fec558c2
Add "last paid" column to member list
2017-05-24 18:22:33 +03:00
04293adcbd
Merge branch 'feature-videoitem' into 'develop'
...
Complete infoscreen video support
See merge request !26
2017-05-24 18:16:50 +03:00
00829f4fd5
Fix pep8
2017-05-24 18:11:28 +03:00
Jan Tuomi