I was playing for a year and a half (toughening up my fingers and learning chords and strumming and finger picking patterns) before I joined this site.

These are the lessons that helped me, and I believe will assist you.

In the lessons titled "Guitar Fundamentals 2", Section 3 is called Scales and Chords and Triads.
It starts very basic but then if you play along, you begin to see the pattern that the scales create. With a little practice each day you begin to remember them just like you remember the shapes of the chords.
I'm learning where to find the notes and scales and chords in a few different places along the neck.
Finish Section 3 and see if it doesn't help you out.

Good Luck