461 Commits
Author SHA1 Message Date
nikolark e9b4b82d7e Merge branch 'master' into utf8 2016-11-16 22:06:43 +01:00
nikolark e95eb5a64a Merge branch 'php7' into utf8 2016-11-16 22:05:44 +01:00
nikolark c5845afc3a fix(stats): Fix zero vals, minor refactor 2016-09-24 14:08:58 +02:00
nikolark 25563043f8 feat(stats): Add table with export to csv 2016-09-24 13:49:31 +02:00
nikolark e2bab9ab8d stats: put start date in url 2016-09-23 01:05:04 +02:00
nikolark c76b4594d8 Stats: Add start date filter 2016-09-23 01:01:19 +02:00
nikolark 1d06f441db Merge branch 'master' into php7 2016-09-08 23:22:15 +02:00
nikolark 36cce15c06 card.php: Allow repurchase of membership for same user 2016-08-17 01:39:09 +02:00
nikolark c3f019b86c set db charset to utf-8 2016-08-17 00:08:08 +02:00
nikolark 3ddf7a9b20 more utf8 2016-08-17 00:07:11 +02:00
nikolark 41694a15cb Merge 2016-08-17 00:03:33 +02:00
nikolark c1eba34009 php7 fixes (assign by ref) 2016-08-16 23:57:24 +02:00
nikolark 0d75f65385 Start converting everything to utf-8 2016-08-16 23:43:03 +02:00
nikolark 4f7ae485b3 php7 fixes (charset) 2016-08-16 23:42:31 +02:00
nikolark 402a7f7477 php7 fixes (mysqli) 2016-08-16 23:41:58 +02:00
nikolark 38f7c99aa9 activation form: removes legacy sms check 2016-08-16 21:24:08 +02:00
nikolark ff2cc4914e api: fix card.has_valid_membership logic 2016-08-16 21:18:41 +02:00
nikolark e43e0ffe4e typo 2016-03-25 18:49:57 +01:00
nikolark 7cae5234a1 Oops 2016-02-06 21:12:01 +01:00
nikolark 43bca1d54f feat(activation): Adds resend activation email cmd
Look in scripts dir
2016-02-06 20:55:44 +01:00
nikolark 324612852f Oops 2015-10-04 19:37:24 +02:00
nikolark 1f59599703 Try cleaning up and fixing activation for existing users 2015-10-04 19:36:27 +02:00
nikolark d224708fe1 Fixes card reg form for users, removes link to webshop 2015-09-29 14:47:37 +02:00
nikolark 94879c7b63 Support membership trials in get_card (and phonenumber lookup) 2015-09-19 16:25:07 +02:00
nikolark 3bcbcc89ac Adds TODO for trial memberships 2015-09-18 12:38:06 +02:00
nikolark 09c90cb079 SMS: Should fix validation codes 2015-09-09 21:21:45 +02:00
nikolark 4107b553ac Fixes SQL error in card activation 2015-09-09 21:09:02 +02:00
nikolark 9d58c8b1b4 Datetime parsing fix 2015-09-01 16:30:08 +02:00
nikolark ab2a198682 Should prevent users from activating twice. 2015-09-01 15:57:17 +02:00
nikolark 61fe0a0678 API: Adds support for trial memberships 2015-08-29 18:19:26 +02:00
nikolark 2657e79829 Merge branch 'feature-future-renewals' 2015-08-29 16:06:54 +02:00
Siv Blyseth caac9d3428 endret logo igjen 2015-08-26 21:59:30 +02:00
Siv Blyseth c8b2c9772e endret logo 2015-08-26 21:51:54 +02:00
nikolark f33ffa23df API: Allow renewal of membership with upcoming expiry 2015-08-18 22:35:29 +02:00
nikolark f2bd23efad API: Try fixing wrong key in error message 2015-08-15 23:16:41 +02:00
nikolark fbf2b2a464 Card api: Allow new action sms_card_notify 2015-08-12 15:34:22 +02:00
nikolark 099f222396 Pie chart for today 2015-08-11 21:01:56 +02:00
nikolark 9a146f98f7 Oops 2015-08-11 20:47:16 +02:00
nikolark 1d6b2dac3c sales can be ints 2015-08-11 20:46:03 +02:00
nikolark 2e7b037c7e Adds today totals 2015-08-11 20:40:17 +02:00
nikolark 1682c71e93 Minor refactor, fixes timestamps 2015-08-11 19:17:23 +02:00
nikolark 22ee431530 Typos 2015-08-10 21:37:09 +02:00
nikolark f2e2d2aedc Minor 2015-08-10 21:35:56 +02:00
nikolark 1d9d120803 Stats: Hack in some totals 2015-08-10 21:33:57 +02:00
nikolark b10bf1a11d Adds kassa sales 2015-08-10 21:12:54 +02:00
nikolark 7ca98564d4 Snapporder sales 2015-08-10 20:33:36 +02:00
nikolark 04919e4a06 Try fixing welcome email 2015-08-10 20:09:57 +02:00
nikolark 05c25c59fe Sanity checking in welcome email 2015-08-10 20:05:37 +02:00
nikolark 2a1df4a529 Minor 2015-08-10 13:56:01 +02:00
nikolark 59c38557be Welcome email wording 2015-08-10 13:53:14 +02:00