Code

Ph read updates#22

Code

Open

izabela01 wants to merge 110 commits intoQA-Instructor:masterQA-Instructor/MVC-Skeleton:masterfrom izabela01:PH-read-updatesizabela01/finalProject:PH-read-updatesCopy head branch name to clipboard

+3,250-91

Commits

Commits on May 23, 2020

• edits

  

  =

  authored and

  =

  committed
  bb5511e

  Copy full SHA for bb5511e

• Merge pull request #1 from izabela01/izzyedit

  Show description for f805f25
  izabela01

  authored
  f805f25

  Copy full SHA for f805f25

Commits on May 24, 2020

• homepage

  Balakraa

  committed
  674f4cc

  Copy full SHA for 674f4cc

• homepagecssfile

  Balakraa

  committed
  8bfe567

  Copy full SHA for 8bfe567

• Merge pull request #2 from izabela01/homepage

  Show description for ab2e5ad
  izabela01

  authored
  ab2e5ad

  Copy full SHA for ab2e5ad

Commits on May 25, 2020

• views pages

  Balakraa

  committed
  47fa6cb

  Copy full SHA for 47fa6cb

• Merge pull request #3 from izabela01/views

  Show description for e7aac7e
  izabela01

  authored
  e7aac7e

  Copy full SHA for e7aac7e

• readAllblogfunctionality

  Balakraa

  committed
  5944757

  Copy full SHA for 5944757

• updates for readAllblogs

  Balakraa

  committed
  05d2a56

  Copy full SHA for 05d2a56

Commits on May 26, 2020

• readAll and read blog posts

  Balakraa

  committed
  0ebdf60

  Copy full SHA for 0ebdf60

• connection

  Balakraa

  committed
  c3faa9a

  Copy full SHA for c3faa9a

• Merge pull request #4 from izabela01/readAllblog

  Show description for 5fc7bc5
  izabela01

  authored
  5fc7bc5

  Copy full SHA for 5fc7bc5

• addingform

  

  =

  authored and

  =

  committed
  ce9605d

  Copy full SHA for ce9605d

• changes

  

  =

  authored and

  =

  committed
  fb405fa

  Copy full SHA for fb405fa

Commits on May 27, 2020

• hshsh

  

  =

  authored and

  =

  committed
  a9fd895

  Copy full SHA for a9fd895

• createblogfunction

  Balakraa

  committed
  79d17a2

  Copy full SHA for 79d17a2

• add links, photo and style

  

  Jenny Chan

  committed
  94dd563

  Copy full SHA for 94dd563

• Added validation and functionality to the login and reg from

  Phali18

  authored
  16427a3

  Copy full SHA for 16427a3

• Merge pull request #5 from izabela01/login2

  Show description for 375809d
  izabela01

  authored
  375809d

  Copy full SHA for 375809d

• uploadting

  

  =

  authored and

  =

  committed
  23a5ae5

  Copy full SHA for 23a5ae5

Commits on May 28, 2020

• uploadstuff

  

  =

  authored and

  =

  committed
  30eae57

  Copy full SHA for 30eae57

• second commit

  

  Jenny Chan

  committed
  aa70d2e

  Copy full SHA for aa70d2e

• Merge pull request #6 from izabela01/fixtheaboutuspage

  Show description for ff46fed
  izabela01

  authored
  ff46fed

  Copy full SHA for ff46fed

• blogcontroller

  Balakraa

  committed
  62eff5e

  Copy full SHA for 62eff5e

• Merge branch 'master' into createblog

  izabela01

  authored
  4daedff

  Copy full SHA for 4daedff

• Merge pull request #7 from izabela01/createblog

  Show description for c3e6ad9
  izabela01

  authored
  c3e6ad9

  Copy full SHA for c3e6ad9

• Log in Page

  

  Precieuse Hali

  committed
  9fd3afd

  Copy full SHA for 9fd3afd

• izzy

  

  =

  authored and

  =

  committed
  6d6367f

  Copy full SHA for 6d6367f

• Merge branch 'master' into login

  izabela01

  authored
  dc68a13

  Copy full SHA for dc68a13

• Merge pull request #8 from izabela01/login

  Show description for 3d13c00
  izabela01

  authored
  3d13c00

  Copy full SHA for 3d13c00

Commits on May 30, 2020

• aboutuscontroller and contact us

  

  Jenny Chan

  committed
  6e23048

  Copy full SHA for 6e23048

• changes to the contactus mvc

  

  Jenny Chan

  committed
  60511c3

  Copy full SHA for 60511c3

• Log and Reg Form and other updates

  

  Precieuse Hali

  committed
  1cc57db

  Copy full SHA for 1cc57db

• Merge pull request #9 from izabela01/jennychanges

  Show description for 815d133
  izabela01

  authored
  815d133

  Copy full SHA for 815d133

• Updates

  

  Precieuse Hali

  committed
  2f44862

  Copy full SHA for 2f44862

• Update layout.php

  izabela01

  authored
  cce890c

  Copy full SHA for cce890c

• Merge branch 'master' into Precieuse_updates

  izabela01

  authored
  13cccb9

  Copy full SHA for 13cccb9

• Merge pull request #10 from izabela01/Precieuse_updates

  Show description for e81d0d4
  izabela01

  authored
  e81d0d4

  Copy full SHA for e81d0d4

Commits on May 31, 2020

• contactus: connection, create php updated, model, controller updated

  

  Jenny Chan

  committed
  a960f5b

  Copy full SHA for a960f5b

• linkchanges

  

  =

  authored and

  =

  committed
  86942d5

  Copy full SHA for 86942d5

• new changes

  

  Precieuse Hali

  committed
  1920bd7

  Copy full SHA for 1920bd7

• update & delete

  

  Precieuse Hali

  committed
  2ea6cd1

  Copy full SHA for 2ea6cd1

• updatesStuff

  

  =

  authored and

  =

  committed
  a18c2da

  Copy full SHA for a18c2da

• Merge pull request #11 from izabela01/linkage

  Show description for 302f046
  izabela01

  authored
  302f046

  Copy full SHA for 302f046

• Merge branch 'master' into PH_updates

  izabela01

  authored
  50204a1

  Copy full SHA for 50204a1

• Merge pull request #15 from izabela01/PH_updates

  Show description for 3c684ed
  izabela01

  authored
  3c684ed

  Copy full SHA for 3c684ed

• Merge branch 'master' into jccontactuschange

  izabela01

  authored
  bfc7ba1

  Copy full SHA for bfc7ba1

• Merge pull request #16 from izabela01/jccontactuschange

  Show description for f7e7b34
  izabela01

  authored
  f7e7b34

  Copy full SHA for f7e7b34

• subscribe stuff and home

  Balakraa

  committed
  89a2307

  Copy full SHA for 89a2307

• Merge pull request #18 from izabela01/thesubscribefunction

  Show description for 8c0756e
  izabela01

  authored
  8c0756e

  Copy full SHA for 8c0756e

• further changes made to blog and contactus and tested

  

  Jenny Chan

  committed
  c11abed

  Copy full SHA for c11abed

• Merge pull request #19 from izabela01/groupchanges

  Show description for fb73293
  izabela01

  authored
  fb73293

  Copy full SHA for fb73293

• updates

  

  Precieuse Hali

  committed
  e386c9c

  Copy full SHA for e386c9c

• Precieuse's updates

  

  Precieuse Hali

  committed
  fa6db98

  Copy full SHA for fa6db98

• Updates

  

  Precieuse Hali

  committed
  078f901

  Copy full SHA for 078f901

• Merge branch 'master' into Precieuse-updates

  izabela01

  authored
  e0053d8

  Copy full SHA for e0053d8

• Merge pull request #20 from izabela01/Precieuse-updates

  Show description for b0a9011
  izabela01

  authored
  b0a9011

  Copy full SHA for b0a9011

• create.php updates

  

  Precieuse Hali

  committed
  96fe73e

  Copy full SHA for 96fe73e

• Merge pull request #21 from izabela01/Precieuse-updates

  Show description for c06be92
  izabela01

  authored
  c06be92

  Copy full SHA for c06be92

• read&images

  

  =

  authored and

  =

  committed
  0faff9c

  Copy full SHA for 0faff9c

Commits on Jun 1, 2020

• Merge pull request #22 from izabela01/BLOGJAZZFINALE

  Show description for f0109fd
  izabela01

  authored
  f0109fd

  Copy full SHA for f0109fd

• Background pictures and drop menu added to nav for register and login

  

  Precieuse Hali

  committed
  e313000

  Copy full SHA for e313000

• fixinghome

  

  =

  authored and

  =

  committed
  d278472

  Copy full SHA for d278472

• Merge pull request #23 from izabela01/Precieuse-updates

  Show description for aefa1a5
  izabela01

  authored
  aefa1a5

  Copy full SHA for aefa1a5

• Merge pull request #24 from izabela01/BLOGJAZZFINALE

  Show description for ad79923
  izabela01

  authored
  ad79923

  Copy full SHA for ad79923

• uploadstyled

  

  =

  authored and

  =

  committed
  81bb2a0

  Copy full SHA for 81bb2a0

• Merge pull request #25 from izabela01/iz

  Show description for e6e9fdf
  izabela01

  authored
  e6e9fdf

  Copy full SHA for e6e9fdf

• fixingupload

  

  =

  authored and

  =

  committed
  e2d392f

  Copy full SHA for e2d392f

• Merge pull request #26 from izabela01/iz

  Show description for ba85f12
  izabela01

  authored
  ba85f12

  Copy full SHA for ba85f12

• Updated homepage pictues, titles and descriptions

  

  Precieuse Hali

  committed
  0829772

  Copy full SHA for 0829772

• updatepage

  

  =

  authored and

  =

  committed
  2c08181

  Copy full SHA for 2c08181

• Merge pull request #27 from izabela01/Precieuse-updates

  Show description for 9bf78d6
  izabela01

  authored
  9bf78d6

  Copy full SHA for 9bf78d6

• Merge pull request #28 from izabela01/iz

  Show description for d07bdee
  izabela01

  authored
  d07bdee

  Copy full SHA for d07bdee

• updated about us photos and background and text

  

  Jenny Chan

  committed
  9f6111e

  Copy full SHA for 9f6111e

• Merge pull request #29 from izabela01/isitoveryet

  Show description for 78d14e9
  izabela01

  authored
  78d14e9

  Copy full SHA for 78d14e9

• minor HTML changes to the files

  

  Precieuse Hali

  committed
  99bc12c

  Copy full SHA for 99bc12c

• update

  

  =

  authored and

  =

  committed
  d216a6d

  Copy full SHA for d216a6d

• Merge pull request #30 from izabela01/iz1

  Show description for 9cbe7ce
  izabela01

  authored
  9cbe7ce

  Copy full SHA for 9cbe7ce

• Merge branch 'master' into updates_PH

  izabela01

  authored
  628923a

  Copy full SHA for 628923a

• subscibe maeve

  Maeve1

  committed
  5c4ddf5

  Copy full SHA for 5c4ddf5

• padding added to homepage and styling for read imaages

  

  Precieuse Hali

  committed
  9af5c84

  Copy full SHA for 9af5c84

• Update project.xml

  izabela01

  authored
  e3245ae

  Copy full SHA for e3245ae

• Update index.php

  izabela01

  authored
  4a72b55

  Copy full SHA for 4a72b55

• Update connection.php

  izabela01

  authored
  6f36bb0

  Copy full SHA for 6f36bb0

• Merge pull request #32 from izabela01/subscribemaeve

  Show description for f62622a
  izabela01

  authored
  f62622a

  Copy full SHA for f62622a

• Merge pull request #31 from izabela01/updates_PH

  Show description for 4c480e5
  izabela01

  authored
  4c480e5

  Copy full SHA for 4c480e5

• updated typos

  

  Jenny Chan

  committed
  7a224a1

  Copy full SHA for 7a224a1

Commits on Jun 2, 2020

• Merge pull request #33 from izabela01/updatetypo

  Show description for 3c01fb8
  izabela01

  authored
  3c01fb8

  Copy full SHA for 3c01fb8

• readAllchanges

  

  =

  authored and

  =

  committed
  7817d0e

  Copy full SHA for 7817d0e

• Update create.php

  izabela01

  authored
  3bc33bb

  Copy full SHA for 3bc33bb

• Merge branch 'master' into iz2

  izabela01

  authored
  ad9af7b

  Copy full SHA for ad9af7b

• Merge pull request #34 from izabela01/iz2

  Show description for 97d5e30
  izabela01

  authored
  97d5e30

  Copy full SHA for 97d5e30

• links from home to readAll

  

  =

  authored and

  =

  committed
  8ca4898

  Copy full SHA for 8ca4898

• Merge pull request #35 from izabela01/iz2

  Show description for 081df87
  izabela01

  authored
  081df87

  Copy full SHA for 081df87

• admin to blogger

  

  =

  authored and

  =

  committed
  8c76852

  Copy full SHA for 8c76852

• Merge pull request #36 from izabela01/iz2

  Show description for b19c5e8
  izabela01

  authored
  b19c5e8

  Copy full SHA for b19c5e8

• background cover change for subscribe

  

  Precieuse Hali

  committed
  5aac988

  Copy full SHA for 5aac988

• Reads styling

  

  Precieuse Hali

  committed
  37e271b

  Copy full SHA for 37e271b

• Merge pull request #37 from izabela01/PH-read-updates

  Show description for c4ecfb3
  izabela01

  authored
  c4ecfb3

  Copy full SHA for c4ecfb3

• Merge branch 'master' into Precieuse-branch

  izabela01

  authored
  1a741d1

  Copy full SHA for 1a741d1

• Merge pull request #38 from izabela01/Precieuse-branch

  Show description for 850f125
  izabela01

  authored
  850f125

  Copy full SHA for 850f125

• final changes

  

  Jenny Chan

  committed
  0920bf4

  Copy full SHA for 0920bf4

• Merge pull request #39 from izabela01/thisisdeflasttime

  Show description for e13107e
  izabela01

  authored
  e13107e

  Copy full SHA for e13107e

Commits on Jun 3, 2020

• minor changes

  Maeve1

  committed
  dcf5f17

  Copy full SHA for dcf5f17

• Update aboutus.php

  izabela01

  authored
  29cff2a

  Copy full SHA for 29cff2a

• Merge pull request #40 from izabela01/changes_meee

  Show description for 3de379e
  izabela01

  authored
  3de379e

  Copy full SHA for 3de379e

• minorchanges

  

  =

  authored and

  =

  committed
  1b49b9d

  Copy full SHA for 1b49b9d

• Merge pull request #41 from izabela01/iz3

  Show description for 981e389
  izabela01

  authored
  981e389

  Copy full SHA for 981e389

• PH bio and upload redirect

  

  Precieuse Hali

  committed
  2ca0bd1

  Copy full SHA for 2ca0bd1

• Merge branch 'master' into PH-read-updates

  izabela01

  authored
  ac1ad7f

  Copy full SHA for ac1ad7f