Ibrahim Awwal
7655e9eea0
Ensure that js files are returned in alphabetical order by django-pipeline.
...
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
2012-08-29 22:13:37 -07:00
David Ormsbee
5ae92a19d3
Merge pull request #592 from MITx/feature/arjun/fix_discussions_in_sequences
...
Fix discussions in xmodules
2012-08-29 16:49:04 -07:00
Arjun Singh
5d6bed863a
Fix discussions in xmodules
2012-08-29 16:41:01 -07:00
David Ormsbee
a29991e831
Merge pull request #590 from MITx/feature/arjun/allow_uncaptioned_videos
...
Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution.
2012-08-29 14:01:37 -07:00
Arjun Singh
5c5d11409a
Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution.
2012-08-29 13:58:22 -07:00
jarv
30543d457b
Merge pull request #574 from MITx/feature/arjun/pygraphviz
...
adding pygraphviz
2012-08-29 07:07:22 -07:00
David Ormsbee
50c682e459
Merge pull request #583 from MITx/rocha/master
...
[#35065403 ] Lets video player work if subtitles cannot be loaded
2012-08-29 07:01:58 -07:00
David Ormsbee
b62d953524
Merge pull request #585 from MITx/feature/arjun/sane_save
...
Getting rid of an alert. People don't like alerts.
2012-08-29 07:01:07 -07:00
Arjun Singh
1c176d369b
add margin between checkbox and text
2012-08-29 03:25:08 -07:00
Arjun Singh
ac65e47e21
Getting rid of an alert. People don't like alerts.
2012-08-29 03:15:30 -07:00
Victor Shnayder
cbfc117e8b
a few edits to the xml format docs
2012-08-28 19:53:46 -04:00
Carlos Andrés Rocha
aa063d5729
[ #35065403 ] Lets video player continue to work if subtitles cannot be loaded
2012-08-28 18:18:37 -04:00
David Ormsbee
1a97a1ced0
Merge pull request #582 from MITx/feature/arjun/jsresponse_compilation
...
Disable jsresponse file compilation; done manually for now.
2012-08-28 12:56:37 -07:00
Arjun Singh
6a6b24af79
Disable jsresponse file compilation; done manually for now.
2012-08-28 12:40:49 -07:00
David Ormsbee
88e485315d
Merge pull request #571 from MITx/feature/arjun/contextualize_js_params
...
Contextualizing javascript parameters
2012-08-28 11:07:49 -07:00
David Ormsbee
6255fe5a79
Merge pull request #563 from MITx/kimth/check-grader-html
...
Check grader message has proper XML structure
2012-08-28 10:47:28 -07:00
David Ormsbee
1b3c84ace7
Merge pull request #579 from MITx/sarina/fix_video_title
...
Fix display titles on video pages
2012-08-28 10:39:36 -07:00
kimth
bad24df842
Adjust tests to reflect XML requirement for external grader messages
2012-08-28 13:31:06 -04:00
kimth
09b2f4e55c
Merge branch 'master' into kimth/check-grader-html
2012-08-28 13:16:14 -04:00
David Ormsbee
521521c66b
Merge pull request #559 from MITx/kimth/send-idhash
...
Kimth/send idhash
2012-08-28 10:15:24 -07:00
kimth
fa074277cf
Adjust CodeResponse comments
2012-08-28 12:59:30 -04:00
kimth
4970d9d9f9
Don't need time import, have datetime
2012-08-28 12:55:04 -04:00
kimth
eb48cae887
Consolidate the timestamp uses in CodeResponse
2012-08-28 12:50:48 -04:00
kimth
da07db7c7b
Merge branch 'kimth/send-idhash' of https://github.com/MITx/mitx into kimth/send-idhash
2012-08-28 12:43:34 -04:00
kimth
fb5501855c
Merge master
2012-08-28 12:37:24 -04:00
Calen Pennington
bf6fe1022f
Merge pull request #578 from MITx/feature/cale/django-under-wsgi
...
Add a wsgi file for the lms that loads the modulestores immediately afte...
2012-08-28 09:31:16 -07:00
Sarina Canelake
44cff00f50
Fix display titles on video pages
2012-08-28 12:20:36 -04:00
Calen Pennington
5c17366cd5
Add a wsgi file for the lms that loads the modulestores immediately after the application starts
2012-08-28 12:01:05 -04:00
David Ormsbee
88baeee1fb
Merge pull request #575 from MITx/feature/arjun/fix_js_points
...
Let JS responses return >1 point
2012-08-28 08:32:57 -07:00
David Ormsbee
5ba76a505f
Merge pull request #572 from MITx/feature/arjun/fix_progress_scores_order
...
Fixing order that problem scores are displayed on the progress page
2012-08-28 08:06:32 -07:00
David Ormsbee
231b8c6aa4
Merge pull request #548 from MITx/kimth/limit-queue-dos
...
Kimth/limit queue dos
2012-08-28 08:03:02 -07:00
David Ormsbee
18127cf967
Merge pull request #569 from MITx/feature/rocha/wiki-cheatsheet
...
Refactored wiki cheatsheet code.
2012-08-28 07:59:05 -07:00
Calen Pennington
1fe0ccbf25
Merge pull request #576 from MITx/feature/victor/fix-trailing-location-url
...
Remove trailing slash from ajax url in ModuleSystem
2012-08-28 07:21:47 -07:00
Victor Shnayder
bd2374b6fe
Remove trailing slash from ajax url in ModuleSystem
...
* also add a check for valid location in modx_dispatch
2012-08-28 10:22:08 -04:00
kimth
024b9db10d
Log errors in external grader message parsing
2012-08-28 09:27:27 -04:00
Arjun Singh
947ec74afc
Let JS responses return >1 point
2012-08-28 06:13:41 -07:00
Arjun Singh
ad745aa9bd
pygraphviz requires libgraphviz-dev on ubuntu
2012-08-28 05:53:33 -07:00
Arjun Singh
02e076b725
adding pygraphviz
2012-08-28 05:49:36 -07:00
Arjun Singh
f7ebc4dd23
Load params from json
2012-08-28 00:49:32 -07:00
Arjun Singh
3842c39f8a
Fixing order that problem scores are displayed in
2012-08-27 23:52:27 -07:00
Arjun Singh
8ed9ab44e7
Contextualizing javascript parameters
2012-08-27 23:49:07 -07:00
pmitros
113535dbdf
Merge pull request #570 from MITx/johnhess/unique_students
...
updated admin_dashboard to show count of unique students
2012-08-27 17:35:35 -07:00
kimth
377b09e170
Adjust comments
2012-08-27 20:07:54 -04:00
kimth
82a0d065a7
Use enumerate in loops
2012-08-27 20:04:48 -04:00
kimth
297df37fc0
Drop unnecessary iterator index
2012-08-27 19:59:22 -04:00
kimth
6302283183
Drop unnecessary .keys()
2012-08-27 19:57:46 -04:00
kimth
b4b8f6bc7d
Use with open(file) structure
2012-08-27 19:55:21 -04:00
kimth
2919389d8e
Use os.path.join -- all of them...
2012-08-27 19:53:10 -04:00
kimth
7c5879a1a5
Use os.path.join
2012-08-27 19:50:47 -04:00
kimth
093f080641
Filesubmission input does not reveal queue length
2012-08-27 19:45:39 -04:00
