Master - #4

Open

BrendanKennedy wants to merge 286 commits into

kennedy-branchfrom

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

Commits on Mar 7, 2016

Modifying Student/Home Template
BrendanKennedy
committed
a718abe
Modifying Student/Home Template
BrendanKennedy
committed
37f3da8
Modifying Teacher/Home Template
BrendanKennedy
committed
e3055d7
Modifying Teacher/Home Template
BrendanKennedy
committed
df38c11
Edits to sidebar display for student and teacher
BrendanKennedy
committed
8414011
Edits to sidebar display for student and teacher
BrendanKennedy
committed
f344a06
Retrieving admin type (normal/super) from admin/home
BrendanKennedy
committed
69a8722
Retrieving admin type (normal/super) from admin/home
BrendanKennedy
committed
7af32fe
Conditioning display of admin/home for super user (James Hunter )
BrendanKennedy
committed
5253178
Adding functionality for elevated Admin user status, and ManageAdmin page for SuperAdmin user
BrendanKennedy
committed
1a2b72c
Adding functionality for elevated Admin user status, and ManageAdmin page for SuperAdmin user
BrendanKennedy
committed
0c9c318

Commits on Mar 8, 2016

Commits on Mar 9, 2016

Commits on Mar 10, 2016

Small change to AnnotationEditor; Changes to DB pull in Sidebar to accomodate Default setting on a role (i.e. logging in takes you to teacher page, rather than admin page)
BrendanKennedy
committed
46084f7
Debug ChangeRole from sidebar
BrendanKennedy
committed
c417276
Adding page: manage institutions (will be restricted to superadmin user)
BrendanKennedy
committed
e77af9d
UI for adding an institution
BrendanKennedy
committed
3f0f75c
UI for adding an institution -- DEBUG
BrendanKennedy
committed
051d331
UI for adding an institution -- DEBUG
BrendanKennedy
committed
a1cf054
UI for adding an institution -- DEBUG
BrendanKennedy
committed
426599e
UI for adding an institution -- DEBUG
BrendanKennedy
committed
1016287
UI for adding an institution -- DEBUG
BrendanKennedy
committed
ab3e3f6
UI for adding an institution -- DEBUG
BrendanKennedy
committed
41562b1
UI for adding an institution -- DEBUG
BrendanKennedy
committed
982d607
UI for adding an institution -- DEBUG
BrendanKennedy
committed
c1ad356
UI for adding an institution -- DEBUG
BrendanKennedy
committed
7e2cbe0
UI for adding an institution -- DEBUG
BrendanKennedy
committed
9f32fa5
UI for adding an institution -- DEBUG
BrendanKennedy
committed
c56f0ed
UI for adding an institution -- DEBUG
BrendanKennedy
committed
33ab7d1
UI for adding an institution -- DEBUG
BrendanKennedy
committed
9d724ab
UI for adding an institution -- DEBUG
BrendanKennedy
committed
b7307ff
UI for adding an institution -- DEBUG
BrendanKennedy
committed
d435223
UI for adding an institution -- DEBUG
BrendanKennedy
committed
6aefa53
UI for adding an institution -- DEBUG
BrendanKennedy
committed
982f4bf
ViewInstitution page for primary admins and superuser admin
BrendanKennedy
committed
12b2a6e
ViewInstitution page for primary admins and superuser admin -- DEBUG
BrendanKennedy
committed
682dbe2
Adding JS and CSS for bootstrap-editable
BrendanKennedy
committed
0d95e35
Debugging viewInstitution
BrendanKennedy
committed
b626568
Debugging viewInstitution
BrendanKennedy
committed
20a556f
Debugging viewInstitution
BrendanKennedy
committed
47e2d44
Debugging viewInstitution
BrendanKennedy
committed
4eee724

Commits on Mar 11, 2016

Commits on Mar 12, 2016

Commits on Mar 14, 2016

reenabling forced HTTPS connection
kevinWisdom
committed
acf1654
Update Testfindphrase.html
brianramaswami
committed
a095b39
Update findphrase.php
brianramaswami
committed
4a47e11
Update Testfindphrase.html
brianramaswami
committed
90eb475
Update Testfindphrase.php
brianramaswami
committed
dbecc42
adding reset password form and email test form
kevinWisdom
committed
a9d00e0
fixing whoopsie in test file redirects
kevinWisdom
committed
e3046ef

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
fd3bfdf

Commits on Mar 21, 2016

UI update for corpus/search; partial work done on Part of Speech suggestions on search page
BrendanKennedy
committed
682e3fc
Corpus/Search mods, ChangeRole.php DEBUG
BrendanKennedy
committed
601776c
Fixing bug in page logic for admin/archive/courses
BrendanKennedy
committed
60cd3ec
committing worksheetEditor changes
Chris Harvey
committed
b2aadb5
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
Chris Harvey
committed
e877aa4
committing teacher worksheetEditor changes
Chris Harvey
committed
856e382
committing changes to teacher worksheetEditor
Chris Harvey
committed
dd87f1b
committing more changes to worksheetEditor
Chris Harvey
committed
3b6cd54
worksheetEditor
Chris Harvey
committed
56981d2
worksheetEditor
Chris Harvey
committed
6a8d34e
worksheetEditor
Chris Harvey
committed
cf04a7e
worksheetEditor
Chris Harvey
committed
f14d3bc
worksheetEditor
Chris Harvey
committed
ac56fe0
worksheetEditor
Chris Harvey
committed
c2c7e33
worksheetEditor
Chris Harvey
committed
7b9e503
worksheetEditor
Chris Harvey
committed
5bc246e
worksheetEditor
Chris Harvey
committed
a175e07
worksheetEditor
Chris Harvey
committed
977bae8
worksheetEditor
Chris Harvey
committed
51cd4f2
worksheetEditor
Chris Harvey
committed
e1f17c6

Commits on Mar 22, 2016

workshksheetEditor
Chris Harvey
committed
e3eb63c
worksheetEditor
Chris Harvey
committed
ae0e9a6
now working on the student worksheetEditor
Chris Harvey
committed
f554f50
worksheetEditor
Chris Harvey
committed
41eb097
Student worksheetEditor
Chris Harvey
committed
723f591
Student worksheetEditor
Chris Harvey
committed
0ca1c35
Student worksheetEditor
Chris Harvey
committed
0d1fbbd
Student worksheetEditor
Chris Harvey
committed
3f32314
Making student worksheetEditor dynamic
Chris Harvey
committed
e89f4a3

Commits on Mar 23, 2016

Corpus UI changes
BrendanKennedy
committed
d69895e
Corpus UI Changes
BrendanKennedy
committed
d6ef9cb
changed the stupid sidebar colors...
Chris Harvey
committed
311d4bf
changing stupid sidebar colors
Chris Harvey
committed
a951fd6
more colors and stuff
Chris Harvey
committed
18ce370
adjusting sidebar
Chris Harvey
committed
2be1075

Commits on Mar 29, 2016

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

Commits on Mar 30, 2016

Corpus functionality and UI Changes; work remaining: load preview, submit search
BrendanKennedy
committed
1950c4a
worksheetEditor
Chris Harvey
committed
e52aec6
worksheet editor
Chris Harvey
committed
3b9e1dd
worksheet editor
Chris Harvey
committed
af4d0af
worksheet editor
Chris Harvey
committed
f62858a
Minor changes to corpus UI (search)
BrendanKennedy
committed
5441ca5
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
807ac94
adding buttons and more functionality to annotation editor
Menezes
committed
54b3647
making minor changes to worksheet editor
Chris Harvey
committed
d57a391
Merge branch 'AnnoEditor'
Menezes
committed
c1b80a1
Corpus functionality change and tagset.php file
BrendanKennedy
committed
601d344
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
523c599

Commits on Mar 31, 2016

Corpus UI rehaul and organization (partially working)
BrendanKennedy
committed
9c948f0

Commits on Apr 1, 2016

Corpus UI revision: data passing between windows
BrendanKennedy
committed
04f8646
Debug for corpus changes
BrendanKennedy
committed
f723dd8
working sql table for teacher home courses
kevinWisdom
committed
a06bec4
fixing whoopsie
kevinWisdom
committed
b3c75f4
more whoopsies
kevinWisdom
committed
1abc787
one more query whoopsie
kevinWisdom
committed
dcd4696
reformatting
kevinWisdom
committed
12c33b5
slaying the final whoopsie
kevinWisdom
committed
348f11e
debug resultlength
kevinWisdom
committed
b0ae4c3
Corpus UI debug
BrendanKennedy
committed
7ab0fcb
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
a12bfcc
DIE WHOOPSIES
kevinWisdom
committed
4c88ca9
prints table of active courses
kevinWisdom
committed
951c12b
Merge branch 'master' of github.com:ninjamuffin/SeniorDesignGroup5
kevinWisdom
committed
aa8900e
got Student WorksheetEditor lookin snazzy and pretty functional
Menezes
committed
800137a
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5 into Worksheet
Menezes
committed
a61a837
Corpus search functionality => loading data
BrendanKennedy
committed
b872b57
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
f3b82ed

Commits on Apr 4, 2016

moving for work on lab machine
kevinWisdom
committed
c7ec530
Merge branch 'master' of github.com:ninjamuffin/SeniorDesignGroup5
kevinWisdom
committed
2c0293a

Commits on Apr 5, 2016

corpus changes: UI update and loading status; teacher changes: structure
BrendanKennedy
committed
ffe6752
worksheet works no php yet
Menezes
committed
89acc23
Edits to teacher view course
BrendanKennedy
committed
03dd065
expr num formatted and starting work on dynamic table for expression list, needs php now though ASAP
Menezes
committed
219dcab

Commits on Apr 6, 2016

fixing sidebar fail
Menezes
committed
8f47900
Merge branch 'Worksheet'
Menezes
committed
3d159aa
adding Teacher Expression creation
Menezes
committed
7829958
Teacher is ready for PHP goodness
Menezes
committed
28837bc
Changes to Teacher archive/students, /home, and mycourses/
BrendanKennedy
committed
be86ac0
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
c0387c3
Merge branch 'master' into Worksheet
BrendanKennedy
committed
59f2bb4

Commits on Apr 7, 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
8802b10

Commits on Apr 9, 2016

Teacher function: Add worksheet
BrendanKennedy
committed
5d90bc6
Manage Admins UI change
BrendanKennedy
committed
ae67f3e

Commits on Apr 10, 2016

Finishing touches on create and delete worksheets (still needs error catching for worksheet number control w/in DB
BrendanKennedy
committed
3b693c1
cleaning up files, fixing a sidebar link
kevinWisdom
committed
7989d33
fixing view student profile links and POST vars
kevinWisdom
committed
f6792a4
changed post var to correct link
kevinWisdom
committed
604ae34
Adding new expression for teacher worksheeteditor
BrendanKennedy
committed
fdcd0a0
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
969ae08
diagnosing http POST error
kevinWisdom
committed
b815b57
adding http POST fix to teacher/home as well
kevinWisdom
committed
6bf75ec
Editing and submitting expression changes
BrendanKennedy
committed
d0513b5
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
967f95c
ready to test viewstudentprofile page
kevinWisdom
committed
67890da

Commits on Apr 11, 2016

fixing whoopsie in html
kevinWisdom
committed
5198dc5
Final edits to adding and saving expressions
BrendanKennedy
committed
40778e7
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
1d3ed42
Working changes to worksheeteditor
Menezes
committed
78727c5
Kevin work on students, submissions, etc
BrendanKennedy
committed
8e08e21
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
bdd8667

Commits on Apr 13, 2016

Creating a Course for Admin
BrendanKennedy
committed
f33e95c
student MyCourses and Smaller updates to worksheet editor
Menezes
committed
55b4a4e
Data passing and UI revisions to student mycourses/ domain pages
BrendanKennedy
committed
73f792b
adding js to master
Menezes
committed
17c816c

Commits on Apr 14, 2016

These are the changes that were missing from today's user test on the Student Worksheet. They are specifically a working edit button, and Status.
Menezes
committed
4f76280
fixed edits to worksheeteditor
Menezes
committed
811b483
adding worksheet info to teacher worksheet editor
kevinWisdom
committed
9ab8f9a
Edits to student worksheet editor and JS
Menezes
committed
ce1d8ee
Merge branch 'master' of http://www.github.com/ninjamuffin/SeniorDesignGroup5
Menezes
committed
0f6577a

Commits on Apr 16, 2016

testing worksheet info display for teacher in editor
kevinWisdom
committed
80196e2
testing worksheet info display for teacher in editor
kevinWisdom
committed
2c99dbe
still testing worksheet info display
kevinWisdom
committed
3077cc1
Brendan's Friday Code-A-Thon Work
kevinWisdom
committed
22d9662
teacher-side worksheet review. Next step, viewing individual submissions
kevinWisdom
committed
5fd0960
student worksheets javascript finished, ready for real data transmission
Menezes
committed
7463281

Commits on Apr 18, 2016

pushing it up here, boss
kevinWisdom
committed
b02e45b

Commits on Apr 19, 2016

Changes and fixes to admin/archive/
BrendanKennedy
committed
99aa157
committing update worksheet changes
Menezes
committed
90bf38b
once again committing changes to worksheet editor, same as last
Menezes
committed
25d5228
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
bbef0aa
correcting merge
Menezes
committed
127717a
Merge branch 'master' of http://www.github.com/ninjamuffin/SeniorDesignGroup5
Menezes
committed
6731db0
Data load in Annotation Editor (Admin)
BrendanKennedy
committed
0dfc977

Commits on Apr 20, 2016

Changes to admin annotation editor (real data) and sidebar update for sidebar (admin)
BrendanKennedy
committed
0c28c94
Work on student-side worksheet editor and SQL queries
Menezes
committed
adf3b0b
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
f29d87b
Change to viewCourse
BrendanKennedy
committed
76080a7
Revision to Student/Home, student sidebar, and small alterations to alerts in JS/studentdynamicrow
BrendanKennedy
committed
9df2856
Corpus UI color switch
BrendanKennedy
committed
c63a519
Committing changes to UI and removing testing alerts
Menezes
committed
325e53d
Merge branch 'master' of
Menezes
committed
c9e0b66
Other Corpus UI Color switch
BrendanKennedy
committed
ae95d75

Commits on Apr 25, 2016

fixes and login updates for new users; worksheetEditor bug fixes
BrendanKennedy
committed
cef1b20
adding videos of usability
Menezes
committed
a8aeeb1
Updating worksheet for student
Menezes
committed
588aa47
Fixes to student submission
Menezes
committed
703d3b1
Corpus functionality updates
BrendanKennedy
committed
29b3a32

Commits on Apr 26, 2016

Student worksheetEditor changes
BrendanKennedy
committed
6d5ab92
More worksheetEditor student updates
BrendanKennedy
committed
a86faaf
Fix an error with student worksheetEditor (temp)
BrendanKennedy
committed
0e622ba
updating POST vals into viewstudentsubmission
kevinWisdom
committed
f553be2
debug echo for viewsubmission
kevinWisdom
committed
d28cba1
Finished correction writing for student
BrendanKennedy
committed
7b72b5b
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
ff28d96
fixed post vars into view submission and first go at displaying submissions
kevinWisdom
committed
36c049b
Merge branch 'master' of github.com:ninjamuffin/SeniorDesignGroup5
kevinWisdom
committed
1d09a6a
Finished student worksheetEditor (core functionality)
BrendanKennedy
committed
d61e66a
Merge branch 'master' of https://github.com/ninjamuffin/SeniorDesignGroup5
BrendanKennedy
committed
5d90662

Commits on Apr 27, 2016

Commits on May 4, 2016

Fixing corpus and student
BrendanKennedy
committed
378c855