Skip to content
Jump to bottom

Merge pull request #1 from web/master #12

Open
wants to merge 180 commits into
base: master
Choose a base branch
from
Open

Merge pull request #1 from web/master #12

wants to merge 180 commits into from
+13,168 −8,382

Commits on Jul 18, 2019

  1. deleted advanced materials

    @aa7401
    aa7401 committed Jul 18, 2019
    905eb3c

  2. added extra labs

    @aa7401
    aa7401 committed Jul 18, 2019
    01885aa

  3. updated the readme file

    @aa7401
    aa7401 committed Jul 18, 2019
    fd0ca40

Commits on Sep 1, 2019

  1. added class information

    @aa7401
    aa7401 committed Sep 1, 2019
    82e8c7a

  2. fixed section numbers

    @aa7401
    aa7401 committed Sep 1, 2019
    0ce0cf0

Commits on Sep 11, 2019

  1. added VS Code setup

    @aa7401
    aa7401 committed Sep 11, 2019
    11daaa2

  2. added section numbers

    @aa7401
    aa7401 committed Sep 11, 2019
    f00e947

  3. renamed labs

    @aa7401
    aa7401 committed Sep 11, 2019
    8b244a5

  4. renamed section

    @aa7401
    aa7401 committed Sep 11, 2019
    b9020ed

Commits on Sep 12, 2019

  1. renamed lab directory

    @aa7401
    aa7401 committed Sep 12, 2019
    2fb1a85

  2. added lab directory for topic 1

    @aa7401
    aa7401 committed Sep 12, 2019
    9cfe29d

  3. code cleanup

    @aa7401
    aa7401 committed Sep 12, 2019
    383609d

  4. fixed push issue

    @aa7401
    aa7401 committed Sep 12, 2019
    c20f866

  5. explanantion of push and pull

    @aa7401
    aa7401 committed Sep 12, 2019
    5d258ac

  6. added http explanation

    @aa7401
    aa7401 committed Sep 12, 2019
    c96feef

  7. fixed hyperlink

    @aa7401
    aa7401 committed Sep 12, 2019
    ae5ed3e

  8. added hyperlinks

    @aa7401
    aa7401 committed Sep 12, 2019
    6925dda

  9. renamed labs

    @aa7401
    aa7401 committed Sep 12, 2019
    c33b19b

  10. added standard upstream note

    @aa7401
    aa7401 committed Sep 12, 2019
    7693186

  11. updated link to Koa

    @aa7401
    aa7401 committed Sep 12, 2019
    dba43ff

  12. updated resource links

    @aa7401
    aa7401 committed Sep 12, 2019
    0b5cf57

  13. moved a paragraph

    @aa7401
    aa7401 committed Sep 12, 2019
    7849d67

  14. re-numbered sections

    @aa7401
    aa7401 committed Sep 12, 2019
    9733cdd

  15. added callback examples

    @aa7401
    aa7401 committed Sep 12, 2019
    783876c

  16. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Sep 12, 2019
    fa4c0bd

  17. aded json section to lab

    @aa7401
    aa7401 committed Sep 12, 2019
    1c92266

  18. added material

    @aa7401
    aa7401 committed Sep 12, 2019
    deb39f3

  19. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Sep 12, 2019
    922bb3d

Commits on Sep 13, 2019

  1. added base code for tests

    @aa7401
    aa7401 committed Sep 13, 2019
    433c905

  2. added base code for todo

    @aa7401
    aa7401 committed Sep 13, 2019
    34b43ed

  3. basic todo working

    @aa7401
    aa7401 committed Sep 13, 2019
    0737165

  4. explained unit testing

    @aa7401
    aa7401 committed Sep 13, 2019
    4a0202e

  5. completed tdd exercise

    @aa7401
    aa7401 committed Sep 13, 2019
    e2825ba

  6. finished unit testing lab

    @aa7401
    aa7401 committed Sep 13, 2019
    32d2b60

  7. reverted module code

    @aa7401
    aa7401 committed Sep 13, 2019
    3be9420

  8. removed code comment

    @aa7401
    aa7401 committed Sep 13, 2019
    934a8b2

  9. created todo app with database

    @aa7401
    aa7401 committed Sep 13, 2019
    d2a6180

Commits on Sep 14, 2019

  1. basic code for db

    @aa7401
    aa7401 committed Sep 14, 2019
    c5794e0

  2. finished database exercise

    @aa7401
    aa7401 committed Sep 14, 2019
    8708e52

  3. added comment

    @aa7401
    aa7401 committed Sep 14, 2019
    c665bb2

  4. added comments

    @aa7401
    aa7401 committed Sep 14, 2019
    e886bde

  5. added supertest files

    @aa7401
    aa7401 committed Sep 14, 2019
    67e18b1

Commits on Sep 15, 2019

  1. fixed issue handling errors from async functions

    @aa7401
    aa7401 committed Sep 15, 2019
    f156f90

  2. added notes on matchers

    @aa7401
    aa7401 committed Sep 15, 2019
    8941501

  3. replaced a matcher

    @aa7401
    aa7401 committed Sep 15, 2019
    5d305c3

  4. hidden the old setup lab

    @aa7401
    aa7401 committed Sep 15, 2019
    fa6f71c

  5. emphasise directory notes

    @aa7401
    aa7401 committed Sep 15, 2019
    69ae6c8

  6. removed formatting

    @aa7401
    aa7401 committed Sep 15, 2019
    f354d16

  7. fixed link error

    @aa7401
    aa7401 committed Sep 15, 2019
    53cc5e5

  8. bug fix

    @aa7401
    aa7401 committed Sep 15, 2019
    4e8c733

  9. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Sep 15, 2019
    5269f65

  10. disabled some linter rules

    @aa7401
    aa7401 committed Sep 15, 2019
    6a5cf97

  11. disabled max-lines rule

    @aa7401
    aa7401 committed Sep 15, 2019
    49921f1

  12. fixed pull request

    @aa7401
    aa7401 committed Sep 15, 2019
    c197be6

  13. To be consistent with 04 CSS3, Section 1.1

    @harjaus
    harjaus committed Sep 15, 2019
    0fdcf8f

  14. views/ --> html/

    @harjaus
    harjaus committed Sep 15, 2019
    172af05

  15. Merge pull request web#2 from harjaus/master 

    Changed /views to /html to be consistent with MD File 04.
    @harjaus
    harjaus committed Sep 15, 2019
    32957f6

  16. Formatting

    @harjaus
    harjaus committed Sep 15, 2019
    c16cb7f

  17. Merge pull request web#3 from harjaus/master 

    Formatting improvements.
    @harjaus
    harjaus committed Sep 15, 2019
    cac9d69

  18. Removed Nested Callbacks because they appear in 06.

    @harjaus
    harjaus committed Sep 15, 2019
    b5c8cad

  19. Merge pull request web#4 from harjaus/master 

    Removed Nested Callbacks because they appear in 06.
    @harjaus
    harjaus committed Sep 15, 2019
    9bae150

Commits on Sep 16, 2019

  1. Made consistent with Worksheet 06

    @harjaus
    harjaus committed Sep 16, 2019
    fe907e5

  2. Merge pull request web#5 from harjaus/master 

    Made consistent with Worksheet 06
    @harjaus
    harjaus committed Sep 16, 2019
    14c7e33

  3. clarified some tasks

    @aa7401
    aa7401 committed Sep 16, 2019
    820e07a

  4. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Sep 16, 2019
    2b7df97

  5. added notes on changing shell

    @aa7401
    aa7401 committed Sep 16, 2019
    616b78e

Commits on Sep 17, 2019

  1. Test

    @handley7
    handley7 committed Sep 17, 2019
    f694407

  2. 1.3.2

    @nathwan2
    nathwan2 committed Sep 17, 2019
    fae1963

Commits on Sep 18, 2019

  1. added notes on running nodejs on Windows

    @aa7401
    aa7401 committed Sep 18, 2019
    ffe6e8c

Commits on Sep 20, 2019

  1. Fixed inconsistency with test suite

    @harjaus
    harjaus committed Sep 20, 2019
    ddb628d

  2. Added missing file for sheet 06.

    @harjaus
    harjaus committed Sep 20, 2019
    660bcf1

  3. Merge pull request web#6 from harjaus/master 

    Fixed inconsistency with test suite
    @aa7401
    aa7401 committed Sep 20, 2019
    0d5f324

  4. Changed sheet to specify which folder

    @harjaus
    harjaus committed Sep 20, 2019
    73dfc6a

  5. Added missing files

    @harjaus
    harjaus committed Sep 20, 2019
    3e5f457

  6. Merge pull request web#7 from harjaus/master 

    Fixed issue with missing files from 06 Code Quality.
    @harjaus
    harjaus committed Sep 20, 2019
    e486943

Commits on Sep 21, 2019

  1. Minor spelling mistake

    @harjaus
    harjaus committed Sep 21, 2019
    d2c7f53

  2. Merge pull request web#8 from harjaus/master 

    Minor spelling fix
    @harjaus
    harjaus committed Sep 21, 2019
    745c463

  3. Merge remote-tracking branch 'upstream/master'

    @handley7
    handley7 committed Sep 21, 2019
    beb81da

  4. Update 01 Setup.md for Windows 10 WSL setup

    @handley7
    handley7 committed Sep 21, 2019
    9a87865

  5. Update 01 Setup.md

    @handley7
    handley7 committed Sep 21, 2019
    36d7da9

  6. Merge branch 'master' of https://github.coventry.ac.uk/handley7/found… 

    …ation
    @handley7
    handley7 committed Sep 21, 2019
    a8c2edb

  7. Update images for WSL tutorial in 01 Setup.md

    @handley7
    handley7 committed Sep 21, 2019
    c6dd19d

  8. Update 01 Setup.md

    @handley7
    handley7 committed Sep 21, 2019
    08c89b7

  9. Merge pull request web#9 from handley7/master 

    Editing Lab Notes - Ubuntu Installation for Windows 10
    @aa7401
    aa7401 committed Sep 21, 2019
    de5af6f

Commits on Sep 22, 2019

  1. improved clarity of task

    @aa7401
    aa7401 committed Sep 22, 2019
    2c5dcaa

  2. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Sep 22, 2019
    da834a3

Commits on Sep 24, 2019

  1. updated extensions list

    @aa7401
    aa7401 committed Sep 24, 2019
    1c19206

  2. update

    @nathwan2
    nathwan2 committed Sep 24, 2019
    83c9e2d

  3. update

    @nathwan2
    nathwan2 committed Sep 24, 2019
    847df4b

  4. minor spelling amendment

    @charle44
    charle44 committed Sep 24, 2019
    2456d1c

  5. Merge pull request web#10 from charle44/patch-1 

    minor spelling amendment
    @harjaus
    harjaus committed Sep 24, 2019
    afd9df0

Commits on Sep 26, 2019

  1. updated name of extension

    @aa7401
    aa7401 committed Sep 26, 2019
    c78e77d

  2. added notes on debugging the test explorer

    @aa7401
    aa7401 committed Sep 26, 2019
    fd6f91d

  3. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Sep 26, 2019
    1054bd3

  4. added extra task to lab

    @aa7401
    aa7401 committed Sep 26, 2019
    b9fed75

Commits on Sep 27, 2019

  1. test

    @nathwan2
    nathwan2 committed Sep 27, 2019
    6f04e7d

Commits on Sep 28, 2019

  1. shortcut 

    shortcut for reloading the page
    @charle44
    charle44 committed Sep 28, 2019
    ddc5667

Commits on Oct 1, 2019

  1. 03_html/05_semantic change & video word change 

    changed the path to the semantic directory and also an audio and video word change
    @charle44
    charle44 committed Oct 1, 2019
    c5881dd

Commits on Oct 2, 2019

  1. updated the lab list and deleted old notes

    @aa7401
    aa7401 committed Oct 2, 2019
    44e093f

  2. Merge pull request web#13 from charle44/patch-2 

    shortcut
    @aa7401
    aa7401 committed Oct 2, 2019
    7d0bc7d

  3. Merge pull request #15 from charle44/patch-4 

    03_html/05_semantic change & video word change
    @aa7401
    aa7401 committed Oct 2, 2019
    888e37d

Commits on Oct 3, 2019

  1. added async examples

    @aa7401
    aa7401 committed Oct 3, 2019
    f143f1b

  2. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 3, 2019
    2f87891

Commits on Oct 6, 2019

  1. Fixed error in code under 4.4 Static Members

    @aa6164
    aa6164 committed Oct 6, 2019
    f24e9df

Commits on Oct 7, 2019

  1. added login project

    @aa7401
    aa7401 committed Oct 7, 2019
    c593b3e

  2. updated lab sheet

    @aa7401
    aa7401 committed Oct 7, 2019
    53fc0b6

Commits on Oct 8, 2019

  1. fixed missing file

    @aa7401
    aa7401 committed Oct 8, 2019
    c1649a0

  2. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 8, 2019
    7cb6b16

  3. fixed issue

    @aa7401
    aa7401 committed Oct 8, 2019
    15b4db6

  4. fixed module name

    @aa7401
    aa7401 committed Oct 8, 2019
    6340dc7

  5. another bug fixed

    @aa7401
    aa7401 committed Oct 8, 2019
    8449b58

  6. push

    @nathwan2
    nathwan2 committed Oct 8, 2019
    cae34b6

  7. oo

    @nathwan2
    nathwan2 committed Oct 8, 2019
    ece3438

  8. added open file debug option

    @aa7401
    aa7401 committed Oct 8, 2019
    357f86f

  9. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 8, 2019
    006c796

Commits on Oct 9, 2019

  1. replaced api used

    @aa7401
    aa7401 committed Oct 9, 2019
    21c2366

  2. added a currencies data file

    @aa7401
    aa7401 committed Oct 9, 2019
    393a730

  3. fixed all urls

    @aa7401
    aa7401 committed Oct 9, 2019
    ca82a75

  4. added async functions file

    @aa7401
    aa7401 committed Oct 9, 2019
    7564ca2

  5. deleted old readme file

    @aa7401
    aa7401 committed Oct 9, 2019
    053389a

  6. started mocking file system

    @aa7401
    aa7401 committed Oct 9, 2019
    d4ddbc7

  7. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 9, 2019
    64be017

Commits on Oct 11, 2019

  1. fixed text input issue

    @aa7401
    aa7401 committed Oct 11, 2019
    87c1585

  2. Merge pull request #1 from web/master 

    Updating foundation
    @kenyonJ
    kenyonJ committed Oct 11, 2019
    c8fcbf0

Commits on Oct 12, 2019

  1. Updated Git Installation 

    Lab did not explain how to install git on different OS.

Now covers how to install git on MacOS using either Xcode or HomeBrew.
Covers apt command for Ubuntu and reminds not to install any GUI tools.
    @aa7401
    aa7401 committed Oct 12, 2019
    111e500

  2. Cleaned Up Files 

    There were some files in the root of the codee quality lab.

These have now been put in a directory called linting.
    @aa7401
    aa7401 committed Oct 12, 2019
    23eca50

  3. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 12, 2019
    a43b857

  4. Updated ESLint and JSDoc Exercise 

    The exercise was unclear.

Exercise is now based on the todo files which have been updated
    @aa7401
    aa7401 committed Oct 12, 2019
    9b23edb

  5. Fixed Callback Code 

    There was an issue with the existing code (logical error)

Code has been rewritten to allow for multiple input prompts.
    @aa7401
    aa7401 committed Oct 12, 2019
    d1c17c9

  6. Updated Lab Sheet 

    The nested callback exercise did not match the updated code

Lab exercise has now been revised to match
    @aa7401
    aa7401 committed Oct 12, 2019
    9629baa

  7. Completed Lab Sheet 

    Minor amendments were needed
    @aa7401
    aa7401 committed Oct 12, 2019
    c0aa4ed

  8. grammatical change 

    changed the wording of a specific section
    @charle44
    charle44 committed Oct 12, 2019
    63ea40e

Commits on Oct 15, 2019

  1. Updated the Nested Callback Lab 

    The lab code was fixed in a previous commit however the exercise still referred to
the old code.

The lab notes have been updated to reflect the new, working, script.
    @aa7401
    aa7401 committed Oct 15, 2019
    54e75d8

  2. Added Promise Working Example 

    The existing promises lab does not work correctly.

Added a simple working example that can be used to fix the issues with
the lab exercise.
    @aa7401
    aa7401 committed Oct 15, 2019
    c3cc178

  3. bug fix

    @aa7401
    aa7401 committed Oct 15, 2019
    a736124

  4. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 15, 2019
    cc11aad

  5. Fixed Promise Bug 

    Promises were not resolving in order due to missing returns on resolve.

This has now been fixed.
    @aa7401
    aa7401 committed Oct 15, 2019
    6d5c6a9

Commits on Oct 18, 2019

  1. Modified the Modularity Exercise 

    There was some confusion over the impelmentation
and the existing import didn't work.

The new version resolves the import issue
and clarifies the task requirements
    @aa7401
    aa7401 committed Oct 18, 2019
    edceed4

  2. Fixed Some Spelling Errors

    @aa7401
    aa7401 committed Oct 18, 2019
    dd1f05f

Commits on Oct 20, 2019

  1. Added More Exercises 

    Some of the sections didn't have an exercise.

Now all sections include one or more tasks to be complete.
    @aa7401
    aa7401 committed Oct 20, 2019
    96e8e4b

  2. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 20, 2019
    bbcc9ab

Commits on Oct 22, 2019

  1. Removed Module Call 

    The todo script would not run because there was a conflict between the imported object and the local array.
The object call was removed and added to the lab activity and the comment on the array clarified.
    @aa7401
    aa7401 committed Oct 22, 2019
    b385bb0

  2. Added Code to Callback 

    Currently there is no message to state that the server is running.
Added a message to the callback function to display the message with port number.
    @aa7401
    aa7401 committed Oct 22, 2019
    93cc681

  3. added instructions for Win10 Users

    @aa7401
    aa7401 committed Oct 22, 2019
    648ead1

  4. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Oct 22, 2019
    c035290

Commits on Oct 23, 2019

  1. Added Component Notes

    @aa7401
    aa7401 committed Oct 23, 2019
    ba038cb

  2. fixed typo in 3.3 

    amended type "is is" in 3.3
    @charle44
    charle44 committed Oct 23, 2019
    8b1f989

  3. typo ammendment 

    changed "vsriable" to "variable"
    @charle44
    charle44 committed Oct 23, 2019
    0e7ec41

Commits on Oct 25, 2019

  1. Added Notes on Installing the Browser Preview

    @aa7401
    aa7401 committed Oct 25, 2019
    210ae92

  2. resolved Issue #25 

    resolved Issue #25, promses.js now does the same as asyncFunctions.js and nestedCallbacks.js
    @bordasb
    bordasb committed Oct 25, 2019
    48310c0

Commits on Oct 26, 2019

  1. Merge pull request #27 from charle44/patch-7 

    typo ammendment
    @aa7401
    aa7401 committed Oct 26, 2019
    fbf8869

  2. Merge pull request #26 from charle44/patch-6 

    fixed typo in 3.3
    @aa7401
    aa7401 committed Oct 26, 2019
    59e3e7f

  3. Merge pull request #18 from charle44/patch-5 

    grammatical change
    @aa7401
    aa7401 committed Oct 26, 2019
    e12506b

  4. Merge pull request #19 from nathwan2/master 

    s
    @aa7401
    aa7401 committed Oct 26, 2019
    afa4426

  5. Merge pull request #21 from kenyonJ/master 

    Merge pull request #1 from web/master
    @aa7401
    aa7401 committed Oct 26, 2019
    fd08afd

Commits on Nov 2, 2019

  1. Added Notes on Script Explorer

    @aa7401
    aa7401 committed Nov 2, 2019
    a4ffe9c

  2. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Nov 2, 2019
    c46de19

Commits on Nov 4, 2019

  1. #28 mock-fs example created 

    I couldn't make mock-fs work properly, so the unit tests using it don't run. The web server also fails to receive the POST request with the image upload.
    @bordasb
    bordasb committed Nov 4, 2019
    ce57bbc

Commits on Nov 5, 2019

  1. Merge pull request #1 from web/master 

    .
    @ngussed
    ngussed committed Nov 5, 2019
    a4b7917

  2. added database and can chnage name of pictures with what file its

    ngussed committed Nov 5, 2019
    7e1bc04

Commits on Nov 8, 2019

  1. fixes done to file_system unit test

    Balazs Laszlo Bordas committed Nov 8, 2019
    b0d1c68

  2. trying to fix file_system unit test

    Balazs Laszlo Bordas committed Nov 8, 2019
    7cf77b6

  3. Removed Merge Conflict 

    One of the modules retained a merge conflict.

This has now been removed.
    @aa7401
    aa7401 committed Nov 8, 2019
    5b4ac41

  4. Replaced Module 

    Async functions can't use the standard readline module.

This has been replaced with the sync version.
    @aa7401
    aa7401 committed Nov 8, 2019
    c4d788d

  5. Merge branch 'master' of https://github.coventry.ac.uk/web/foundation

    @aa7401
    aa7401 committed Nov 8, 2019
    a98fdec

  6. Now we throw specific errors, not generic

    @harjaus
    harjaus committed Nov 8, 2019
    54a02fa

  7. Added dependency

    @harjaus
    harjaus committed Nov 8, 2019
    a69a9c8

  8. We no longer done.fail() on everything, we expect no errors on catch

    @harjaus
    harjaus committed Nov 8, 2019
    bc98b02

  9. trying to fix mockfs exercise

    bordasb committed Nov 8, 2019
    6e14868

  10. Now throws correct error on file not existing

    @harjaus
    harjaus committed Nov 8, 2019
    5e5e55d

  11. Reading mocking works

    @harjaus
    harjaus committed Nov 8, 2019
    39db18b

  12. Now reads as binary

    @harjaus
    harjaus committed Nov 8, 2019
    8102229

  13. Now writes synchronously, fixes bug

    @harjaus
    harjaus committed Nov 8, 2019
    0b9b9e1

  14. Now can mock writing to filesystem

    @harjaus
    harjaus committed Nov 8, 2019
    39518ac

  15. Removed unnecessary files

    @harjaus
    harjaus committed Nov 8, 2019
    213478a

  16. Merge branch 'fixingMockFS'

    @harjaus
    harjaus committed Nov 8, 2019
    0789e71

Commits on Nov 11, 2019

  1. minor typo and semantic fixes

    @bordasb
    bordasb committed Nov 11, 2019
    d4fc244

Commits on Nov 12, 2019

  1. corrected the bracket notation example

    @bordasb
    bordasb committed Nov 12, 2019
    2cf6567

  2. Merge branch 'master' of https://github.coventry.ac.uk/ngussed/dynami… 

    …c-websites
    ngussed committed Nov 12, 2019
    9a7dcc7

  3. h

    ngussed committed Nov 12, 2019
    d899994