Christian Cueni
|
1bc2436a8b
|
Merge branch 'develop' into feature/licensing
# Conflicts:
# server/core/settings.py
# server/core/urls.py
# server/core/views.py
|
2020-04-30 09:49:22 +02:00 |
|
Christian Cueni
|
ebc8d070f6
|
Remove error field from query
|
2020-04-30 09:12:36 +02:00 |
|
Christian Cueni
|
d46cc7a177
|
Use remove error field, fix tests
|
2020-04-30 08:49:54 +02:00 |
|
Christian Cueni
|
1ca982dd24
|
Fix settings
|
2020-04-30 07:49:48 +02:00 |
|
Christian Cueni
|
57e7122fef
|
Update ISBN
|
2020-04-30 07:03:56 +02:00 |
|
Christian Cueni
|
d10517b4f5
|
Update env variables
|
2020-04-30 06:49:18 +02:00 |
|
Christian Cueni
|
b14ed2fb5a
|
Change url, add group_id
|
2020-04-27 08:14:39 +02:00 |
|
Christian Cueni
|
737b682855
|
Add comments, clean up code
|
2020-03-17 16:13:00 +01:00 |
|
Christian Cueni
|
0e52ab6f49
|
Clean up code
|
2020-03-17 14:20:06 +01:00 |
|
Christian Cueni
|
5d614dd7e5
|
Fix minor issues
|
2020-03-09 16:22:56 +01:00 |
|
Christian Cueni
|
e5b0fe539f
|
Rename LocalLogin -> BetaLogin
|
2020-03-09 15:47:50 +01:00 |
|
Christian Cueni
|
b2d8c374c0
|
Raise exception in Backend
|
2020-03-09 13:51:46 +01:00 |
|
Christian Cueni
|
096fe77d46
|
Remove call to dummy license command
|
2020-02-27 13:12:33 +01:00 |
|
Christian Cueni
|
7e91b606bd
|
Fix migrations
|
2020-02-27 10:41:30 +01:00 |
|
Christian Cueni
|
ed2f2c0557
|
Merged in hotfix/html-email (pull request #48)
Hotfix/html email
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2020-02-27 09:30:49 +00:00 |
|
Christian Cueni
|
d95e8ca492
|
Merge branch 'develop' into feature/licensing
# Conflicts:
# Pipfile.lock
# client/cypress/fixtures/schema.json
# client/src/graphql/client.js
# client/src/graphql/resolvers.js
# client/src/graphql/typedefs.js
# client/src/main.js
# client/src/router/index.js
# server/users/models.py
|
2020-02-27 10:29:24 +01:00 |
|
Christian Cueni
|
bdee1875ff
|
Fix backend test
|
2020-02-27 09:20:21 +01:00 |
|
Christian Cueni
|
af818f5ee7
|
Send registration emails as html
|
2020-02-26 13:51:17 +01:00 |
 Ramon Wenger
|
f4a98e50ba
|
Fix unit tests
|
2020-02-26 13:22:22 +01:00 |
|
Ramon Wenger
|
10349d91b5
|
Update dummy data
|
2020-02-26 12:46:10 +01:00 |
|
Christian Cueni
|
a5e1b323a2
|
Synd HEP data
|
2020-02-26 11:12:13 +01:00 |
|
Christian Cueni
|
4e2c47d00a
|
Update user expiry field, fix tests
|
2020-02-26 10:31:35 +01:00 |
|
Christian Cueni
|
13295e2d2e
|
Fix tests
|
2020-02-25 16:12:01 +01:00 |
|
Christian Cueni
|
93798358ea
|
Use html emails
|
2020-02-25 14:54:02 +01:00 |
|
Christian Cueni
|
b572523a33
|
Add proxy for registration call
|
2020-02-25 14:42:42 +01:00 |
|
Christian Cueni
|
950faf1c9c
|
Merged in hotfix/html-email (pull request #47)
Add html links to emails
Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
|
2020-02-25 13:23:11 +00:00 |
|
Christian Cueni
|
d44e38c04c
|
Add tag for link generation
|
2020-02-25 10:28:57 +01:00 |
|
Ramon Wenger
|
1623cd3265
|
Fix unit tests
|
2020-02-24 18:54:46 +01:00 |
|
Ramon Wenger
|
2e1d7b46bc
|
Add error message and add styling
|
2020-02-24 18:32:55 +01:00 |
|
Christian Cueni
|
fff752f59d
|
Add update admin token command
|
2020-02-24 16:22:48 +01:00 |
|
Christian Cueni
|
f62d2ad5ef
|
Fix license sync
|
2020-02-24 16:12:40 +01:00 |
|
Ramon Wenger
|
ca97a15398
|
Merge branch 'hotfix/postgres-pipelines' into feature/multiple-classes-for-everyone
|
2020-02-24 16:11:25 +01:00 |
|
Christian Cueni
|
f24f828a45
|
Add html links to emails
|
2020-02-24 13:19:27 +01:00 |
|
Christian Cueni
|
f8fab82851
|
Finish coupon flow
|
2020-02-24 11:30:37 +01:00 |
|
Christian Cueni
|
0df6cb9d93
|
Add cronjob for license-sync
|
2020-02-20 14:21:52 +01:00 |
|
Christian Cueni
|
96c0b3ee64
|
Move license to core
|
2020-02-20 13:22:15 +01:00 |
|
Christian Cueni
|
8d864fbf6e
|
Remove legacy registration
|
2020-02-20 08:36:05 +01:00 |
|
Christian Cueni
|
c93d2f6843
|
Remove hep id as default
|
2020-02-18 16:57:36 +01:00 |
|
Christian Cueni
|
e067717d50
|
Fix local login
|
2020-02-18 16:01:20 +01:00 |
|
Christian Cueni
|
cd24073675
|
Add local login tests in backend
|
2020-02-18 14:53:08 +01:00 |
|
Christian Cueni
|
3c72c9559e
|
Split token and local login
|
2020-02-18 14:36:49 +01:00 |
|
Christian Cueni
|
42d16caafc
|
Allow coupon calls
|
2020-02-18 14:10:04 +01:00 |
|
Christian Cueni
|
f3bd38e819
|
Redirect users without license to coupon page
|
2020-02-18 13:48:45 +01:00 |
|
Ramon Wenger
|
bd6e0f75ca
|
Add code to school class dummy data
|
2020-02-18 10:23:27 +01:00 |
|
Christian Cueni
|
677d8dbf44
|
Fix login & tests
|
2020-02-18 10:05:07 +01:00 |
|
Christian Cueni
|
36c43bf4e1
|
Detect 402 in frontend, allow me query
|
2020-02-17 16:08:47 +01:00 |
|
Christian Cueni
|
c9c42e2296
|
Check user license in Api, save
|
2020-02-17 15:08:06 +01:00 |
|
Christian Cueni
|
7a532463a6
|
Update registration mutation with user id and hep calls
|
2020-02-13 12:32:55 +01:00 |
|
Christian Cueni
|
909f7337ac
|
Fix email verification for stage
|
2020-02-13 11:28:23 +01:00 |
|
Christian Cueni
|
82c1135f0e
|
Add coupon call in frontend, add tests, fix api
|
2020-02-13 10:03:00 +01:00 |