Vik Paruchuri
c24ba23e54
Move self assessment templates
2013-03-01 13:45:55 -05:00
Vik Paruchuri
b0c2559de8
Switch around template locations
2013-03-01 13:43:01 -05:00
Vik Paruchuri
b3d0abbd05
Start to move around templates
2013-03-01 13:31:54 -05:00
John Hess
b400b575d0
Merge pull request #1567 from MITx/jth/admindash
...
Improved /admin_dashboard
2013-03-01 07:56:32 -08:00
Victor Shnayder
86b91e2dc0
add a question about account changes to the help page
2013-02-28 20:44:18 -05:00
Victor Shnayder
f0a4691914
Update student FAQ (LH #213 )
2013-02-28 20:16:06 -05:00
John Hess
02e30f5072
Cleaned up admin_dashboard code and template
2013-02-28 11:11:57 -05:00
John Hess
2f5e1b9cc0
Readable admin_dashboard
2013-02-28 10:54:57 -05:00
Victor Shnayder
f33c575412
Merge pull request #1565 from MITx/fix/brian/pdfchapter_ff
...
fix viewing of pdfbook on firefox
2013-02-27 15:25:36 -08:00
Brian Wilson
907cd50503
fix viewing of pdfbook on firefox
2013-02-27 17:09:50 -05:00
David Ormsbee
c7920f09ad
Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features.
2013-02-27 11:42:06 -05:00
Ned Batchelder
f828049043
Change TorontoX to University of TorontoX
2013-02-27 10:05:58 -05:00
David Ormsbee
51a863bd6b
Merge pull request #1557 from MITx/feature/brian/pdfchapter
...
Feature/brian/pdfchapter
2013-02-26 15:00:58 -08:00
Brian Wilson
310073ddef
use same images for prev/next as used in image-based textbooks
2013-02-26 16:43:48 -05:00
Brian Wilson
19567cc3d5
update styling of pdfs to be more like textbooks
2013-02-26 15:19:23 -05:00
Brian Wilson
fc9ab346e1
fix loading of specific pages.
2013-02-26 01:03:01 -05:00
Brian Wilson
dde2cd0bd0
get chapter links to start working
2013-02-25 16:52:32 -05:00
Your Name
9f58f6890d
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-25 09:31:28 -05:00
Brian Wilson
fa00ea442e
add first pass at multi-chapter support.
2013-02-25 01:26:34 -05:00
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
Brian Wilson
50cae69945
define pdfviewer.js, and use from static_pdfbook.html
2013-02-20 18:37:17 -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
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
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
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
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
Victor Shnayder
45c80abecf
Add initial images for ANU, McGill, Rice, Toronto.
...
Still waiting on transparent logos.
2013-02-19 14:04:17 -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
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
Diana Huang
7b11843086
Merge branch 'master' into diana/click-tracking
2013-02-15 12:53:21 -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
