Steve Strassmann
6e34c668bb
introduce i18n
2013-04-17 11:30:29 -04:00
Calen Pennington
3cd414afbb
Merge pull request #1825 from MITx/fix/cale/gradebook
...
Fix/cale/gradebook
2013-04-17 07:37:02 -07:00
brianhw
91d84c0208
Merge pull request #1863 from MITx/fix/brian/jobs-20130410
...
Update with 2013-04-10 changes
2013-04-16 12:56:58 -07:00
Brian Wilson
7f90e31709
Update with 2013-04-10 changes
2013-04-16 15:43:14 -04:00
Carlos Andrés Rocha
a947f620a0
Merge pull request #1861 from MITx/fix/btalbot/stanford-logo
...
fixing the visual display of the stanford logo
2013-04-16 11:50:43 -07:00
Brian Talbot
b417651cf1
fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off)
2013-04-16 14:47:26 -04:00
Vik Paruchuri
d82ac2b747
Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe
2013-04-16 13:45:46 -04:00
Vik Paruchuri
701bdc55c0
Minor fixes
2013-04-16 11:55:54 -04:00
Calen Pennington
6644b78819
Fix gradebook when using grade cutoffs other than A/B/C
2013-04-16 11:38:58 -04:00
ichuang
ffb125f8a9
course_navigation for masquerade
2013-04-13 22:46:48 -04:00
ichuang
fb0a23238a
allow staff to masquerade as student - works
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/course_navigation.html
2013-04-13 22:46:39 -04:00
Brian Wilson
2d9deaf38c
remove code for supporting anchor_id on html textbooks, since it doesn't work
2013-04-12 11:53:06 -04:00
Vik Paruchuri
9f04769c00
Better confirmation for flagging
2013-04-10 16:16:13 -04:00
Vik Paruchuri
a64d57ae1d
Add popup when flag box is checked
2013-04-10 16:01:56 -04:00
John Jarvis
54e5e3d31f
Adding the EDX_MKTG feature flag and links back to the marketing site
2013-04-10 14:29:55 -04:00
Brian Talbot
22a56fddb4
edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed
2013-04-10 13:38:25 -04:00
Brian Talbot
b5ec11afa0
edx.org - adding in more UI status when processing login/register forms
2013-04-10 11:26:00 -04:00
Sef Kloninger
bcdc6db4a9
press releases: fix stanford announcement in rss feed
2013-04-10 02:26:43 -04:00
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
