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

4373 Commits

Author SHA1 Message Date
Ned Batchelder
d2ed6e2c02 Merge pull request #1830 from MITx/fix/cale/violations 
Clean up violations from ichuang's PR
 2013-04-09 10:21:49 -07:00
Calen Pennington
5b8a410d12 Merge pull request #1829 from MITx/marketing/cale/delftx-header 
Marketing request: Lighthouse [#338, fixed]
 2013-04-09 10:14:19 -07:00
Calen Pennington
63b5153cde Clean up violations from ichuang's PR 2013-04-08 15:08:23 -04:00
Diana Huang
e981226d8d Merge pull request #1823 from MITx/diana/job-page-update 
Make requested updates to the jobs page
 2013-04-08 11:45:35 -07:00
Calen Pennington
8288202008 Marketing request: Lighthouse [#338, fixed] 2013-04-08 14:42:15 -04:00
Diana Huang
b1716dc2fa Make requested updates to the jobs page 2013-04-08 13:10:04 -04:00
chrisndodge
146f09b788 Merge pull request #1821 from MITx/fix/cdodge/student-to-user-name-change 
xblock changed attribute names from 'student' to 'user'. Need to update ...
 2013-04-08 08:20:19 -07:00
chrisndodge
a57e0fa2c5 Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl 
make "edit" links work - fixes giturl (was broken by xblocks migration)
 2013-04-08 08:17:31 -07:00
Chris Dodge
0949754cd4 xblock changed attribute names from 'student' to 'user'. Need to update consumers 2013-04-08 10:56:40 -04:00
chrisndodge
4b925520b8 Merge pull request #1818 from MITx/feature/ichuang/dump-grading-config-fix 
fix typo in instructor dashboard dump grading config
 2013-04-08 07:28:22 -07:00
cahrens
f0d2ff7ba4 Change display_timezone to show_timezone. 2013-04-08 09:11:10 -04:00
cahrens
e4dac6e310 Add display_timezone so course authors can choose not to display timezones in LMS. 2013-04-08 08:38:52 -04:00
ichuang
8cafadc03b make "edit" links work - fixes giturl (was broken by xblocks migration) 
Conflicts:

	lms/templates/staff_problem_info.html
	lms/xmodule_namespace.py
 2013-04-07 00:03:36 +00:00
ichuang
51d882b7b0 fix typo in instructor dashboard dump grading config 2013-04-06 18:32:23 +00:00
Diana Huang
6937f24cbb Remove duplicate entries from the press page. 2013-04-05 11:10:08 -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
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
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
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
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
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
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
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
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
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
Jay Zoldak
22017ac24c pep8 fixes for psychoanalyze and capa module 2013-04-04 09:57:19 -04:00
Piotr Mitros
1717782c5b Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix 
fix psychometrics to be compatible with new xblocks
 2013-04-04 05:50:59 -07:00
John Jarvis
d2313d851a renaming image 2013-04-03 16:02:41 -04:00
John Jarvis
b2e8780f9b adding a smaller stanford image 2013-04-03 16:01:15 -04:00
John Jarvis
e8ee6616c4 removing old logo 2013-04-03 15:39:46 -04:00
John Jarvis
6d78425a82 dding stanford-univ logo 2013-04-03 15:39:22 -04:00
John Jarvis
1c581835f2 changing stanford logo 2013-04-03 15:39:11 -04:00
John Jarvis
71cfc4441b university->logo 2013-04-03 15:37:12 -04:00
John Jarvis
0c81329fa5 updating image link 2013-04-03 15:35:50 -04:00
John Jarvis
7b226c34f8 Adding new logo for stanford 2013-04-03 15:34:54 -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
brianhw
7c9875870b Merge pull request #1770 from MITx/fix/brian/remove-input_state 
management command to remove excess input_state entries
 2013-04-03 07:35:47 -07:00
Brian Wilson
b11f0e17f7 respond to feedback 2013-04-03 10:22:43 -04:00