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
Christina Roberts
81f94fc4e2
Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin
...
studio - fixing a visual margin issue with the sign up/in views
2013-04-09 12:51:09 -07: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
chrisndodge
2fce096e1c
Merge pull request #1834 from MITx/bug/christina/base
...
Need to be able to access smoothScrollTop.
2013-04-09 06:52:55 -07:00
cahrens
f36494e5dd
Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way.
2013-04-09 09:41:52 -04:00
Sarina
74104d6081
Merge pull request #1831 from MITx/vik/fix/pg-and-progress
...
Fix weighting and score generation
2013-04-08 14:37:07 -07:00
Christina Roberts
7fd8a33b3c
Merge pull request #1816 from MITx/feature/btalbot/studio-alerts
...
Feature/btalbot/studio-alerts
2013-04-08 14:19:12 -07:00
Brian Talbot
606469cd46
studio - fixing a visual margin issue with the sign up/in views header/content areas
2013-04-08 17:14:41 -04:00
Brian Talbot
7882845786
studio - alerts: correcting page title
2013-04-08 17:09:43 -04:00
Brian Talbot
27871ac9c9
studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake
2013-04-08 16:55:06 -04:00
Vik Paruchuri
7d09617ec9
Fix weighting and score generation
2013-04-08 16:52:18 -04:00
Calen Pennington
45bb4d3754
Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data
...
import was putting the xml data into definition.data.data rather than de...
2013-04-08 13:50:36 -07:00
Brian Talbot
3f2e21f9dc
Merge branch 'master' into feature/btalbot/studio-alerts
2013-04-08 16:29:18 -04:00
Brian Talbot
3f22826e26
studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification
2013-04-08 16:28:31 -04:00
Chris Dodge
54afc5eb63
seems like we need to purge 'filename' from both _model_data as well as xml_attributes
2013-04-08 16:09:41 -04:00
Chris Dodge
a0f5a51135
wip to fix broken test
2013-04-08 15:34:12 -04:00
Chris Dodge
983e524158
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/import-nesting-definition-data
2013-04-08 15:14:58 -04:00
Calen Pennington
63b5153cde
Clean up violations from ichuang's PR
2013-04-08 15:08:23 -04:00
Chris Dodge
0b26cc2635
fix line breaks per Cale
2013-04-08 14:48:16 -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
Chris Dodge
069f997595
import was putting the xml data into definition.data.data rather than definition.data
2013-04-08 14:33:46 -04:00
Mark L. Chang
1500586f70
Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo
...
studio - corrected a typo and adjusted copy on the help sock
2013-04-08 11:23:16 -07:00
chrisndodge
9a405ff44c
Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through
...
extend the list of container module names to our comuputation of inherit...
2013-04-08 11:11:14 -07:00
Brian Talbot
e3a1279c8f
studio - corrected a typo and adjusted copy on the help sock
2013-04-08 14:10:38 -04:00
Mark L. Chang
caa2539893
Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None
...
mark stumble on case where he had a None course
2013-04-08 11:10:15 -07:00
Chris Dodge
472e657692
mark stumble on case where he had a None course
2013-04-08 14:07:37 -04:00
Don Mitchell
c14d046d2f
Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage
...
add a simple Studio walkthough to check page loads
2013-04-08 10:58:47 -07:00
Chris Dodge
5137119f2b
add a simple Studio walkthough to check page loads
2013-04-08 13:55:38 -04:00
Brian Talbot
bcf4775610
studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling
2013-04-08 13:47:01 -04:00
Diana Huang
b1716dc2fa
Make requested updates to the jobs page
2013-04-08 13:10:04 -04:00
Chris Dodge
7cd4310c32
extend the list of container module names to our comuputation of inherited metadata
2013-04-08 12:12:23 -04:00
Brian Talbot
c8cceb7140
Merge branch 'master' into feature/btalbot/studio-alerts
2013-04-08 11:40:53 -04:00
Brian Talbot
4d0d3d3ad4
studio - alerts: refactored some alert and notification show/hide js added back to base.js
2013-04-08 11:35:27 -04:00
Brian Talbot
28334064ab
studio - alerts: reducing the animation time for notification slide downs
2013-04-08 11:30:49 -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
Brian Talbot
4f71f53826
studio - alerts: adding back in manual close behavior to base.js (needed across app)
2013-04-08 11:18:10 -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
cea0f9252c
Make sure we don't mark the message bar as hiding if it is not shown.
2013-04-08 11:02:06 -04:00
Chris Dodge
0949754cd4
xblock changed attribute names from 'student' to 'user'. Need to update consumers
2013-04-08 10:56:40 -04:00
cahrens
7f1c89b492
Merge branch 'master' into feature/btalbot/studio-alerts
2013-04-08 10:28:52 -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
Don Mitchell
c6bec6bcad
Merge pull request #1812 from MITx/feature/christina/gmt
...
Display UTC on the end of dates (that are in UTC).
2013-04-08 07:00:08 -07:00
Don Mitchell
6e45db65c2
Merge pull request #1820 from MITx/fix/cdodge/draft-metadata-inheritance
...
Fix/cdodge/draft metadata inheritance
2013-04-08 06:51:54 -07:00
Brian Talbot
c0bb3c962d
studio - adding in ux-alerts view comment
2013-04-08 09:41:50 -04:00