Commit Graph

Select branches

Hide Pull Requests

master

php7

utf8

Mono Color

• db35ea0c4a php7: fix warning master nikolark 2016-11-16 22:25:19 +01:00
• e9b4b82d7e Merge branch 'master' into utf8 utf8 nikolark 2016-11-16 22:06:43 +01:00
• e95eb5a64a Merge branch 'php7' into utf8 nikolark 2016-11-16 22:05:44 +01:00
• c5845afc3a fix(stats): Fix zero vals, minor refactor nikolark 2016-09-24 14:08:58 +02:00
• 25563043f8 feat(stats): Add table with export to csv nikolark 2016-09-24 13:49:31 +02:00
• e2bab9ab8d stats: put start date in url nikolark 2016-09-23 01:05:00 +02:00
• c76b4594d8 Stats: Add start date filter nikolark 2016-09-23 01:01:19 +02:00
• 1d06f441db Merge branch 'master' into php7 php7 nikolark 2016-09-08 23:22:15 +02:00
• 36cce15c06 card.php: Allow repurchase of membership for same user nikolark 2016-08-17 01:39:09 +02:00
• c3f019b86c set db charset to utf-8 nikolark 2016-08-17 00:08:08 +02:00
• 3ddf7a9b20 more utf8 nikolark 2016-08-17 00:07:11 +02:00
• 41694a15cb Merge nikolark 2016-08-17 00:03:33 +02:00
• c1eba34009 php7 fixes (assign by ref) nikolark 2016-08-16 23:57:24 +02:00
• 0d75f65385 Start converting everything to utf-8 nikolark 2016-08-16 23:43:03 +02:00
• 4f7ae485b3 php7 fixes (charset) nikolark 2016-08-16 23:42:28 +02:00
• 402a7f7477 php7 fixes (mysqli) nikolark 2016-08-16 23:41:58 +02:00
• 38f7c99aa9 activation form: removes legacy sms check nikolark 2016-08-16 21:24:08 +02:00
• ff2cc4914e api: fix card.has_valid_membership logic nikolark 2016-08-16 21:18:41 +02:00
• e43e0ffe4e typo nikolark 2016-03-25 18:49:57 +01:00
• 7cae5234a1 Oops nikolark 2016-02-06 21:12:01 +01:00
• 43bca1d54f feat(activation): Adds resend activation email cmd nikolark 2016-02-06 20:55:44 +01:00
• 324612852f Oops nikolark 2015-10-04 19:37:24 +02:00
• 1f59599703 Try cleaning up and fixing activation for existing users nikolark 2015-10-04 19:36:27 +02:00
• d224708fe1 Fixes card reg form for users, removes link to webshop nikolark 2015-09-29 14:47:37 +02:00
• 94879c7b63 Support membership trials in get_card (and phonenumber lookup) nikolark 2015-09-19 16:25:07 +02:00
• 3bcbcc89ac Adds TODO for trial memberships nikolark 2015-09-18 12:38:06 +02:00
• 09c90cb079 SMS: Should fix validation codes nikolark 2015-09-09 21:21:45 +02:00
• 4107b553ac Fixes SQL error in card activation nikolark 2015-09-09 21:09:02 +02:00
• 9d58c8b1b4 Datetime parsing fix nikolark 2015-09-01 16:30:08 +02:00
• ab2a198682 Should prevent users from activating twice. nikolark 2015-09-01 15:57:17 +02:00
• 61fe0a0678 API: Adds support for trial memberships nikolark 2015-08-29 18:19:26 +02:00
• 2657e79829 Merge branch 'feature-future-renewals' nikolark 2015-08-29 16:06:54 +02:00
• caac9d3428 endret logo igjen Siv Blyseth 2015-08-26 21:59:30 +02:00
• c8b2c9772e endret logo Siv Blyseth 2015-08-26 21:51:54 +02:00
• f33ffa23df API: Allow renewal of membership with upcoming expiry nikolark 2015-08-18 22:35:29 +02:00
• f2bd23efad API: Try fixing wrong key in error message nikolark 2015-08-15 23:16:41 +02:00
• fbf2b2a464 Card api: Allow new action sms_card_notify nikolark 2015-08-12 15:34:22 +02:00
• 099f222396 Pie chart for today nikolark 2015-08-11 21:01:56 +02:00
• 9a146f98f7 Oops nikolark 2015-08-11 20:47:16 +02:00
• 1d6b2dac3c sales can be ints nikolark 2015-08-11 20:46:03 +02:00
• 2e7b037c7e Adds today totals nikolark 2015-08-11 20:40:17 +02:00
• 1682c71e93 Minor refactor, fixes timestamps nikolark 2015-08-11 19:17:23 +02:00
• 22ee431530 Typos nikolark 2015-08-10 21:37:09 +02:00
• f2e2d2aedc Minor nikolark 2015-08-10 21:35:56 +02:00
• 1d9d120803 Stats: Hack in some totals nikolark 2015-08-10 21:33:57 +02:00
• b10bf1a11d Adds kassa sales nikolark 2015-08-10 21:12:54 +02:00
• 7ca98564d4 Snapporder sales nikolark 2015-08-10 20:33:36 +02:00
• 04919e4a06 Try fixing welcome email nikolark 2015-08-10 20:09:57 +02:00
• 05c25c59fe Sanity checking in welcome email nikolark 2015-08-10 20:05:37 +02:00
• 2a1df4a529 Minor nikolark 2015-08-10 13:56:01 +02:00
• 59c38557be Welcome email wording nikolark 2015-08-10 13:53:14 +02:00
• e92d486c77 Fixes membership renewal response nikolark 2015-08-10 12:36:37 +02:00
• 8dae51d89f Adds some logging, renames source to kassa nikolark 2015-08-10 11:49:28 +02:00
• cdd46e5430 Fix syntax error :-( ponas 2015-08-10 00:25:45 +02:00
• af1777217c Fix notice when not logged in ponas 2015-08-10 00:24:10 +02:00
• ddd3ae9da0 Adds initial membership stats page nikolark 2015-08-09 22:11:29 +02:00
• cd00524894 Removes some more unused navigation nikolark 2015-08-09 16:08:09 +02:00
• 58f64eb200 Replace existing membership activation code, ++ nikolark 2015-08-09 15:35:12 +02:00
• 7170728177 Fix issue with card update when no previous card nikolark 2015-08-08 12:49:54 +02:00
• 0d2e0dc752 Removes some menu options that are no longer in use nikolark 2015-08-07 00:05:41 +02:00
• a210751ac5 Clearify form error nikolark 2015-08-06 21:58:10 +02:00
• b41938c633 Card API fixes nikolark 2015-08-06 21:44:46 +02:00
• 8dd2853897 Send confirmation email on membership purchase nikolark 2015-08-06 21:12:36 +02:00
• eaf1f2fba3 Fixes membership renewal nikolark 2015-08-06 20:43:23 +02:00
• 6a4c5cfded Minor nikolark 2015-08-06 19:11:05 +02:00
• 1217705e48 s/på/i nikolark 2015-08-05 19:09:57 +02:00
• 12a9f20acf Registration form fixes nikolark 2015-08-05 19:07:24 +02:00
• b22be5427f Removes legacy MySQL password support nikolark 2015-08-05 15:51:32 +02:00
• 6190f6e643 Rename and work on membership renewal WIP nikolark 2015-08-04 09:39:04 +02:00
• 3a726a34e9 Re-add pushing to internal systems (krb5, radius) nikolark 2015-08-03 14:14:25 +02:00
• 68ea5abeb6 Remove legacy migration code nikolark 2015-08-03 13:55:46 +02:00
• e29be38aab Start work on membership renewal endpoint, ++ nikolark 2015-08-02 23:53:17 +02:00
• ee6fe2f9ef Activation of card users should now work nikolark 2015-08-02 23:05:49 +02:00
• 322805fba8 Fixes for card registration nikolark 2015-08-01 01:39:10 +02:00
• cf4eb0e638 Phone number API now looks in din_card-table nikolark 2015-07-31 23:01:20 +02:00
• 1161fdea8b Adds no-user card registration, ++ nikolark 2015-07-31 21:32:07 +02:00
• 06814d481c UTF-8 encoding cleanups nikolark 2015-07-31 15:54:00 +02:00
• 5125540d7e Fixes searching with utf-8 chars, minor fixes nikolark 2015-07-23 21:32:10 +02:00
• 90d7f338f1 Starts using new table din_card for member cards nikolark 2015-07-22 00:25:26 +02:00
• 2108959402 Adds some more card number checks nikolark 2015-07-20 01:00:56 +02:00
• 2615f7154d API-work for kassa.neuf.no nikolark 2015-07-13 23:55:37 +02:00
• 6170baef22 Adds active status (in group) to API nikolark 2015-07-12 14:25:06 +02:00
• 103404de28 Adds card number api nikolark 2015-07-10 23:39:21 +02:00
• 47135d2d66 Phonenumber search returns full user objects nikolark 2015-07-10 18:42:44 +02:00
• 197ee1f926 Adds cardno legacy status nikolark 2015-07-10 00:08:30 +02:00
• 05e7c423aa Fixes notice on users with no groups nikolark 2015-07-09 23:51:29 +02:00
• ac7d136948 Adds phonenumber lookup to API, refactoring nikolark 2015-07-09 22:54:07 +02:00
• d7979a3691 Adds expires value to output nikolark 2015-07-07 17:15:06 +02:00
• 0d4510c30d Try fixing SMS purchases nikolark 2015-05-31 16:55:43 +02:00
• 46a2c11398 Add info about SnappOrder in confirmation email nikolark 2015-04-26 15:10:01 +02:00
• 0e1eb9b6ac LDAP passwords all over the place nikolark 2015-04-09 16:05:21 +02:00
• 0fd8699e8a Removes references to apache_getenv in unused LDAP functions nikolark 2015-04-05 14:19:22 +02:00
• ff434328b3 README update nikolark 2015-04-03 19:31:08 +02:00
• f08d89e320 Updates membership product image root@amen 2015-04-03 12:56:30 +02:00
• e1cf5675bd Utdatert SMS-info nikolark 2015-04-03 12:56:02 +02:00
• ce04be41ef Fixes phonenumbers without +47 and prevents stealing other peoples number nikolark 2015-04-02 12:41:11 +02:00
• fe296c8d88 Disable LDAP auth, to match Userinfo. Userinfo now uses Inside as auth source nikolark 2015-04-01 19:22:56 +02:00
• 4c44f0491f Put LDAP hash in din_user.ldap_password on user create nikolark 2015-04-01 17:49:41 +02:00
• a9705ecfae Merge branch 'master' of git.neuf.no:edb/inside nikolark 2015-03-21 20:21:47 +01:00
• 0d677bd880 Minor ldap sync url change nikolark 2015-03-21 20:21:38 +01:00