Commit Graph

58450 Commits

Author SHA1 Message Date
cjt
6f55bd55e2 update to schematic tool 2012-02-04 10:26:47 -05:00
Piotr Mitros
f894353f4e No cache of courseware. This caused lots of issues 2012-02-03 23:01:26 -05:00
Piotr Mitros
a9f94da8ea Error in conversion from !=None to simpler format 2012-02-03 22:52:31 -05:00
Piotr Mitros
6332fd78dd Fixed CSRF issue most likely introduced by move from Django templates 2012-02-03 21:23:05 -05:00
Piotr Mitros
a58ac22686 Copyright info 2012-02-03 18:58:21 -05:00
Piotr Mitros
6304feefd6 Calculator changes for Anant 2012-02-03 18:48:44 -05:00
Piotr Mitros
1140dba4c4 privacy 2012-02-03 18:42:44 -05:00
Piotr Mitros
685775d5fc merge 2012-02-03 18:37:03 -05:00
Piotr Mitros
893dde182a Legal, calculator 2012-02-03 18:36:45 -05:00
Bridger Maxwell
81e1a8dc12 Changed case discrepency between course.xml and profile page 2012-02-03 17:34:11 -05:00
Bridger Maxwell
2e91a1d7c3 Removed debug code that put in a score for midterm and final. 2012-02-03 17:21:31 -05:00
Bridger Maxwell
baac1eb8ce Merge 2012-02-03 17:18:25 -05:00
Bridger Maxwell
96149cd639 Merge 2012-02-03 17:17:43 -05:00
Bridger Maxwell
eb31a163fa Added percentages to sections in profile 2012-02-03 17:17:04 -05:00
Bridger Maxwell
0d699f2895 Added links from profile to courseware. Updated names in urls to accomodate. 2012-02-03 17:05:34 -05:00
Bridger Maxwell
9c94ef9c68 Removed course overview graph, (course detail graph still remains). 2012-02-03 17:04:59 -05:00
Bridger Maxwell
4992be76c6 Added links from profile page back to courseware. This is also the last commit with the course overview graph enabled. It is about to be removed. 2012-02-03 17:03:24 -05:00
Piotr Mitros
9e906fc354 Help page works 2012-02-03 16:42:07 -05:00
Piotr Mitros
bd9cc58e37 Killed parallel 2012-02-03 16:17:14 -05:00
Bridger Maxwell
d5aa7532de Fixed graph bug that threw error if div didn't exist. 2012-02-03 14:53:53 -05:00
Piotr Mitros
6e7e00c8d8 merge 2012-02-03 14:07:39 -05:00
Piotr Mitros
a9e3922047 HTML module looks in html directory in data 2012-02-03 14:07:23 -05:00
David Ormsbee
eed5d95dde lower karma threshold for file/image uploads to 1 2012-02-03 14:00:06 -05:00
Piotr Mitros
22f4004ee9 HTML no longer has answers 2012-02-03 10:27:02 -05:00
Ernie Park
40a6c55b5c merge 2012-02-02 18:51:39 -05:00
Ernie Park
34568e5bb0 update navigation and templates to include a class for nav so we can select currently active nav item 2012-02-02 18:50:58 -05:00
Bridger Maxwell
de585e2ccd Merged with profile changes again. Last time was backwards 2012-02-02 18:08:51 -05:00
Bridger Maxwell
4be8c2358a Merged with profile changes again. Last time was backwards 2012-02-02 18:08:20 -05:00
Bridger Maxwell
ff6f7a5287 Changed flot to min library. IMPORTANT: UPDATE 3RD PARTY
--HG--
branch : profiledev
2012-02-02 17:57:00 -05:00
Bridger Maxwell
5bc671e40f Added section totals to profile page
--HG--
branch : profiledev
2012-02-02 17:53:34 -05:00
Bridger Maxwell
9b38e8c548 Merged profile graphs into default.
--HG--
branch : profiledev
2012-02-02 17:52:43 -05:00
Bridger Maxwell
7d0e92d93e Merged in profile graphs to default
--HG--
branch : profiledev
2012-02-02 17:50:09 -05:00
David Ormsbee
b7fe049f04 merged and updated urls to point to student and not auth 2012-02-02 17:37:49 -05:00
Bridger Maxwell
621ab8ff94 Moved graph code to a seperate file
--HG--
branch : profiledev
2012-02-02 17:33:13 -05:00
Reda Lemeden
4cd963dc33 Merged with head 2012-02-02 17:23:45 -05:00
Reda Lemeden
8b1b716818 Redesigned the answer list. Answer controls (edit, delete, etc) still missing. 2012-02-02 17:23:12 -05:00
David Ormsbee
154d75e1e8 disable gravatar, alternative login, email editing options from askbot 2012-02-02 17:21:10 -05:00
Kyle Fiedler
17bcbb9401 Resoled css conflict 2012-02-02 17:10:29 -05:00
Kyle Fiedler
fce2e614ab Compiled css 2012-02-02 17:09:43 -05:00
Kyle Fiedler
bdde1599c4 More edits to the profile page 2012-02-02 17:09:19 -05:00
Ernie Park
66bec4b895 merge
--HG--
rename : auth/views.py => student/views.py
2012-02-02 16:38:17 -05:00
Kyle Fiedler
1b0f03d722 Continued style on profile page 2012-02-02 16:32:46 -05:00
Bridger Maxwell
25f17eac21 Graph tweaks.
--HG--
branch : profiledev
2012-02-02 16:08:58 -05:00
Bridger Maxwell
1c3f067736 Graph tweaks.
--HG--
branch : profiledev
2012-02-02 16:08:45 -05:00
David Ormsbee
1b4aa2dcd9 update askbot settings to lower upvote karma requirement to 1 and disable social sharing 2012-02-02 16:02:14 -05:00
Bridger Maxwell
a715068076 Labels and total percentage working for grade overview graph
--HG--
branch : profiledev
2012-02-02 15:16:47 -05:00
Bridger Maxwell
00b1bad38f Got grade overview graph drawing
--HG--
branch : profiledev
2012-02-02 14:32:44 -05:00
Bridger Maxwell
67d46c0792 Got grade overview graph drawing
--HG--
branch : profiledev
2012-02-02 14:32:33 -05:00
David Ormsbee
7e1d23308c yet another rename, from auth -> user -> student
--HG--
rename : user/__init__.py => student/__init__.py
rename : user/migrations/0001_initial.py => student/migrations/0001_initial.py
rename : user/migrations/0002_text_to_varchar_and_indexes.py => student/migrations/0002_text_to_varchar_and_indexes.py
rename : user/migrations/__init__.py => student/migrations/__init__.py
rename : user/models.py => student/models.py
rename : user/tests.py => student/tests.py
rename : user/views.py => student/views.py
2012-02-02 14:31:42 -05:00
Reda Lemeden
a8a6d9742e Merge with head 2012-02-02 14:31:11 -05:00