Version 2.0 - #135

Open

22716248 wants to merge 291 commits into

SPIKESfunc:masterfrom

22716248:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Sep 18, 2021

add level of effect slider in irr
YeLiuGit
committed
7ff5564
update task5.7
YeLiuGit
committed
e0a63f5

Commits on Sep 19, 2021

Implemented Base Skeleton for finishing Task 2
22716248
committed
913849b
Make transitions smoother and allow for more refined changes
22716248
committed
ce0c67d
Add min/max values to concentration table
22716248
committed
f392bd1
Create Reset functionality for Concentration
22716248
committed
589198e
Task 2 - Irreversible Antagonist
22716248
committed
fd4f56c
Task 2 - Affinity Agonist
22716248
committed
f93e49a
Task 2 - Efficacy Agonist
22716248
committed
5faa2d4
Task 2 - Functional Antatonist
22716248
committed
b686c38
Draft Task 1 and 2 Finalization. Update to SA.
22716248
committed
a50f6f8
Updated info for Dose Response Visualiser tab of What To Do button
hannahwalkerden
committed
b18ada1
Updated all instances of coupling efficiency with "Signal amplification" (plus symbol f with gamma)
hannahwalkerden
committed
1eb3877
Dose Response Visualiser - Agonist questions updated
hannahwalkerden
committed
c48b007
Dose response visualiser - competitive antagonist info button text updated
hannahwalkerden
committed
b4766c7
Updated questions for dose response visualiser - competitive antagonist page
hannahwalkerden
committed
eab0cba
Dose response visualiser - irreversible antagonist button info updated
hannahwalkerden
committed
50c98cb
Updated questions in irreversible antagonists on dose response vis page
hannahwalkerden
committed
445657c
Updated info button text for Allosteric Antagonists - Affinity in Dose response page
hannahwalkerden
committed
4dd9407
Allosteric Ant - Aff questions updated for dose response visualiser page
hannahwalkerden
committed
0b9f7d5
Updated text in info button on allosteric antagonist - eff page in dose response visualiser
hannahwalkerden
committed
b92caac
Updates to Allosteric Ant - Eff questions in dose response visualiser page
hannahwalkerden
committed
470128d
Dose response page - Functional antagonist info button updates
hannahwalkerden
committed
53543f9
Dose response vis page - Functional antag questions update
hannahwalkerden
committed
2366084
Videos added to some quetion answers
hannahwalkerden
committed
b6784ea
Added image for inverse angonists
hannahwalkerden
committed
e9f0b02

Commits on Sep 20, 2021

Merge pull request #1 from 22716248/dev_story1
22716248
authored
a5ce15b
update task5.6
YeLiuGit
committed
439875b
Merge branch 'dev_story5' of https://github.com/22716248/SPIKESfunc.github.io into dev_story5
YeLiuGit
committed
1d1d135
new row
essynoori
committed
99dd809
Merge branch 'dev_story5' of https://github.com/22716248/SPIKESfunc.github.io into dev_story5
essynoori
committed
9688603
Update quantitative.html
essynoori
committed
7b67f78

Commits on Sep 21, 2021

Merge branch 'master' into dev_story5
Hannah Walkerden
authored
399289d
Merge pull request #2 from 22716248/dev_story5
Hannah Walkerden
authored
4f82442
Update Dot Sizes
22716248
committed
65a1302
Change color and outline
22716248
committed
07e77c1
Merge pull request #3 from 22716248/Visuals-sprint-2
22716248
authored
d4056ae
Update Readme with basic info
22716248
committed
894651e
Update README.md
22716248
committed
9d23c16
Add ideal line functions
LyulyuSu0330
committed
46177d5
Update to new SABER forumlas
22716248
committed
4ea892b
Refine Competitive Antagonist
22716248
committed
b12da3c
Refine Irreversible Antagonist
22716248
committed
9ae8b8c
Refine Allosteric Antatonist
22716248
committed
0fbca87
Change Ideal Value Table to Actual Line Value Table
LyulyuSu0330
committed
3d03170
Using previous values for Functional Antagonist.
22716248
committed
101dab1
Merge pull request #4 from 22716248/Schild_formula_updates
22716248
authored
a5959db

Commits on Sep 22, 2021

Edit Actual Line Value Table
LyulyuSu0330
committed
53ed6b6
Merge remote-tracking branch 'origin/master' into dev_story5
LyulyuSu0330
committed
085abcc
Merge pull request #5 from 22716248/dev_story5
LyulyuSu0330
authored
0c3e595
Comment out some unfinished codes
LyulyuSu0330
committed
bfa701a
Merge branch 'master' into dev_story5
LyulyuSu0330
authored
2045b3e
Merge pull request #6 from 22716248/dev_story5
LyulyuSu0330
authored
2652427

Commits on Sep 25, 2021

fix problem on 21th Sep version
YeLiuGit
committed
9474f0a

Commits on Sep 26, 2021

for other four pages
YeLiuGit
committed
f075b53

Commits on Sep 28, 2021

Update shildirr.js
YeLiuGit
committed
220bbda

Commits on Sep 29, 2021

Some information updates from v2 & linguard vid inserted
hannahwalkerden
committed
be76ca1
Mainly bold text changes for updates v2
hannahwalkerden
committed
a822393
updates
hannahwalkerden
committed
6f80fc9
Rest of changes from updates v2
hannahwalkerden
committed
22415f1
use new method to count [A] value in analysis table
YeLiuGit
committed
3a3dce1
find bugs in calcLinesFun function
YeLiuGit
committed
fddd39c

Commits on Sep 30, 2021

Video Template Page
22716248
committed
6ea5b08
button placeholder
22716248
committed
080f148
Video Page Finished
22716248
committed
9cb491b
Merge pull request #7 from 22716248/Video-Page
22716248
authored
ce912d7
Update scriptquant.js
essynoori
committed
460b5cd
astetics
essynoori
committed
0c2ed07
container
essynoori
committed
c332428
questions box
essynoori
committed
87e142b
Modify Schild Plot and Schild Plot Property Table
LyulyuSu0330
committed
c416ea3
Modify ideal line calculation function
LyulyuSu0330
committed
cd36493
Update shildaff.js
YeLiuGit
committed
e5630b3

Commits on Oct 1, 2021

Update Schild Property Table function
LyulyuSu0330
committed
af169dd
Create nonlinear.html
22716248
committed
9d12447
Revert "Create nonlinear.html"
22716248
committed
25c359d
Create nonlinear.html
22716248
committed
222f9de
nonlinear html template
22716248
committed
4e74afb

Commits on Oct 4, 2021

Update Shild Plot Function and Shild Plot Property
LyulyuSu0330
committed
810094d
Merge pull request #8 from 22716248/Info-Updates
LyulyuSu0330
authored
ef9356b
Merge pull request #9 from 22716248/non-linear-schild
LyulyuSu0330
authored
fe16b93
Contact detail updates
hannahwalkerden
committed
2c1a2bd
Merge pull request #10 from 22716248/Info-Updates
Hannah Walkerden
authored
9b08e0a
Add Videos tab to quiz
22716248
committed
e2873c5
Graph title changed
essynoori
committed
d3a7c7d
Update SABER v2 Irr
22716248
committed
65c8666
calcLinesFunc
essynoori
committed
3c16df0
Update Line styles
22716248
committed
e89ef8f
Update all styles - DS page
22716248
committed
29e2b26
Update Style
22716248
committed
aad0167
Update all concentration tabs
22716248
committed
a65bde4
Fix schild formula
22716248
committed
e71307e
Update shildfun.js
22716248
committed
f26aead
Merge pull request #12 from 22716248/client-edits
22716248
authored
9ee3390
functional
essynoori
committed
603a0a6
Small changes on Schild Plot function and update Schild Plot Property Table
LyulyuSu0330
committed
c81df94
Merge branch 'master' into dev_task5-sprint3
YeLiuGit
authored
8bec2d2
Merge pull request #14 from 22716248/dev_task5-sprint3
YeLiuGit
authored
2a54793

Commits on Oct 5, 2021

Commits on Oct 6, 2021

Merge pull request #15 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
3493a0e
Update scriptquant.js
YeLiuGit
committed
e780166
Merge branch 'master' of https://github.com/22716248/SPIKESfunc.github.io
YeLiuGit
committed
e9cc1ff
fix reset button not reset plot when there is an alert
YeLiuGit
committed
f6cce05
fix idea line not shown in shildfun
YeLiuGit
committed
128864d

Commits on Oct 8, 2021

Create LICENSE
essynoori
authored
78d48d5
Merge pull request #16 from 22716248/add-license-1
essynoori
authored
d2c25d4

Commits on Oct 9, 2021

Implement main template for non-linear page
22716248
committed
d148690
Implement element 2
22716248
committed
eb08f54
All plot descriptions finished.
22716248
committed
3b78f86
Add all detailed elements
22716248
committed
3297ef4
Update All Headers - Navbar
22716248
committed
90ed249
Clean up Footer
22716248
committed
14fdb19
Fix display issues
22716248
committed
01d4f62
Merge pull request #17 from 22716248/non-linear-page
22716248
authored
478b33b
Remapping image.
22716248
committed
241c97f
Merge pull request #18 from 22716248/non-linear-page
22716248
authored
7653163
Add missing video
22716248
committed
48096f3
Merge pull request #19 from 22716248/Update-Video-Page
22716248
authored
3b0419f
fix feedback 17,18,19,20,23,24,26,27,29,32,33,38,39.
YeLiuGit
committed
6edaaaf

Commits on Oct 10, 2021

fix feedback 16,25,35,41
YeLiuGit
committed
f95c2c0
Merge pull request #20 from 22716248/fix-feedback-problems
YeLiuGit
authored
918467a
create the new page
YeLiuGit
committed
8e008ac

Commits on Oct 11, 2021

Update Schild Plot
LyulyuSu0330
committed
f19346b
Merge pull request #21 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
2cc92d7

Commits on Oct 13, 2021

Clean DS_Store master
22716248
committed
1cf9682
Update Dose-Response Visualizer
22716248
committed
67991ea
Update Videos and order.
22716248
committed
fcf477f
Update to new nav bars
22716248
committed
5bb1509
Update schild info page #1
22716248
committed
86c797a
Reduce size of graphs
22716248
committed
d3120d8
Update colors for non-ds pages
22716248
committed
b5b5222
Merge pull request #22 from 22716248/11oct_client_feedback
22716248
authored
687c149
Update text style
22716248
committed
1a4886c
Merge pull request #23 from 22716248/11oct_client_feedback
22716248
authored
5247484
update
YeLiuGit
committed
a36ad8e
Question part
YeLiuGit
committed
ba42526

Commits on Oct 14, 2021

update some text
YeLiuGit
committed
d06f785
Update Schild Plot and Schild Plot Property Table, fix issues
LyulyuSu0330
committed
699e1f8
References updated with bullet points
hannahwalkerden
committed
371c083
Text edits as per updates doc page 1
hannahwalkerden
committed
beaf713
Name fix for antagonist 4
hannahwalkerden
committed
475a687
another name fix for antagonist 4 - spacing fix.
hannahwalkerden
committed
727c887
Changed all close buttons to red
hannahwalkerden
committed
2b7bd99
Updated default antagonist values in dose response page
hannahwalkerden
committed
d89b0ae
Grammar fixes
hannahwalkerden
committed
d25a595
feedback of 11th Oct
YeLiuGit
committed
937b854
Merge branch 'master' of https://github.com/22716248/SPIKESfunc.github.io
YeLiuGit
committed
773fb5a

Commits on Oct 15, 2021

Merge branch 'master' into dev_task5_8and9_sprint3
LyulyuSu0330
authored
47e5800
Merge pull request #24 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
52e73c3
Update Inverse Agonist graph
LyulyuSu0330
committed
3628390
Merge pull request #25 from 22716248/dev_task3
LyulyuSu0330
authored
ac89bde
Fix footer coloring on all pages
22716248
committed
f85df44
Update Ideal Line on Schild Plot and Schild Plot Property Table, delete some unneeded codes
LyulyuSu0330
committed
b03b8c4
Merge pull request #26 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
4fc77c6
Delete some unneeded codes
LyulyuSu0330
committed
d9444e0
Merge pull request #27 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
206a5e0
Update Inverse Agonist page, fix issues
LyulyuSu0330
committed
7525a5e
Merge pull request #28 from 22716248/dev_task3
LyulyuSu0330
authored
ed243d9
Delete LICENSE
essynoori
authored
7d3d1ea
LICENSE Updated
essynoori
authored
88cd0e4
Merge pull request #29 from 22716248/add-license-2
essynoori
authored
9e4092d
Fix remaining bugs
22716248
committed
d1d9401
Merge branch 'master' into 15-oct-fixes
22716248
committed
6bae1a6
Fix remaining bugs
22716248
committed
b3d2c07
Merge pull request #30 from 22716248/15-oct-fixes
22716248
authored
37a3ec9
Revert "Merge pull request #30 from 22716248/15-oct-fixes"
22716248
committed
6317476
Client Updates 15-Oct-21
22716248
committed
2f5dee0
link implemented
Stanleym12345
committed
b8408c8
Implemented new tab on click
Stanleym12345
committed
c6023e8
Merge pull request #31 from 22716248/dev_task7
Stanleym12345
authored
1398e19
fix issues in schild plot page in 15th feedback
YeLiuGit
committed
a4d6a61
Merge branch 'master' of https://github.com/22716248/SPIKESfunc.github.io
YeLiuGit
committed
e297ce6
Modify some text
LyulyuSu0330
committed
bb0fd8f
Merge pull request #32 from 22716248/dev_task3
LyulyuSu0330
authored
2fde3f6

Commits on Oct 16, 2021

Commits on Oct 17, 2021

Updated quiz feedback
Stanleym12345
committed
6dbd598
Modify the default Level of Effect
LyulyuSu0330
committed
b1eb14f
Merge pull request #36 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
1fab039
Update README
22716248
committed
24019c1
Merge branch 'master' of https://github.com/22716248/SPIKESfunc.github.io
22716248
committed
32ac0b2
Revert "Merge branch 'master' of https://github.com/22716248/SPIKESfunc.github.io"
22716248
committed
9e4d6d9
Update README.md
22716248
committed
807ca94
Merge pull request #37 from 22716248/dev_task7
Stanleym12345
authored
869b730
Revert "Revert "Merge branch 'master' of https://github.com/22716248/SPIKESfunc.github.io""
22716248
committed
6a5c907
Final Commit
22716248
committed
32264d6

Commits on Oct 18, 2021

Modify the display of the default Level of Effect values
LyulyuSu0330
committed
4bdd0c1
Merge pull request #38 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
aab5362
fix issues in today's feedback
YeLiuGit
committed
75fe8d3
Modify the display of the default Level of Effect for the RESET button
LyulyuSu0330
committed
862c2ad
Merge pull request #39 from 22716248/dev_task5_8and9_sprint3
LyulyuSu0330
authored
cb6cd26
Make REST button function to reset the graph
LyulyuSu0330
committed
a7d79c8
Merge pull request #40 from 22716248/dev_task3
LyulyuSu0330
authored
8b77959

Commits on Jan 1, 2022

Commits on Jan 8, 2022

Task 28
22716248
committed
62bb8ac
Task 39
22716248
committed
96c6a13
Task 40
22716248
committed
4ee3dc4
Task 41
22716248
committed
1c77d6f
Task 42
22716248
committed
b4fc190
Task 43
22716248
committed
810fb41
Task 44
22716248
committed
cc22f9e
Task 45
22716248
committed
b49a428
Task 46
22716248
committed
c63b73f
Task 47
22716248
committed
3c19c97
Task 48
22716248
committed
9beb442
Task 50
22716248
committed
de9cfb7
Task 51
22716248
committed
53f41c3
Task 52
22716248
committed
ef3c953
Task 54
22716248
committed
862faae
Task 55
22716248
committed
d1b43c7
Task 56
22716248
committed
d2257ab
Task 49
22716248
committed
5594fa7
Task 57
22716248
committed
cc22c84
Task 59
22716248
committed
141570d
Task 60
22716248
committed
19c3674
Task 61
22716248
committed
b4b7d6c
Task 62 (Part One)
22716248
committed
6b8df5f
Task 38
22716248
committed
8f18f99
Task 33
22716248
committed
9669a25
Task 34
22716248
committed
2f8f6b4
Task 35 (+ ~38)
22716248
committed
53ff98a
Task 36
22716248
committed
9f528e9
Task 37
22716248
committed
515ee3d
Task 26, 27, 29, 30
22716248
committed
6d2ad58

Commits on Jan 30, 2022

task2: Competitive Antagonist page
essynoori
committed
fc22f04

Commits on Feb 2, 2022

Task 32
22716248
committed
0b30f0d
Task 58 & 62
22716248
committed
a48517b

Commits on Feb 6, 2022

Merge pull request #41 from 22716248/post-18th-changes
22716248
authored
a8e67f7

Commits on Feb 7, 2022

task 2
essynoori
committed
6840beb
other tasks
essynoori
committed
b0b4c44
task 2
essynoori
committed
2f4634f
task 3
essynoori
committed
87115a1
tasks 4-22 done
essynoori
committed
32faa2d

Commits on Feb 8, 2022

task 10
essynoori
committed
f15cf6c
Merge branch 'jan_2022_upgrades'
essynoori
committed
6198d14
peter's feedback
essynoori
committed
bc574ac
Merge branch 'jan_2022_upgrades'
essynoori
committed
afce52e

Commits on Feb 13, 2022