Skip to content

FInal Web Build #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
JonathanPeterCole wants to merge 56 commits into
base: master
Choose a base branch
from
Open

FInal Web Build #18

JonathanPeterCole wants to merge 56 commits into from

Conversation

@JonathanPeterCole
Copy link
Contributor

@JonathanPeterCole JonathanPeterCole commented Jul 22, 2016

No description provided.

JonathanPeterCole and others added 30 commits July 14, 2016 15:18
@JonathanPeterCole
Installed twig-view, and twig by mistake
5b3fbb4
@JonathanPeterCole
Merge remote-tracking branch 'refs/remotes/origin/develop' into fe-ba…
31f6eb2 
…sic-templating
@JonathanPeterCole
Merge remote-tracking branch 'refs/remotes/origin/develop' into fe-ba…
5e2c5de 
…sic-templating
@JonathanPeterCole
Merge pull request #7 from JonathanPeterCole/develop
b385ce6 
Merge of latest changes
@emdunx
added buttons to html files: sample and sample form to link pages tog…
81e27d8 
…ether
@emdunx
added update button
06184c9
@JonathanPeterCole
Merge pull request #9 from JonathanPeterCole/develop
9e3d372 
Added SMS support from the develop branch.
@emdunx
added inputs on 'sample_form', and altered dashboard formatting
0bfc862
@emdunx
changed action.php - now can add to database
607bddb
@JonathanPeterCole
Merge pull request #10 from JonathanPeterCole/develop
dcf6266 
Working version of SMS
@JonathanPeterCole
Merge pull request #11 from JonathanPeterCole/develop
7fa51f6 
Completed the door unlock story.
@emdunx
fixed f5 bug
365e03d
@Toylore
Merge pull request #12 from JonathanPeterCole/fe-basic-templating
f3f0041 
Merge to master
@Toylore
Updated a few files to make style slightly more consistent.
42b5394
@JonathanPeterCole
The tables are now linked with foreign keys.
d2590a2
@emdunx
added CSS to colour code table rows from database
63337e2
@JonathanPeterCole
Added door checks and updated the file directory.
bbe2cf2 
SMS messages will now only be sent when the door status was previously
closed. The web service is now also accessed by the cabinets using
ip-address/API instead of ip-address/events.
@JonathanPeterCole
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
1d930e1
@Toylore
Merged some stuff and broke it. Hopefully fixed now.
9895397
@emdunx
Merge branch 'develop' of https://github.com/JonathanPeterCole/PADs i…
061278d 
…nto develop
@emdunx
added last update time to server
5a5b1e3
@Toylore
Indented some HTML and made the table smaller. Probably broke some st…
59dac3e 
…uff.
@emdunx
Merge branch 'fe-basic-templating' of https://github.com/JonathanPete…
ac5501f 
…rCole/PADs into fe-basic-templating

Conflicts:
	web/templates/sample.html
@emdunx
tidied up code
bc8f10a
@emdunx
created css style sheet
6c93c7a
@JonathanPeterCole
Updated to support new post data.
da36ac9
@JonathanPeterCole
Readability improvements and added alarm_event.
ccbd285 
Alarm_event.php currently relies on a Fleet table which does not exist,
so it is not used.
@JonathanPeterCole
Fixed a a small mistake that caused an error.
b92eaf6 
Let's forget that commit ever happened.
@Toylore
Added FLEET table to tables_create.php
2b6fd47
@JonathanPeterCole
Added SMS alerts for Fleet.
95c2aa2
JonathanPeterCole and others added 26 commits July 21, 2016 15:22
@JonathanPeterCole
Merge branch 'fe-basic-templating' of https://github.com/JonathanPete…
8152188 
…rCole/PADs into fe-basic-templating
@JonathanPeterCole
Updated status_dash.php for the updated database.
4059c63
@JonathanPeterCole
Merge remote-tracking branch 'refs/remotes/origin/fe-basic-templating…
e4d65eb 
…' into develop
@JonathanPeterCole
Added an API reference and improved error messages.
5d3094f
@JonathanPeterCole
Updated database designs with the new Fleet table.
e6d09b8
@JonathanPeterCole
Backup of current data.
3dfb851
@JonathanPeterCole
Switched to binary.
bb90b87 
Doesn't work 😐
@emdunx
Fixed create form, (changed SQL query in action.php to add rows to tb…
63e1557 
…l_status.)

Changed formatting in stylesheet.css
@emdunx
Merge branch 'fe-basic-templating' of https://github.com/JonathanPete…
4891a06 
…rCole/PADs into fe-basic-templating
@JonathanPeterCole
It works holy sh*t 😲
f074b7b
@emdunx
Tidied up code
1026fa5
@JonathanPeterCole
Not only does it work, it works well 👌
b17620e 
Also includes sample data. Noice.
@JonathanPeterCole
Updated status_dash for the new database design.
da95935
@JonathanPeterCole
Merge remote-tracking branch 'refs/remotes/origin/fe-basic-templating…
5c458e6 
…' into switch-to-bool
@emdunx
improved css formatting + fixed create form bug
cabe4fa
@emdunx
fixed cut off time problem
1d73cf2
@emdunx
Merge branch 'fe-basic-templating' of https://github.com/JonathanPete…
f7a36e6 
…rCole/PADs into fe-basic-templating
@JonathanPeterCole
Merge remote-tracking branch 'refs/remotes/origin/fe-basic-templating…
8ac1c2b 
…' into switch-to-bool

# Conflicts:
#	web/index.php - Resolved
@JonathanPeterCole
Updated the front end to work with the new database.
14a606e
@JonathanPeterCole
Fixed Door Status showing as 'False' instead of 'Closed'.
3670bb4
@JonathanPeterCole
Added the temperature column to the front end.
e599f3a
@JonathanPeterCole
Removed the status fields from the Add Defibrilator form.
2c9acf9 
The fields need to be updated if we plan to include the ability to set
the initial status from this page.
@JonathanPeterCole
Updates some messages.
678c2bb
@JonathanPeterCole
Removed out of date procedures in the sample database.
a59735d
@JonathanPeterCole
Updated text messages.
520f8b1
@JonathanPeterCole
Final web changes
046db85
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@JonathanPeterCole @emdunx @Toylore