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

2041 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Victor Shnayder
91d0fe8a1b extend test to cover first-chapter state 2012-09-06 10:25:56 -04:00
Kyle Fiedler
54caa320ef fixed list items in html in the courseware 2012-09-06 10:21:33 -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
Victor Shnayder
d0fcbdda8c convert answers to strings to make sure they're hashable 2012-09-05 16:00:04 -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
a8cd4633c0 remove debugging statements 2012-09-05 13:46:15 -04:00
Victor Shnayder
f04cd838e5 Integrate csv export of answer distributions with Ike's sweet dashboard 2012-09-05 13:40:29 -04:00
Victor Shnayder
c89031b077 Export of answer distibutions to csv 
- go through all students, all of their problems, save count for each answer
- return csv
- url exists, but no links to it yet
- Will need to integrate with Ike's new dashboard code
 2012-09-05 13:40:29 -04:00