Your Name
13ca61ba7f
fix merge conflict with _variables.scss
2013-07-29 13:32:54 -04:00
Adam
50ef0d1c09
Merge pull request #503 from edx/fix/back-button
...
fixes back nav button
2013-07-29 10:29:40 -07:00
Your Name
6276997180
update checkbox with get settings
2013-07-29 13:26:31 -04:00
Christina Roberts
4c35a0f1bb
Merge pull request #488 from edx/christina/emails
...
Send e-mails when course creator status changes.
2013-07-29 10:02:05 -07:00
cahrens
087d35c95e
Studio course creator e-mails.
2013-07-29 13:01:37 -04:00
Don Mitchell
0578175a7c
Merge pull request #505 from edx/dhm/xblock_save
...
More xblock.save() calls to handle fields set during inits
2013-07-29 09:34:46 -07:00
Don Mitchell
393aa1da26
Ensure parent update of children decaches correctly
2013-07-29 12:23:19 -04:00
David Ormsbee
d453f47b72
Merge pull request #501 from edx/gprice/user-api-tweaks
...
User API Tweaks
2013-07-29 09:12:49 -07:00
Brian Talbot
a96099868d
Merge pull request #486 from edx/talbs/mktg-vizsync
...
edx.org Login, Register, and iframe-based button visual sync
2013-07-29 07:22:22 -07:00
Brian Talbot
2ee140eb79
edx.org: syncing up capitalization of register/login submit button copy
2013-07-29 10:21:54 -04:00
Brian Talbot
d61e4e50ec
edx.org: abstracting new edx.org button extends and colors with other themes in mind
2013-07-29 10:21:54 -04:00
Brian Talbot
049794463a
edx.org: revising base link color variable to use darker value for accessibility
2013-07-29 10:21:54 -04:00
Brian Talbot
76b0a03bc2
edx.org: revises iframe-based register/status buttons to match revised styles
2013-07-29 10:21:54 -04:00
Brian Talbot
10964eec88
edx.org: handles letter-spacing on buttons
2013-07-29 10:21:54 -04:00
Brian Talbot
69c792f5e9
edx.org: applies edx.org visual changes (with overrides/new mixins)
2013-07-29 10:21:53 -04:00
Brian Talbot
71c3f5e5a7
edx.org: adds in variables/mixins to support edx.org visual changes
2013-07-29 10:21:53 -04:00
cahrens
b5506cf20b
Copy changes.
2013-07-29 09:51:10 -04:00
cahrens
15665bbe5a
Formatting updates.
2013-07-29 09:49:37 -04:00
cahrens
23894d20f8
E-mail notifications to users when course creator status changes.
2013-07-29 09:49:37 -04:00
Don Mitchell
d1ed6fbc34
More xblock.save() calls to handle fields set during inits
2013-07-29 09:08:37 -04:00
Christina Roberts
166aea62bb
Merge pull request #341 from edx/talbs/studio-authorship
...
Studio: Authorship Rights Request UI + Dashboard Clean-up
2013-07-26 03:59:07 -07:00
Brian Talbot
8a715c1a16
Studio: using defined red color variables for error-based system messages
2013-07-25 17:09:57 -04:00
Sarina Canelake
b143de1f99
Merge pull request #502 from edx/sarina/fix-discussion-acceptance
...
Fix failing acceptance test
2013-07-25 13:23:27 -07:00
Adam Palay
62a54555b6
fixes back nav button
2013-07-25 15:32:43 -04:00
Sarina Canelake
50d35b30b1
Fix failing acceptance test
2013-07-25 14:56:22 -04:00
David Baumgold
a90d7b5dbb
Merge pull request #491 from edx/lettuce-improvements
...
Misc improvements to make lettuce testing a bit saner
2013-07-25 11:37:50 -07:00
Greg Price
dc90736b5b
Allow user id filtering in user preference API
2013-07-25 14:19:29 -04:00
Greg Price
6418a1cf5b
Allow user API access in dev environments
...
This is achieved by allowing access if settings.DEBUG is True and
settings.EDX_API_KEY is not set or None (which is true for dev.py)
2013-07-25 14:02:43 -04:00
David Baumgold
df1252901f
Misc improvements to make lettuce testing a bit saner
2013-07-25 13:19:39 -04:00
Calen Pennington
c6b5178261
Merge pull request #498 from edx/cale/make-the-service-variant-flag-on-manage.py-longform-only
...
Make the service-variant flag on manage.py longform only
2013-07-25 09:38:24 -07:00
cahrens
628994daf1
i18n "Create a New Course".
2013-07-25 12:25:06 -04:00
cahrens
60d60de2c4
Use format for strings instead of %.
2013-07-25 12:21:17 -04:00
ihoover
aad6dc4345
Merge pull request #417 from edx/ihoover/feature_flag_auto_auth
...
Ihoover/feature flag auto auth
2013-07-25 08:11:22 -07:00
Sarina Canelake
c80a05f4d8
Merge pull request #471 from edx/giulio/fix-tooltips
...
override .sr class from keeping tooltips hidden in sequence nav
2013-07-25 08:03:23 -07:00
Renzo Lucioni
30baebd7b5
Merge pull request #494 from edx/renzo/blank-problem-score
...
Blank common and advanced problems now display an inline score of "0 points" upon creation
2013-07-25 07:56:15 -07:00
Adam Palay
2efcb0cdca
Change default names for various LMS components
...
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"
These default names show up in tooltips.
2013-07-25 10:38:47 -04:00
Calen Pennington
1bcafd32a9
Make the service-variant flag on manage.py longform only
2013-07-25 09:34:51 -04:00
Kevin Chugh
d95693ebb7
hook up panel to new stats service
2013-07-25 03:23:04 -04:00
Giulio Gratta
214a814b94
Adjustment to show sequence tool tips in LMS
2013-07-25 00:48:36 -04:00
Kevin Chugh
5d106ee048
Merge branch 'master' into feature/kevin/email_notifications_panel
2013-07-25 00:31:42 -04:00
Sarina Canelake
6923687c8e
Merge pull request #460 from edx/sarina/update-diffcover
...
Update diff-cover to latest version
2013-07-24 20:18:15 -07:00
ihoover
56883d65a1
csrf test fix
...
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)
move definitions from setuo into test method
2013-07-24 17:08:18 -04:00
Renzo Lucioni
1a0055ae77
Blank common and advanced problems now display an inline score of '0 points' upon creation.
2013-07-24 16:44:22 -04:00
Calen Pennington
a569a5f6a7
Merge pull request #490 from edx/cale/make-cms.dev-environment-work-with-manage.py
...
Make cms.dev environment work with manage.py
2013-07-24 13:26:50 -07:00
Don Mitchell
e223d753e3
Merge pull request #489 from edx/dhm/export_policy
...
change of defaults for rerandomize/showanswer
2013-07-24 12:54:32 -07:00
Calen Pennington
dd338c17a5
Merge pull request #477 from edx/cale/xmodule-student-vieww
...
Add an XBlock student_view to XModule
2013-07-24 12:08:25 -07:00
Calen Pennington
3e9bbe2550
Make cms.dev environment work with manage.py
2013-07-24 14:49:07 -04:00
Don Mitchell
400ff494cb
Remove presumption of user's intent for imported xml attrs
...
Moved to xlint rather than setting to old default.
2013-07-24 14:08:34 -04:00
Don Mitchell
2d085c426d
Add xlint check for any policy fields whose default changed.
...
Warn user that the course behavior may change.
2013-07-24 14:07:39 -04:00
Calen Pennington
3774ea1565
Add an XBlock student_view to XModule
...
This just wraps XModule.get_html, and ignores javascript and css for
now.
[LMS-189]
2013-07-24 12:23:26 -04:00
