Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,625 Commits 1 Branch 0 Tags
eab11bca428cdc061de065eb27ff877c8400a7a0
Commit Graph

5625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kimth
eab11bca42 Mathjax preprocessor is course-specific 2012-09-09 14:04:52 -04:00
kimth
f9c31f3f42 Add comments 2012-09-09 13:16:22 -04:00
kimth
4881d54a49 Need to escape keywords such as 'in' from MathJax 2012-09-09 13:12:51 -04:00
kimth
2b17fb626b Translate between 6.002x subscript convention and standard Latex 2012-09-09 10:53:32 -04:00
Calen Pennington
b85fefe61a Fixing tests that were failing to due static content directory change 2012-09-07 17:02:00 -04:00
Calen Pennington
b27802b319 Merge pull request #604 from MITx/feature/cale/content-static-dir 
Set the course static file dir to /static directories in course repos if...
 2012-09-07 13:50:21 -07:00
David Ormsbee
d4aa38f86a Merge pull request #645 from MITx/lyla/wording 
quick wording change
 2012-09-07 13:11:04 -07:00
Lyla Fischer
9ad9359d48 quick wording change 2012-09-07 15:57:43 -04:00
Calen Pennington
06aec16f73 Merge pull request #644 from MITx/feature/victor/prettier-errors 
don't show empty list if there is no error data
 2012-09-07 12:13:21 -07:00
Victor Shnayder
bbd57ef79b don't show empty list if there is no error data 2012-09-07 15:10:26 -04:00
Calen Pennington
8500a1b300 Make tests not use syslog when they're running 2012-09-07 14:38:53 -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
Tom Giannattasio
2b5e8a4944 Merge pull request #642 from MITx/bug/kfiedler/ie 
A bunch of bug fixes for IE8 and change in the styling of the login and sign up labels
 2012-09-07 10:45:01 -07: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
Kyle Fiedler
012edbfd40 Fix main navigation and footer links also make text not italic 2012-09-07 11:14:26 -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
b276d8b4b1 Changes as per cpennington's code review 2012-09-07 09:47:13 -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