Commit Graph

1359 Commits

Author SHA1 Message Date
Bridger Maxwell
2aca626440 Changed gradebook to be a table. 2012-03-24 15:32:11 -04:00
Calen Pennington
562418504a Merge remote-tracking branch '3rdParty/master' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
d862cb2232 Merge remote-tracking branch 'templates/bridger-grades' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
c04d49385c Merge remote-tracking branch 'static/master' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
98dd48f9da Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
efb96251f8 Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
fc68777119 Fix up the symlinks to point to the right place 2012-03-19 11:10:44 -04:00
Calen Pennington
ceffe4a875 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
a20b01c081 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
4f65c6e67a Remove file in 3rdParty 2012-03-19 11:10:43 -04:00
Calen Pennington
799816a31d Move to subdirectory in preparation for merge 2012-03-19 11:10:43 -04:00
Calen Pennington
70832c7db3 Import from hg 2012-03-19 11:05:25 -04:00
Reda Lemeden
269334a839 Fixed the layout of the graph gradebook 2012-03-15 10:58:39 -04:00
Reda Lemeden
99f4f7324d Fixed the layout of the graph gradebook
--HG--
branch : bridger-grades
2012-03-15 10:57:59 -04:00
Bridger Maxwell
d8b596148c Removed some accidental typing from gradebook.html
--HG--
branch : bridger-grades
2012-03-14 18:09:40 -04:00
Bridger Maxwell
a1f630470f Merged in default branch. Gradebook is now graphs with standard header/footer
--HG--
branch : bridger-grades
2012-03-14 18:03:46 -04:00
Kyle Fiedler
98a4b48e3d Merged css 2012-03-14 17:43:20 -04:00
Kyle Fiedler
d2b8a2c8ad New sass generated css 2012-03-14 17:42:39 -04:00
Kyle Fiedler
b4f15d7c79 Added new styles for pages that are not inside the app or marketing 2012-03-14 17:33:01 -04:00
Kyle Fiedler
e09310e9c9 added fix for error pages and for password reset page 2012-03-14 17:32:05 -04:00
Kyle Fiedler
3966a06888 Make warnings show in IE 9 2012-03-13 10:00:03 -04:00
Kyle Fiedler
2fc4477e44 Merged heads 2012-03-13 09:22:13 -04:00
Kyle Fiedler
731ca112bc Added some fixes to bugs in the updates, refactored the cream color to a sass variable and highlighted latest update 2012-03-13 09:21:34 -04:00
Piotr Mitros
da8665204b Merged in gradebook 2012-03-12 18:52:04 -04:00
Bridger Maxwell
3be5423b07 Small refactor on the grades. Also made the gradebook render a graph for each student
--HG--
branch : bridger-grades
2012-03-12 18:10:37 -04:00
Bridger Maxwell
5b46112911 Small refactor on the grades. Also made the gradebook render a graph for each student
--HG--
branch : bridger-grades
2012-03-12 18:10:16 -04:00
Reda Lemeden
ec4c1786cf Fixed askbot layout bug 2012-03-12 17:33:51 -04:00
Reda Lemeden
d3c4c2eeeb Fixed id conflict in Askbot 2012-03-12 17:16:26 -04:00
Reda Lemeden
3654c0339e Restyled the gradebook
--HG--
branch : rl-gradebook
2012-03-12 16:46:10 -04:00
Piotr Mitros
12c3c4cc2d Extract complete user info into a json file 2012-03-11 20:26:57 -04:00
Ernie Park
4f4f3a75b5 merge 2012-03-11 17:45:56 -04:00
Piotr Mitros
7812b4a2c4 Added pi 2012-03-11 16:50:14 -04:00
Piotr Mitros
909aec4379 Better error messages 2012-03-10 22:45:00 -05:00
Piotr Mitros
e8c7e5521b Better error message 2012-03-10 22:42:32 -05:00
Piotr Mitros
e2995a9e60 Basic gradebook 2012-03-10 22:31:58 -05:00
Piotr Mitros
837b9c9075 Basic gradebook 2012-03-10 22:31:40 -05:00
Piotr Mitros
af815abe3b Beginning refactoring grades out of profile view for use in gradebook 2012-03-10 21:17:22 -05:00
Piotr Mitros
2461669e6c Merged in functionality to show grades by student 2012-03-10 20:41:25 -05:00
Piotr Mitros
f1ad393f18 Course admins can now access student grades by going to profile/[userid]
--HG--
branch : visible-grades
2012-03-10 20:34:13 -05:00
Piotr Mitros
c7c71c9458 Merge
--HG--
branch : visible-grades
2012-03-10 20:17:13 -05:00
Piotr Mitros
cde9ab284b Need to merge
--HG--
branch : visible-grades
2012-03-10 20:17:04 -05:00
Piotr Mitros
a2c4010b8f Removed caching for dev machines 2012-03-10 20:13:03 -05:00
Piotr Mitros
a8c2c3c5b4 More helpers 2012-03-10 19:38:51 -05:00
Piotr Mitros
6561cac242 User counts 2012-03-10 17:41:54 -05:00
Piotr Mitros
52dd6361e7 Helper methods for managing users 2012-03-10 17:33:20 -05:00
Piotr Mitros
a995ef0f0f Instructors can see grades -- syncing machines -- nonworking code
--HG--
branch : visible-grades
2012-03-10 17:11:49 -05:00
Piotr Mitros
547bf5d52e Added book viewer 2012-03-10 17:10:49 -05:00
Piotr Mitros
103b764299 Textbook remembers last page 2012-03-09 20:50:20 -05:00
Piotr Mitros
c8f261efc7 Work-around for not finding XML for sections in section files. Note: Requires data push 2012-03-09 20:20:02 -05:00
Piotr Mitros
c1d80eb369 Feedback form includes email and browser 2012-03-09 17:37:47 -05:00