Master#4

Open

BrendanKennedy wants to merge 286 commits intokennedy-branchfrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Mar 7, 2016

Commits on Mar 8, 2016

Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full)
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Teacher/MyCourses/ Page Template; Teacher/MyCourses Data Pull (full) --DEBUG
BrendanKennedy
committed
Admin superuser: sidebar changes, and small admin/home changes
BrendanKennedy
committed
Teacher Archive UI switch and structure dev
BrendanKennedy
committed
Teacher Archive: view student, view worksheet
BrendanKennedy
committed
Teacher Archive Structure changes and nav links
BrendanKennedy
committed
Debuggin Teacher Archive Changes to structure and ViewStudent
BrendanKennedy
committed
Fixing Auth. for Teacher/Archive/Course pages
BrendanKennedy
committed
Fixing Proportions and links for teacher/archive pages
BrendanKennedy
committed
Coloring and button positioning
BrendanKennedy
committed

Commits on Mar 9, 2016

Commits on Mar 10, 2016

Commits on Mar 11, 2016

Commits on Mar 15, 2016

Commits on Mar 16, 2016

Commits on Mar 18, 2016

UI Changes for Admin/Archive and others; ChangePassword UI and js functionality; corpus/search major UI changes
BrendanKennedy
committed

Commits on Mar 21, 2016

UI update for corpus/search; partial work done on Part of Speech suggestions on search page
BrendanKennedy
committed
Corpus/Search mods, ChangeRole.php DEBUG
BrendanKennedy
committed
Fixing bug in page logic for admin/archive/courses
BrendanKennedy
committed
committing worksheetEditor changes
Chris Harvey
committed
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
Chris Harvey
committed
committing teacher worksheetEditor changes
Chris Harvey
committed
committing changes to teacher worksheetEditor
Chris Harvey
committed
committing more changes to worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed

Commits on Mar 22, 2016

workshksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
now working on the student worksheetEditor
Chris Harvey
committed
worksheetEditor
Chris Harvey
committed
Student worksheetEditor
Chris Harvey
committed
Student worksheetEditor
Chris Harvey
committed
Student worksheetEditor
Chris Harvey
committed
Student worksheetEditor
Chris Harvey
committed
Making student worksheetEditor dynamic
Chris Harvey
committed

Commits on Mar 23, 2016

Corpus UI changes
BrendanKennedy
committed
Corpus UI Changes
BrendanKennedy
committed
changed the stupid sidebar colors...
Chris Harvey
committed
changing stupid sidebar colors
Chris Harvey
committed
more colors and stuff
Chris Harvey
committed
adjusting sidebar
Chris Harvey
committed

Commits on Mar 29, 2016

remove reference to bad email file
kevinWisdom
committed
progress on text selection and fixing flatUI css call
Menezes
committed
now alerts with string from selection
Menezes
committed

Commits on Mar 30, 2016

Corpus functionality and UI Changes; work remaining: load preview, submit search
BrendanKennedy
committed
worksheetEditor
Chris Harvey
committed
worksheet editor
Chris Harvey
committed
worksheet editor
Chris Harvey
committed
worksheet editor
Chris Harvey
committed
Minor changes to corpus UI (search)
BrendanKennedy
committed
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
adding buttons and more functionality to annotation editor
Menezes
committed
making minor changes to worksheet editor
Chris Harvey
committed
Merge branch 'AnnoEditor'
Menezes
committed
Corpus functionality change and tagset.php file
BrendanKennedy
committed
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed

Commits on Mar 31, 2016

Corpus UI rehaul and organization (partially working)
BrendanKennedy
committed

Commits on Apr 1, 2016

Commits on Apr 4, 2016

Commits on Apr 5, 2016

Commits on Apr 8, 2016

AnnotationEditor updates for Admin: data passing with real data, and UI adjustment; small changes on teacher pages
BrendanKennedy
committed

Commits on Apr 9, 2016

Commits on Apr 10, 2016

Commits on Apr 13, 2016

Commits on Apr 14, 2016

Commits on Apr 18, 2016

pushing it up here, boss
kevinWisdom
committed

Commits on Apr 20, 2016

Commits on Apr 25, 2016

fixes and login updates for new users; worksheetEditor bug fixes
BrendanKennedy
committed
adding videos of usability
Menezes
committed
Updating worksheet for student
Menezes
committed
Fixes to student submission
Menezes
committed
Corpus functionality updates
BrendanKennedy
committed

Commits on Apr 26, 2016

Commits on May 4, 2016

Fixing corpus and student
BrendanKennedy
committed