Commit Graph

930 Commits

Author SHA1 Message Date
Lyla Fischer
9ad9359d48 quick wording change 2012-09-07 15:57:43 -04:00
Victor Shnayder
bbd57ef79b don't show empty list if there is no error data 2012-09-07 15:10:26 -04:00
Kyle Fiedler
bce61cd6e5 Revert "Merge pull request #642 from MITx/bug/kfiedler/ie"
This reverts commit 2b5e8a4944, reversing
changes made to db0549be78.
2012-09-07 14:18:34 -04:00
Kyle Fiedler
4d4e5824cd Change form style for login and signup modals so it is consistant in every browser and we have no usability problems 2012-09-07 13:29:49 -04:00
Kyle Fiedler
aec8cc42dc Add ie fix for wiki 2012-09-07 12:59:30 -04:00
David Ormsbee
db0549be78 Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors
Feature/ibrahim/discussion distinguish instructors
2012-09-07 06:52:15 -07:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position
Feature/victor/save course position
2012-09-07 06:42:48 -07:00
Carlos Andrés Rocha
fc793b94fc Added proctored exams news to the frontpage 2012-09-06 16:33:10 -04:00
Carlos Andrés Rocha
11399d6031 Added protored exam press release page 2012-09-06 16:06:57 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator
Put in calculator in courseware
2012-09-06 13:00:09 -07:00
John Jarvis
587725ee61 more template updates to rename MITx to edX 2012-09-06 15:12:19 -04:00
David Ormsbee
39a773616b Merge pull request #630 from MITx/jarv/update-email
Jarv/update email
2012-09-06 08:10:32 -07:00
John Jarvis
517e6ddeda Contact email address updates 2012-09-06 09:26:52 -04:00
John Jarvis
26ff14172c Email update for module-error template 2012-09-06 09:24:20 -04:00
kimth
d3cd85d81f Merge pull request #627 from MITx/feature/kfiedler/problems
Style changes to problems
2012-09-05 16:06:16 -07:00
Victor Shnayder
c354a120d8 Track accordion state:
- on first visit to courseware, go straight to first section of first chapter
- after, clicking on courseware tab sends you most recent chapter, with a link to the most recent section
  (not to section because that might be confusing, and you might want to do something else (e.g. do homework instead of watch videos)
- Moved course errors into instructor tab.
2012-09-05 16:15:53 -04:00
Calen Pennington
4088ac5428 Isolate manual git reload behind a feature flag 2012-09-05 15:16:40 -04:00
Kyle Fiedler
7c8838a6b2 Added some different style for the select problems 2012-09-05 15:02:50 -04:00
Kyle Fiedler
f785f6f8a1 Added some nicer styles for dynamic math 2012-09-05 14:24:12 -04:00
Kyle Fiedler
8a5e872c8f Removed a bunch of font tags 2012-09-05 14:24:12 -04:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00
Victor Shnayder
f04cd838e5 Integrate csv export of answer distributions with Ike's sweet dashboard 2012-09-05 13:40:29 -04:00
Calen Pennington
2f3f9e5ce9 Merge pull request #624 from MITx/rocha/master
Cleanup of 'About Course' page link to its Courseware
2012-09-05 08:15:33 -07:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade
Upgrade to instructor dashboard
2012-09-05 08:03:55 -07:00
Carlos Andrés Rocha
2d42c91b9d Cleanup of 'About Course' page link to its Courseware 2012-09-05 10:22:36 -04:00
David Ormsbee
44722e86e1 Quick fix for prod issue -- making view courseware link from course about page always work. 2012-09-05 08:20:06 -04:00
Carlos Andrés Rocha
0f1db7969d [#35491529] Small corrections to OpenID provider login page 2012-09-04 20:53:51 -04:00
ichuang
566b9694c4 revert inadvertent change to course.html 2012-09-04 19:47:37 -04:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -04:00
David Ormsbee
999343d641 Merge pull request #618 from MITx/feature/victor/hide-progress-tab
Feature/victor/hide progress tab
2012-09-03 11:40:35 -07:00
Victor Shnayder
f926925ca6 Add a hide_progress_tab course policy flag
- for internal cs50 until we have grade integration set up (only really needed for external version)
2012-09-03 14:12:43 -04:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences
Feature/ibrahim/discussion sort preferences
2012-09-03 10:25:04 -07:00
David Ormsbee
df85ac5762 Merge pull request #616 from MITx/feature/dave/external_forum
Add support for external forum link. Reviewed by Victor.
2012-09-03 07:54:38 -07:00
ichuang
91dcef7fd0 add gitreload to instructor dashboard 2012-09-02 22:41:27 -04:00
David Ormsbee
5194dc3177 Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums 2012-09-02 22:22:01 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
ichuang
7664f910b1 add is_released 2012-09-02 19:04:55 -04:00
David Ormsbee
1a1c5edab4 Completely cosmetic fix to make the indentation clearer. 2012-09-02 16:56:17 -04:00
kimth
3de7c3a322 Merge branch 'master' into kimth/mark-graded 2012-09-01 08:05:29 -04:00
David Ormsbee
877ae91b7f Don't show View Courseware buttons if they don't have access to load the courseware 2012-08-31 21:50:33 -04:00
kimth
56cc237eef Merge branch 'master' into kimth/mark-graded 2012-08-31 20:41:39 -04:00
Arjun Singh
26ca1f5f5b Merge master 2012-08-31 15:13:50 -07:00
kimth
e482a32d27 Accordion distinguishes items to be graded 2012-08-31 18:05:54 -04:00
Kyle Fiedler
3edf1a6a84 Added buttons for both pages to make it even more clear to start class 2012-08-31 15:58:44 -04:00
Kyle Fiedler
7c1cc4ed21 Added hover on course about and more actionable text 2012-08-31 15:58:44 -04:00
Kyle Fiedler
0ff70472c9 Added styles for dashboard to have link around whole class 2012-08-31 15:58:44 -04:00
kimth
05da125aed Merge pull request #600 from MITx/feature/kfiedler/hints
Added styles for problems
2012-08-31 10:30:50 -07:00
Kyle Fiedler
e6f9f8d9b0 Add js to the problem and move around that css and js to accomodate Tonys new HTML Structure 2012-08-31 11:15:06 -04:00
Carlos Andrés Rocha
20e48e6615 Merge pull request #475 from MITx/tmac/openid-provider
OpenID provider implementation
2012-08-31 06:23:03 -07:00
Arjun Singh
7108985325 Adding context to posts in the forum view. 2012-08-31 04:59:12 -07:00