Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
Vik Paruchuri
d5865e70b8 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 2013-02-22 10:21:34 -05:00
Brian Wilson
d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 15:38:28 -05:00
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Diana Huang
3a8b7156a0 Merge branch 'master' into diana/click-tracking 2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0 Address code review feedback 
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
 2013-02-21 10:17:08 -05:00
Brian Wilson
731f4abd8a fix bug with nav to a page, and add pdfviewer.css. 2013-02-21 03:15:08 -05:00
Arthur Barrett
cc7f791078 parse xml for annotationinput 2013-02-20 19:19:17 -05:00
John Jarvis
342220f0f4 js syntax 2013-02-20 18:50:16 -05:00
Brian Wilson
50cae69945 define pdfviewer.js, and use from static_pdfbook.html 2013-02-20 18:37:17 -05:00
John Jarvis
4b93ef491b errors for login and reg 2013-02-20 18:23:41 -05:00
Vik Paruchuri
9bc8dbd7ca Fix location strings, re-order checkboxes 2013-02-20 18:04:25 -05:00
Diana Huang
3fe6a74e76 Merge pull request #1528 from MITx/press/international-press-release 
add press release: edX expands internationally
 2013-02-20 14:55:58 -08:00
Victor Shnayder
84eaec3666 add press release: edX expands internationally 2013-02-20 17:50:23 -05:00
Arthur Barrett
a982ebbb03 Refactored rendered method and added span ids. 2013-02-20 17:33:11 -05:00
Vik Paruchuri
d5ba5457dc Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:49:59 -05:00
Vik Paruchuri
ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:43:04 -05:00
Vik Paruchuri
111ef30f05 Render to string fix, display ETA message when student submits 2013-02-20 16:30:44 -05:00
Arthur Barrett
af2bfa9d4e Saving work in progress on v2 with capa template for annotation problem. 2013-02-20 16:30:19 -05:00
Victor Shnayder
d2e97d2389 Merge pull request #1518 from MITx/press/international 
Press/international
 2013-02-20 12:07:16 -08:00
Diana Huang
ea13659249 Merge branch 'master' into diana/click-tracking 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
 2013-02-20 14:02:04 -05:00
Vik Paruchuri
59e3647692 Add in support for getting and displaying ETA 2013-02-20 13:28:37 -05:00
Diana Huang
13d4cfa4d4 Merge branch 'master' into diana/click-tracking 2013-02-20 11:40:14 -05:00
Diana Huang
b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-20 11:20:10 -05:00
Arthur Barrett
2f68cba24d merged from master 2013-02-20 11:07:46 -05:00
Brian Talbot
f2abc3c3e5 lms - revised classes and styling mechanics for login/register forms and added necessary screen-reader mixin for other visually hidden text in those pages 2013-02-20 09:15:27 -05:00
Victor Shnayder
2981f532c1 Integrate Brian T's front-page changes, add epfl and delft 
- removed duplicate logos.
- cover images are still in the 200-350 KB range.
 2013-02-19 22:04:20 -05:00
Victor Shnayder
105cbd3bfc Merge remote-tracking branch 'origin/style/btalbot/homepage-newxunis' into press/international 2013-02-19 21:52:06 -05:00
John Jarvis
2a6fde9db2 javascript to redirect to the course being accessed 2013-02-19 20:42:38 -05:00
John Jarvis
fd36c555a6 Renaming login url for modal-less login 2013-02-19 19:36:32 -05:00
Brian Talbot
074f866b58 resolving some light footer display issues 2013-02-19 17:32:17 -05:00
Brian Talbot
b2839514f2 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new 2013-02-19 17:22:57 -05:00
Brian Talbot
1f247ceb0c edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets 2013-02-19 16:40:21 -05:00
Vik Paruchuri
72d069825d Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	lms/templates/instructor/staff_grading.html
 2013-02-19 15:21:09 -05:00
Arthur Barrett
34cc112cfb Saving work in progress on annotations v2 with classification problems. 2013-02-19 14:18:56 -05:00
Victor Shnayder
45c80abecf Add initial images for ANU, McGill, Rice, Toronto. 
Still waiting on transparent logos.
 2013-02-19 14:04:17 -05:00
John Jarvis
dabcb51746 resolving merge conflicts 2013-02-19 12:43:06 -05:00
Diana Huang
f4addddf42 Merge pull request #1484 from MITx/feature/vik/improve-oe-ui 
Feature/vik/improve oe ui
 2013-02-19 07:27:29 -08:00
Victor Shnayder
c37238d592 Initial landing pages for ANU, McGill, Rice, Toronto 2013-02-19 08:22:09 -05:00
Arthur Barrett
72d9c1d7d2 Saving work-in-progress of guided classification exercise. 2013-02-18 19:02:54 -05:00
Diana Huang
3e23b9e1f2 Merge pull request #1480 from MITx/diana/staff-grading-flagging 
Flag submissions from staff grading view
 2013-02-15 13:08:16 -08:00
David Ormsbee
87784d1cff Make sure the submissions history only shows up with problems. 2013-02-15 14:36:10 -05:00
Arthur Barrett
24f519e32f Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon. 2013-02-15 13:46:38 -05:00
Diana Huang
7b11843086 Merge branch 'master' into diana/click-tracking 2013-02-15 12:53:21 -05:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02:00
David Ormsbee
8f17e6ae9e First pass at implementing problem history. 2013-02-15 01:30:14 -05:00
Brian Wilson
0d3b566dd8 finish piping URL through to pdf.js 2013-02-14 15:47:53 -05:00
Victor Shnayder
4f8757600a merge 2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596 Foldit integration. 
- ops view for the desktop app to talk to
  - xmodule that talks to the foldit model and displays the student's state
  - grading tweak to make grade updates from an external service work:
    - Add an always_recalculate_grades property to XModuleDescriptor.
 2013-02-14 12:45:06 -05:00
Valera Rozuvan
d55b818bb2 Updated YouTube JS API file to the new one. 2013-02-14 11:25:36 +02:00
Valera Rozuvan
92dc8859a3 YouTube HTML5 mode is used by default. Fix typo in video alpha template. 2013-02-14 11:22:14 +02:00