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
Sef Kloninger
4b68e0282f press releases: use generic matching rule 
This way instead of having to explicitly add releases to the urls.py
file, we just add the relase to the static_templates/press_releases
directory and the right thing happens.

Getting rid of the current "feature" where /pressrelease redirects to
the current press release.  It was broken, looks like it's unused.

Limitation: release file name must match slug, but with underscores and
all lower case.

Why bother? I wanted to do something small to learn the edX toolchain.
 2013-04-10 02:16:35 -04:00
Sef Kloninger
f57028b8e8 press releases: standardize template names (move 2) 2013-04-10 01:23:32 -04:00
Sef Kloninger
b118b73143 press releases: standardize template names (move 1) 2013-04-10 01:19:20 -04:00
Brian Talbot
86dbfd34a1 edx.org - added basic styles to match previous password reset form to complete view 2013-04-09 15:38:10 -04:00
John Jarvis
c3e5469596 changing password reset fields to match what is used now 2013-04-09 15:11:06 -04:00
Kevin Chugh
8358e5162a Merge branch 'master' into feature/kevin/flagging 2013-04-09 09:23:05 -04:00
Brian Talbot
78079d1ca7 Merge branch 'master' into drupal-new 2013-04-08 22:35:29 -04:00
Brian Talbot
d8368447fd edx.org - adjusted input height and padding to handle previously uneditable fieldsin firefox 2013-04-08 22:35:06 -04:00
Brian Talbot
13b741750a edx.org - basic styling of password reset form 2013-04-08 22:16:32 -04:00
Kevin Chugh
f59b74e27f fix nitpick and merge master 2013-04-08 17:19:28 -04:00
Kevin Chugh
2b2621e20c Merge branch 'master' into feature/kevin/pinning_inline 2013-04-08 17:19:19 -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
Diana Huang
b1716dc2fa Make requested updates to the jobs page 2013-04-08 13:10:04 -04: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
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
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
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
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
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
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
John Jarvis
b2e8780f9b adding a smaller stanford image 2013-04-03 16:01:15 -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
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