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

12230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
a3de4ff625 add unit test to confirm 'id' generation 2013-04-05 15:59:01 -04:00
Chris Dodge
e717244611 remove discussion cache, which isn't used 2013-04-05 15:27:50 -04:00
Chris Dodge
f84eaf01b8 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-05 13:20:02 -04:00
Sarina
aca6cdbade Merge pull request #1813 from MITx/fix/vik/pg-progress 
Fix pg progress
 2013-04-05 09:51:13 -07:00
vik
6aada791d8 Fix pg progress 2013-04-05 11:58:16 -04:00
chrisndodge
4c95294ba7 Merge pull request #1810 from MITx/feature/cdodge/integrity-check-mongo-course 
pylint/pep8 fixes
 2013-04-05 08:45:12 -07:00
Chris Dodge
02dfa09c70 pylint/pep8 fixes 2013-04-05 10:53:18 -04:00
chrisndodge
f467d93f97 Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course 
Feature/cdodge/integrity check mongo course
 2013-04-05 06:52:42 -07:00
chrisndodge
aba17a54a3 Merge pull request #1802 from MITx/feature/markchang/studio-analytics 
Instrument studio for analytics
 2013-04-05 06:50:46 -07:00
Chris Dodge
8e36197cc2 tweeks per Cale's feedback 2013-04-05 09:30:49 -04:00
Calen Pennington
262050e4ff Merge pull request #1778 from MITx/feature/ichuang/add-dump-grades-config-to-instructor-dashboard 
add dump of description of grading configuration to instructor dashboard
 2013-04-05 06:30:43 -07:00
Calen Pennington
1ce362de7d Merge pull request #1807 from MITx/hotfix/gprice/marketing-changes-20120404 
Hotfix/gprice/marketing changes 20120404
 2013-04-05 06:27:52 -07:00
Mark L. Chang
32bc462038 Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics 2013-04-04 23:45:06 -04:00
Mark L. Chang
2852256898 added dummy analytics object 2013-04-04 23:44:40 -04:00
ichuang
3b371c17e1 fix syntax error in lms/djangoapps/instructor/views.py 2013-04-05 02:59:24 +00:00
ichuang
8d770c1c04 use isinstance for grader check in lms/djangoapps/instructor/views.py 2013-04-05 02:54:05 +00:00
Greg Price
0c31cac3de Remove Project Manager job listing 
Requested by Conrad via email
 2013-04-04 16:58:48 -04:00
Calen Pennington
9075e84430 Merge pull request #1774 from MITx/feature/ichuang/conditional-def-msg 
add default message to conditional
 2013-04-04 13:39:19 -07:00
Christina Roberts
de44813732 Merge pull request #1808 from MITx/bug/christina/studio 
Show course end date on course about page
 2013-04-04 13:34:00 -07:00
Mark L. Chang
2e9bf4ac0e Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics 
Conflicts:
	cms/envs/common.py
 2013-04-04 16:11:22 -04:00
Mark L. Chang
10377bc41c added a dummy key for segment.io so it doesn't ever fail 2013-04-04 16:08:10 -04:00
cahrens
57343c7d9e On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:35:07 -04:00
cahrens
bd055ddc22 On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:30:34 -04:00
cahrens
d02dc37d9f On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:22:56 -04:00
Calen Pennington
5873721e1b Merge pull request #1800 from MITx/hotfix/stanford-press-release 
Stanford press release
 2013-04-04 11:59:05 -07:00
Calen Pennington
99424a9716 Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error 
fix IntegrityError duplicate entry issue with module_data Scope.student_state update
 2013-04-04 11:57:59 -07:00
Calen Pennington
e97e8ce5b6 Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup 
clean up xqueue callback url generation; allow override from settings
 2013-04-04 11:54:13 -07:00
Diana Huang
d9d151b35e Merge pull request #1768 from MITx/fix/diana/input-state-tests 
Tests to make sure that input_states have the correct keys
 2013-04-04 11:39:34 -07:00
Calen Pennington
ff8dca943c Merge pull request #1775 from MITx/feature/ichuang/gitreload-fix 
fix lms migration to be compatible with xblock
 2013-04-04 11:17:38 -07:00
Diana Huang
42614c69b4 Add space after comma. 2013-04-04 14:16:38 -04:00
Greg Price
d498694659 Fix date on Stanford press release 
Lighthouse ticket [#328 state:resolved]
 2013-04-04 13:52:33 -04:00
Greg Price
32b8c59320 Update jobs page 
Lighthouse ticket [#304 state:resolved]
 2013-04-04 13:52:33 -04:00
Greg Price
ffc1259496 Apply text and image changes reqeusted by UTAustinX 
Lighthouse LMS tickets:
[#307 state:resolved]
[#310 state:resolved]
[#319 state:resolved]
[#322 state:resolved]
 2013-04-04 13:52:33 -04:00
Diana Huang
02b7ab4fa0 Tests to make sure that input_states have the correct keys 
and are not cross-pollinating
 2013-04-04 13:47:55 -04:00
chrisndodge
79677e92ca Merge pull request #1780 from MITx/feature/ichuang/staff-email-for-course-creation 
email link for course creation request (in Studio)
 2013-04-04 10:40:51 -07:00
Chris Dodge
73113eddc7 fix xml_attributes inspection 2013-04-04 13:38:30 -04:00
ichuang
2e852d16ac Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation 
Conflicts:
	cms/envs/common.py
 2013-04-04 17:34:52 +00:00
Calen Pennington
72ce1af982 Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands 
fix forum management commands (assign_default_role was moved)
 2013-04-04 10:14:31 -07:00
Calen Pennington
7f19d48985 Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock 
Migrate to the open source XBlock repo
 2013-04-04 10:12:00 -07:00
brianhw
b7c8a6977e Merge pull request #1805 from MITx/fix/brian/user-on-progress 
add user name and email to progress page
 2013-04-04 10:09:52 -07:00
chrisndodge
0ff31adf74 Merge pull request #1779 from MITx/feature/ichuang/studio-sort-my-courses 
sort course index in studio my courses page
 2013-04-04 09:30:16 -07:00
Mark L. Chang
00abaffe1d Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics 2013-04-04 12:17:58 -04:00
Mark L. Chang
db1c0bf081 added dev key so tests run 2013-04-04 12:14:34 -04:00
Brian Wilson
d3e7739b3b add user name and email to progress page 2013-04-04 12:03:08 -04:00
John Jarvis
ea6174af28 fixing image resolution for the stanford-university image 2013-04-04 11:40:44 -04:00
Will Daly
1b7e552d5d Merge pull request #1804 from MITx/fix/brian/remove-input-state-logging 
add progress logging while running remove_input_state management command
 2013-04-04 08:32:45 -07:00
Brian Wilson
4c511c3c66 add progress logging 2013-04-04 11:14:52 -04:00
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Diana Huang
8304e9031c Merge pull request #1797 from MITx/diana/fix-matlab-queueing-message 
Matlab Unit Tests and Minor Bugfix
 2013-04-04 07:39:05 -07:00
Chris Dodge
c0fc029b03 switch over the variable 'ms' to be 'store' 2013-04-04 10:33:30 -04:00