Repository navigation

FInal Web Build - #18

Open

JonathanPeterCole wants to merge 56 commits into

SoftwareCornwall:masterfrom

JonathanPeterCole:switch-to-bool

Commits on Jul 14, 2016

Installed twig-view, and twig by mistake
JonathanPeterCole
committed
5b3fbb4

Commits on Jul 19, 2016

Merge remote-tracking branch 'refs/remotes/origin/develop' into fe-basic-templating
JonathanPeterCole
committed
31f6eb2
Merge remote-tracking branch 'refs/remotes/origin/develop' into fe-basic-templating
JonathanPeterCole
committed
5e2c5de
Merge pull request #7 from JonathanPeterCole/develop
JonathanPeterCole
authored
b385ce6
added buttons to html files: sample and sample form to link pages together
emdunx
committed
81e27d8
added update button
emdunx
committed
06184c9
Merge pull request #9 from JonathanPeterCole/develop
JonathanPeterCole
authored
9e3d372
added inputs on 'sample_form', and altered dashboard formatting
emdunx
committed
0bfc862
changed action.php - now can add to database
emdunx
committed
607bddb

Commits on Jul 20, 2016

Merge pull request #10 from JonathanPeterCole/develop
JonathanPeterCole
authored
dcf6266
Merge pull request #11 from JonathanPeterCole/develop
JonathanPeterCole
authored
7fa51f6
fixed f5 bug
emdunx
committed
365e03d
Merge pull request #12 from JonathanPeterCole/fe-basic-templating
Toylore
authored
f3f0041
Updated a few files to make style slightly more consistent.
Toylore
committed
42b5394
The tables are now linked with foreign keys.
JonathanPeterCole
committed
d2590a2
added CSS to colour code table rows from database
emdunx
committed
63337e2
Added door checks and updated the file directory.
JonathanPeterCole
committed
bbe2cf2
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
JonathanPeterCole
committed
1d930e1
Merged some stuff and broke it. Hopefully fixed now.
Toylore
committed
9895397
Merge branch 'develop' of https://github.com/JonathanPeterCole/PADs into develop
emdunx
committed
061278d
added last update time to server
emdunx
committed
5a5b1e3

Commits on Jul 21, 2016

Commits on Jul 22, 2016

It works holy sh*t 😲
JonathanPeterCole
committed
f074b7b
Tidied up code
emdunx
committed
1026fa5
Not only does it work, it works well 👌
JonathanPeterCole
committed
b17620e
Updated status_dash for the new database design.
JonathanPeterCole
committed
da95935
Merge remote-tracking branch 'refs/remotes/origin/fe-basic-templating' into switch-to-bool
JonathanPeterCole
committed
5c458e6
improved css formatting + fixed create form bug
emdunx
committed
cabe4fa
fixed cut off time problem
emdunx
committed
1d73cf2
Merge branch 'fe-basic-templating' of https://github.com/JonathanPeterCole/PADs into fe-basic-templating
emdunx
committed
f7a36e6
Merge remote-tracking branch 'refs/remotes/origin/fe-basic-templating' into switch-to-bool
JonathanPeterCole
committed
8ac1c2b
Updated the front end to work with the new database.
JonathanPeterCole
committed
14a606e
Fixed Door Status showing as 'False' instead of 'Closed'.
JonathanPeterCole
committed
3670bb4
Added the temperature column to the front end.
JonathanPeterCole
committed
e599f3a
Removed the status fields from the Add Defibrilator form.
JonathanPeterCole
committed
2c9acf9
Updates some messages.
JonathanPeterCole
committed
678c2bb
Removed out of date procedures in the sample database.
JonathanPeterCole
committed
a59735d
Updated text messages.
JonathanPeterCole
committed
520f8b1
Final web changes
JonathanPeterCole
committed
046db85