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

2941 Commits

Author SHA1 Message Date
John Jarvis
0c81329fa5 updating image link 2013-04-03 15:35:50 -04:00
Victor Shnayder
9f9748b9fa Stanford press release 2013-04-03 14:26:06 -04:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio 
Fix due date bug.
 2013-04-03 10:26:40 -07:00
Brian Talbot
fa898d0589 edx.org - revising register field label per marketing's request 2013-04-03 09:13:48 -04:00
cahrens
42fbc16006 Feedback from code review. 2013-04-02 14:10:56 -04:00
Kevin Chugh
daa0cd22d5 filter implemented for flagged 2013-04-01 23:16:22 -04:00
ichuang
5477d6430a add instructions to idashboard for deleting state of non-problem xblocks 2013-04-01 19:59:20 +00:00
cahrens
8b26d3a8a1 Protect against no due property (as was there before). 2013-04-01 14:42:05 -04:00
cahrens
ee2b92ab02 Protect against no due property (as was there before). 2013-04-01 14:38:56 -04:00
cahrens
845e86b8d1 Format timestamp. 2013-04-01 14:32:03 -04:00
cahrens
b1ee96b38e Format timestamp. 2013-04-01 14:18:15 -04:00
cahrens
055538e213 Format timestamp. 2013-04-01 14:10:48 -04:00
cahrens
8ace7fe57c Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-04-01 12:30:07 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
ichuang
cac7f8a289 allow student state of module other than problem to be reset by instructor 
this makes it possible to reset open ended response problems
 2013-03-31 19:43:39 +00:00
ichuang
de5fa56b19 add dump of description of grading configuration to instructor dashboard 2013-03-31 13:18:54 +00:00
Kevin Chugh
5534d8bdce fix mega merge conflicts 2013-03-29 07:33:52 -04:00
Carlos Andrés Rocha
a15baa97c5 Add UTAustinX landing page 2013-03-28 13:23:58 -04:00
Arthur Barrett
7784a29e61 add simple notes view 2013-03-26 14:47:12 -04:00
John Jarvis
506a5252b2 converting password_reset_confirm back to django template from mako 2013-03-26 11:06:39 -04:00
Arthur Barrett
d636f4fab0 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-03-25 19:04:58 -04:00
Arthur Barrett
131c63b697 refactored model and api to search/filter by page uri 2013-03-25 18:47:28 -04:00
Diana Huang
156afb6d77 Remove duplicate login dialog. 2013-03-25 15:16:00 -04:00
Brian Talbot
e716530692 edx.org - added necessary JS and Sass to disabled login/register button when form is submitting 2013-03-25 14:52:13 -04:00
Arthur Barrett
0574eb49ad initialize annotator on any element by note:init event 2013-03-25 13:36:38 -04:00
Arthur Barrett
7120998938 refactoring notes js 2013-03-21 17:18:45 -04:00
Arthur Barrett
76e338d82b added template for notes view 2013-03-21 12:33:27 -04:00
Victor Shnayder
83665515d8 Remove director of engineering job posting per request from Tess 2013-03-20 13:45:01 -04:00
Your Name
32f75bfe9e added pinning UI to inline 2013-03-20 11:58:47 -04:00
Kevin Chugh
359de858b4 merge master 2013-03-20 09:21:51 -04:00
Victor Shnayder
21e58d009a Remove associate legal council posting, per request from Tess 2013-03-20 00:05:13 -04:00
John Jarvis
78987cc400 resolving merge conflicts 2013-03-19 16:16:32 -04:00
e0d
39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning 
Allow backwards compatibility for forums pinning UI.
 2013-03-19 09:31:14 -07:00
Carlos Andrés Rocha
a4451bdcd2 XBlock SDK announcement 
LMS Lighthouse [#261]
 2013-03-16 14:26:14 -07:00
Carlos Andrés Rocha
93a59f244d XBlock SDK announcement 
LMS Lighthouse [#261]
 2013-03-15 10:43:56 -07:00
Carlos Andrés Rocha
7697a43cf4 Fix typo in signup forms 
LMS Lighthouse [#263]
 2013-03-15 09:38:06 -07:00
Your Name
0a53ec3ee6 updates 2013-03-15 11:37:58 -04:00
Your Name
470e402723 patch for backward compatibility 2013-03-15 10:51:34 -04:00
Calen Pennington
fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-15 10:33:54 -04:00
Calen Pennington
8531d56268 Merge pull request #1665 from MITx/jmpm-analytics 
Enables basic analytics tab in instructor dashboard
 2013-03-15 07:06:02 -07:00
Calen Pennington
029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
 2013-03-15 09:46:47 -04:00
David Ormsbee
e818efb098 Removed reverse() call that was breaking in RSS feed. 2013-03-14 11:19:07 -04:00
Carlos Andrés Rocha
80d809a86a Add location note to jobs page 
LMS Lighthouse [#190]
 2013-03-14 06:52:28 -07:00
Carlos Andrés Rocha
b4d83a5f44 Add 2.01x announcement to news feed 
LMS Lighthouse [#259]
 2013-03-14 06:49:07 -07:00
Carlos Andrés Rocha
15d8727fce Fix ids in feed.rss 2013-03-14 06:38:55 -07:00
Kevin Chugh
8d766c4b51 fix conflict 2013-03-13 21:01:37 -04:00
Your Name
fc907fe055 candidate without inline 2013-03-13 18:50:00 -04:00
Your Name
117be695cb candidate without inline 2013-03-13 18:40:10 -04:00
David Ormsbee
c0efb0136e Merge branch 'master' into jmpm-analytics 2013-03-13 16:55:54 -04:00
Your Name
08bc073fa5 updates 2013-03-13 16:40:04 -04:00