Vik Paruchuri
d0ecbbb4cf
Fix hotkeys in peer and staff grading to use ctrl prefix
2013-04-10 15:10:48 -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
Chris Dodge
07b9d6353e
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
2013-04-10 09:26:51 -04:00
Sef Kloninger
bd2330a8f0
press releases: more explicitly match on slug (safety)
2013-04-10 08:20:30 -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
Kevin Chugh
de7b9333b7
add flagging premissions
2013-04-09 15:13:12 -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
93978da87c
fixes cleanup
2013-04-09 14:57:43 -04:00
Vik Paruchuri
9cca3072c3
Fix skip behavior for staff
2013-04-09 13:53:51 -04:00
John Jarvis
2c0b2e4d27
Merge branch 'master' into drupal-new
2013-04-09 13:27:13 -04:00
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
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
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
Chris Dodge
5b7d882e3e
Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements
2013-04-06 11:02:21 -04:00
Chris Dodge
b78eed3c22
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision
2013-04-06 10:58:26 -04:00
Kevin Chugh
24095679a6
add back comment response flagging
2013-04-05 19:04:18 -04:00
Kevin Chugh
de7c511328
flagging working again
2013-04-05 16:39:22 -04:00
Chris Dodge
e717244611
remove discussion cache, which isn't used
2013-04-05 15:27:50 -04:00
Kevin Chugh
0e8ef28347
flagging almost done
2013-04-05 13:23:09 -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
Chris Dodge
3d7f893259
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision
2013-04-05 13:19:10 -04: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
