Commit Graph

5603 Commits

Author SHA1 Message Date
Kyle Fiedler
bd199ef5c3 Added opencourseware box on course about page 2012-09-07 09:49:43 -04: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
David Ormsbee
e4c261ba37 Merge pull request #637 from MITx/kimth/cktsim-in-schematic
cktsim-in-schematic
2012-09-07 06:30:45 -07:00
David Ormsbee
5c2bab1ac5 Merge pull request #641 from MITx/hotfixes/rocha
Added proctored exams news to the frontpage
2012-09-07 06:28:04 -07:00
David Ormsbee
0b4ef7e5d9 Merge pull request #640 from MITx/feature/kfiedler/autofocus
Added outofocus for sign in and log in forms
2012-09-07 06:27:24 -07:00
Victor Shnayder
1e94ff19f3 remove debuging log message 2012-09-07 08:20:59 -04:00
Victor Shnayder
6017aa698b add ENABLE_DISCUSSION_SERVICE: "False" to cms config 2012-09-06 17:28:12 -04:00
Victor Shnayder
8b7390c966 Turn of discussion service in test env
- add a check for the feature flag before trying to save user info to the service
2012-09-06 17:11:21 -04:00
Victor Shnayder
048dea0eff make test course loading deterministic by using course_id 2012-09-06 16:38:33 -04:00
Carlos Andrés Rocha
fc793b94fc Added proctored exams news to the frontpage 2012-09-06 16:33:10 -04:00
Kyle Fiedler
d923be0786 Added outofocus for sign in and log in forms 2012-09-06 16:29:51 -04:00
Victor Shnayder
02ddeed72a better error handling in index view 2012-09-06 16:24:59 -04:00
David Ormsbee
877a30eefa Merge pull request #639 from MITx/rocha/master
Added protored exam press release page
2012-09-06 13:09:54 -07: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
Calen Pennington
c49bcf5709 Merge pull request #638 from MITx/feature/cale/progress-handle-extra-credit
Feature/cale/progress handle extra credit
2012-09-06 12:54:52 -07:00
David Ormsbee
1acb7dc24f Add a short delay to calculator input focus so it doesn't jump to the bottom of the screen when you open it. 2012-09-06 15:52:31 -04:00
Calen Pennington
8030fdce80 Fix test and assertion reversal in progress test 2012-09-06 15:47:45 -04:00
Calen Pennington
5f261ec335 Test that values are clamped between 0 and 100% for progresses 2012-09-06 15:47:12 -04:00
kimth
f4f2efc30d Merge pull request #636 from MITx/feature/cale/progress-handle-extra-credit
Feature/cale/progress handle extra credit
2012-09-06 12:24:11 -07:00
Calen Pennington
5ce516a3a0 Clamp progress to be greater than zero 2012-09-06 15:23:19 -04:00
Calen Pennington
a1b3b6ba3c Merge pull request #635 from MITx/jarv/edX-template-updates
more template updates to rename MITx to edX
2012-09-06 12:19:41 -07:00
Calen Pennington
14eb160eea Just return a null progress if something goes wrong when retrieving capa_module progress (and log the error) 2012-09-06 15:18:59 -04:00
Calen Pennington
897a87646c Make progress handle extra credit by capping at 100%, and handle malformed progress stuff by ignoring any changes 2012-09-06 15:16:24 -04:00
kimth
032869744b cktsim-in-schematic 2012-09-06 15:12:52 -04:00
John Jarvis
587725ee61 more template updates to rename MITx to edX 2012-09-06 15:12:19 -04:00
David Ormsbee
7eeedd4751 Merge pull request #634 from MITx/feature/victor/per-run-info
Feature/victor/per run info
2012-09-06 11:45:45 -07:00
Victor Shnayder
d4c0516c8b another attempt to see what's broken on jenkins 2012-09-06 14:41:09 -04:00
Victor Shnayder
6ab80fb4a8 debug msg to diagnose jenkins 2012-09-06 12:06:51 -04:00
Victor Shnayder
550889ea30 fix typo 2012-09-06 11:42:19 -04:00
Victor Shnayder
a1286b1c7d add some docs for new policy folder locations, per-course about and info pages 2012-09-06 11:39:43 -04:00
David Ormsbee
978ff5b4e9 Merge pull request #633 from MITx/feature/ichuang/histogram-try-catch
put try-catch around histogram coffeescript code
2012-09-06 08:34:13 -07:00
Calen Pennington
34f2309c15 Merge pull request #631 from MITx/feature/victor/url_name-duplication
fix for multiple url_name hashing bug
2012-09-06 08:32:14 -07:00
David Ormsbee
3a40a55c76 Merge pull request #620 from MITx/jarv/add-local-logging
Jarv/add local logging
2012-09-06 08:25:17 -07:00
ichuang
56951e9961 put try-catch around histogram coffeescript code 2012-09-06 11:18:00 -04:00
Victor Shnayder
f44898677a Allow course info and course about pages to vary per-run
* looks in about/{course.url_name}/ first, then in about/
* same for info/
2012-09-06 11:17:55 -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
Tom Giannattasio
efd8a77bf1 Merge pull request #632 from MITx/feature/kfiedler/problems
Fix list item issues in problems
2012-09-06 07:42:39 -07:00
Kyle Fiedler
3ab85d470a Fix before element 2012-09-06 10:39:19 -04:00
Victor Shnayder
91d0fe8a1b extend test to cover first-chapter state 2012-09-06 10:25:56 -04:00
Kyle Fiedler
54f621a329 Added fix for pre as a first child in a list item 2012-09-06 10:21:34 -04:00
Kyle Fiedler
54caa320ef fixed list items in html in the courseware 2012-09-06 10:21:33 -04:00
Victor Shnayder
739dd8e3f9 fix for multiple url_name hashing bug 2012-09-06 10:12:48 -04: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
7c34b02e3b use a NoFollow redirect check 2012-09-05 17:25:16 -04:00
Victor Shnayder
5738a8cdbb update tests 2012-09-05 16:15:53 -04: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
Victor Shnayder
4481adb041 Track current chapter.
- courseware index view now redirects to most recent chapter, or first
- simplify the view a bit
2012-09-05 16:15:53 -04:00