Commit Graph

673 Commits

Author SHA1 Message Date
008be53be3 Add more admin page columns 2022-11-16 11:04:07 +00:00
f724ec9c30 Add models' str and admin page columns 2022-11-15 13:09:06 -07:00
832a29f0c5 Add pinball scores table and API route 2022-11-15 07:13:53 -07:00
e40383c0fd Decrease minimum Protocoin vend amount 2022-11-06 20:07:15 +00:00
115f4fcaec Fix protocoin and amount decimal serializer 2022-10-22 23:59:47 +00:00
be3d14b75e Add django command to bill for Trotec use 2022-10-04 22:28:22 +00:00
41f66635fa Don't grant unvetted certification on tools that require vetting 2022-09-20 20:39:14 +00:00
233634ba29 Add new Protospace IP address 2022-09-15 03:57:56 +00:00
54c85fb2af Add script for deleting and merging redundant courses 2022-09-05 22:51:26 +00:00
855006f95a Get prev_session by datetime while suggesting 2022-09-05 22:20:49 +00:00
1ecea894d3 Update app version 2022-09-05 22:03:34 +00:00
4f121d0541 Add progress to class creation, fix interest emails
If there's 20 people interested in a course, class creation could take
quite a while so show progress. Only send emails to active members.
Change "Interest +" wording to "interested" in emails.
2022-09-05 22:01:46 +00:00
3c8a4ae7e4 Add public protocoin transaction route 2022-09-02 01:00:39 +00:00
0a6e9a6449 Merge branch 'preferred_name' 2022-08-31 00:12:56 +00:00
a8da1ff2e5 Fix admin transaction sort order 2022-08-30 20:49:49 +00:00
8504b77e57 Generate missing LDAP users 2022-08-30 20:49:04 +00:00
6a3ce847d6 Make sure number of membership months is entered. 2022-08-29 03:19:18 +00:00
0c0b7ce3a7 More preferred name 2022-08-27 06:55:55 +00:00
09d9f3168a Ignore auth timeout errors 2022-08-26 00:37:08 +00:00
847f4bea92 Collect preferred name on sign up and use it 2022-08-25 02:16:28 +00:00
590b37c085 Show Protocoin total circulation 2022-08-24 23:12:02 +00:00
118a99aedd Fix sorting by breaking ties 2022-08-24 21:27:24 +00:00
fbb388b67c Fix more Protocoin sum bugs 2022-08-24 01:51:11 +00:00
c88d5add1f Fix Protocoin bug for new signups crashing portal 2022-08-24 01:47:37 +00:00
9bb80f6dce Make protocoin transactions atomic to fix race conditions 2022-08-23 21:23:21 +00:00
226008a0c2 Add logging to all transactions 2022-08-23 20:36:03 +00:00
14933b2405 Add API route for vending card request 2022-08-23 04:15:07 +00:00
0257a8cd63 Add API route for vending card balance 2022-08-23 03:44:35 +00:00
dde74fb402 Add API and UI to send Protocoin 2022-08-23 02:54:19 +00:00
51f31fc4df Add custom Protocoin symbol 2022-08-23 01:01:22 +00:00
495a6855a1 Improve validation 2022-08-22 22:37:49 +00:00
1444a52a11 Add Protocoin to Paymaster 2022-08-22 22:15:03 +00:00
1c225da510 Display protocoin amounts, improve transaction validation 2022-08-22 21:33:38 +00:00
81c9bd9c9b Add protocoin to Transaction model and editor 2022-08-22 20:17:43 +00:00
be1157b310 Fix member meeting date suggestion bug 2022-07-22 03:26:52 +00:00
41f6969a4a Auto suggest new class times 2022-07-15 03:21:25 +00:00
f0943191ab Freeze requirements 2022-07-12 21:48:03 +00:00
281493ad25 Replace paypal custom json " with ` 2022-07-12 06:13:18 +00:00
56b287ba78 Add Purchases PayPal category match 2022-07-12 04:16:29 +00:00
Kent Brockman
c8422e9ba5 add unhappy day registration test cases 2022-07-04 20:55:53 -06:00
Kent Brockman
0985e56940 implement registration API tests
add some comments
2022-07-04 20:43:06 -06:00
Kent Brockman
f76e0953ed test: remove unused django setup calls 2022-06-26 08:14:21 -07:00
Kent Brockman
c029f1ab38 test: move test user/member data creation into testing context 2022-06-26 08:12:20 -07:00
Kent Brockman
a5eefcf5c0 test: remove testcase for method that no longer exists 2022-06-25 19:09:58 -07:00
cc761c81a5 Replace ... on /sign 2022-06-22 05:12:36 +00:00
4d4e6cdae1 Only set to Confirmed if Waiting for payment 2022-06-06 06:42:09 +00:00
9bff599d59 Send member welcome message to the sign 2022-06-03 02:06:49 +00:00
859b716f2d Remove particle sign integration 2022-06-01 03:18:56 +00:00
f07781afe6 Generate search strings on new member signup 2022-05-25 04:40:35 +00:00
dc45311e9d Match training transactions regardless of status 2022-05-23 21:27:24 +00:00
adb14f5c4f Add Protogarden image to Home stats 2022-05-17 02:38:20 +00:00
152107a9bb Fix another email ical bug 2022-05-13 04:06:20 +00:00
f9d94a4a05 Automatically confirm students if they've already paid 2022-05-12 06:16:17 +00:00
edcc8d2ce0 Fix bug where non-instructors couldn't email iCal 2022-05-11 00:25:17 +00:00
868aa018a4 Add ability to change class instructor 2022-05-10 01:07:32 +00:00
2c59b93402 Only send interest emails for future classes 2022-05-09 22:43:47 +00:00
9f91cca187 Don't count Usages where should_bill=False 2022-05-06 05:01:09 +00:00
500c5a42e1 Small fixes 2022-05-05 20:26:56 +00:00
67adbd277c Send an email to people interested in a course 2022-05-04 23:02:39 +00:00
2dd2d8dc41 Display number of interests in course list 2022-05-04 20:36:55 +00:00
f252d7882d Install shell_plus and ipython 2022-05-04 19:33:01 +00:00
29980025fb Add UI and API for expressing interest in a course 2022-05-04 01:27:50 +00:00
d7ba3d6408 Replace curly quotes on sign message 2022-04-29 07:12:25 +00:00
14c325f155 Remove address fields from database 2022-04-28 21:35:52 +00:00
c2f9295585 Add field for custom wiki username in database 2022-04-28 21:16:37 +00:00
667887c06c Display empty courses in new class table 2022-04-26 03:06:51 +00:00
4c1752c07d Detect someone bypassing trotec computer 2022-04-25 20:33:46 +00:00
e9d210e846 Stop ignoring soft-deleted usages 2022-04-25 01:34:22 +00:00
ca064a7617 Add API for downloading Usage CSV report 2022-04-25 01:15:05 +00:00
33aaf68c5e Remove duplicates from last scanned list 2022-04-24 00:21:12 +00:00
5a30f60d6e Don't show expired instructors 2022-04-23 21:13:46 +00:00
aa39c8a37a Return 500 on IPN error so PayPal resends 2022-04-21 23:01:43 +00:00
0c5da88d7d Remove usage tracking sanity checks 2022-04-21 22:21:16 +00:00
98768cb7dd Iterate over Members instead of Users in discourse integration 2022-04-21 22:21:16 +00:00
5079f8985f Use correct timezone in iCal email 2022-04-21 22:21:16 +00:00
2dd0a04ed8 Generate search strings hourly instead of member update 2022-04-11 21:56:47 +00:00
597ef096fa Improve logging 2022-04-11 21:55:02 +00:00
d6fa8b989f Fix negative transaction bug 2022-04-11 21:23:59 +00:00
7430422adc Freeze requirements 2022-04-07 21:42:29 +00:00
6ffce428c5 Download and email iCal files for classes 2022-04-07 21:39:38 +00:00
eb7d34c92d Improve docs 2022-04-07 19:58:20 +00:00
e9b8f9048a Remove reference to old dev docs 2022-04-06 23:35:05 +00:00
1fb93238c5 Add markdown development docs 2022-04-06 23:33:58 +00:00
332b001533 Fix markdown parsing 2022-04-06 23:33:58 +00:00
5e2454243b Begin markdown docs 2022-04-06 23:33:58 +00:00
42b878abbf Bring back the static files 2022-04-06 23:17:39 +00:00
3529dbb359 Make it easy to run Spaceport locally 2022-04-06 22:54:55 +00:00
3aea713a1b Listen to all hosts if BINALL env var is set 2022-04-06 22:04:56 +00:00
e02045c9ac Strip member names whitespace, alert about test users 2022-04-06 20:53:34 +00:00
4b5d0181b5 Grab links from the sign 2022-03-30 04:11:47 +00:00
8f48f894b8 Ignore outputs 2022-03-24 03:23:31 +00:00
3c285ce635 Ignore next monthly clean from the next and last class 2022-03-17 19:55:45 +00:00
fbe61f6eec Fix bug when last use doens't have a User 2022-03-17 19:52:32 +00:00
64cf1eeaa0 Add next and last class to home stats 2022-03-17 19:50:57 +00:00
a93ac00120 Add more info to username has spaces error message 2022-02-11 22:44:47 +00:00
5d35910b4d Fix running cut time bug 2022-02-11 21:03:14 +00:00
ec169e6dc7 Disable usage mismatch check for now 2022-02-11 06:18:27 +00:00
5cb3264045 Ignore soft deleted uses 2022-02-11 04:47:41 +00:00
e8f8ca02da Switch to job-based usage tracking 2022-02-11 04:11:12 +00:00
06f03e1ce9 Add even more check to login because passwords are so hard 2022-02-10 01:49:19 +00:00
87863b3baf Add checks to username on login 2022-02-10 00:30:16 +00:00
665a2bddef Remove welcome email debugging 2022-02-09 02:57:53 +00:00
680039fa51 Add a special page showing the latest laser usage 2022-02-08 02:28:10 +00:00
8d8a399f33 Increase Trotec usage threshold 2022-02-07 04:24:24 +00:00
d535113ca5 Automatically fill out card number 2022-02-06 23:46:58 +00:00
0d19cd8662 Remove references to old portal 2022-02-06 21:40:26 +00:00
665c0f61bc Move scripts into scripts/ 2022-02-06 21:34:36 +00:00
0b118c57fc Fix requirements 2022-02-06 21:31:39 +00:00
Tanner Collin
1196012193
Merge pull request #69 from Protospace/dependabot/pip/apiserver/reportlab-3.5.55
Bump reportlab from 3.5.34 to 3.5.55 in /apiserver
2022-02-06 14:24:35 -07:00
Tanner Collin
1e952f0623
Merge pull request #71 from Protospace/dependabot/pip/apiserver/django-3.1.14
Bump django from 3.1.13 to 3.1.14 in /apiserver
2022-02-06 14:24:17 -07:00
c4f6e5b997 Freeze requirements 2022-02-06 21:23:42 +00:00
d949377e17 Add searching members by Discourse username 2022-02-06 08:11:28 +00:00
82f3271726 Increment app version 2022-02-05 21:17:43 +00:00
f556e21d51 Make sure member_id is included in requests 2022-02-04 10:46:31 +00:00
2cbb872248 Add memo, should_bill fields to Usage table 2022-02-03 23:37:26 +00:00
1457714642 Add last_update to Usage table 2022-02-03 06:31:41 +00:00
43507024b7 Merge branch 'master' into usage_tracking 2022-02-02 21:21:22 +00:00
3fd1b016b0 Send new members a welcome email 2022-01-31 03:49:50 +00:00
a914171cb3 Add student count to course's classes, prevent empty add student 2022-01-30 00:04:44 +00:00
da510f2ab4 Add filtering Classes and Courses by tag 2022-01-28 07:47:25 +00:00
14f3e46586 Revamp Class list 2022-01-27 22:46:10 +00:00
e13d0a0604 Sort classes by course and date 2022-01-27 01:02:40 +00:00
5c6486215c Don't log anonymous GET /sessions/ 2022-01-26 23:57:23 +00:00
809e0702f3 Quarantine 2022-01-26 11:13:09 +00:00
4042c37112 Update app version 2022-01-26 04:25:28 +00:00
987e2a7465 Make the Class list publicly available, add Class Feed page 2022-01-26 04:21:47 +00:00
8b3fe7434e Fix username bug 2022-01-26 02:01:46 +00:00
e6aaef9bf1 Add Consumables to Paymaster 2022-01-25 04:12:22 +00:00
5804995376 Implement basic usage tracking 2022-01-25 00:27:55 +00:00
7acad94f68 Add script to calculate subscriber membership lengths 2022-01-23 21:24:29 +00:00
eedb546db5 Add stats for number of PayPal subscribers 2022-01-23 09:34:36 +00:00
fddb4e1c1a Only call member.save() when there's a change 2022-01-23 02:33:20 +00:00
0a7bb7e963 Store PayPal transaction type 2022-01-23 01:52:23 +00:00
c7358239b1 Move old scripts to scripts/ 2022-01-22 07:56:53 +00:00
cf79c335c2 Add barebones UI version tracking 2022-01-21 22:48:51 +00:00
69126440d3 Increase number of sessions shown 2022-01-21 21:30:20 +00:00
9e14fde11e Improve photo upload error handling 2022-01-21 04:36:58 +00:00
08ab4b2924 Stop detection of MP0 images 2022-01-21 03:17:21 +00:00
26cae32c0b Improve exception logging 2022-01-19 23:58:34 +00:00
5b12091584 Remove info_source selection from Transaction serializer 2022-01-18 08:17:53 +00:00
dependabot[bot]
22ad4ed31c
Bump django from 3.1.13 to 3.1.14 in /apiserver
Bumps [django](https://github.com/django/django) from 3.1.13 to 3.1.14.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.1.13...3.1.14)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 00:33:44 +00:00
dependabot[bot]
20a5e3c74e
Bump reportlab from 3.5.34 to 3.5.55 in /apiserver
Bumps [reportlab](http://www.reportlab.com/) from 3.5.34 to 3.5.55.

---
updated-dependencies:
- dependency-name: reportlab
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 00:33:33 +00:00
fa8f116281 Handle member_id correctly 2022-01-13 23:22:14 +00:00
a3b9bc0d90 Fix bugs 2021-12-22 06:25:02 +00:00
6b76057cab Process IPNs based off User instead of Member 2021-12-22 06:02:05 +00:00
7623ef68fe Limit sign message length 2021-12-22 06:01:50 +00:00
42d6cb35d7 Remove member_id from geting object owner 2021-12-08 22:19:46 +00:00
bf5c300c6c Merge branch 'load_more' 2021-12-08 22:09:06 +00:00
db3e1290e4 Log sign submissions 2021-12-03 06:38:31 +00:00
4079896dc8 Don't send to sign if it's not configured 2021-12-03 05:20:02 +00:00