jsa
6e7965d26c
update mitxmako lookup / fixes FOR-150
2013-09-05 23:23:52 -04:00
Chris Dodge
0a6565b882
also even when we have a marketing site, we still need a course image for the dashboard
2013-09-05 21:07:22 -04:00
chrisndodge
9aa024b585
Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline
...
Fix capa optioninput template to honor inline flag
2013-09-05 15:51:30 -07:00
Christina Roberts
a78c913d5e
Merge pull request #872 from edx/christina/about-page
...
Don't show course about page link when we have the marketing site.
2013-09-05 12:40:51 -07:00
Diana Huang
20d72ea703
Clean up views and start work on edit name modal.
2013-09-05 15:20:48 -04:00
Adam Palay
25ce1fe745
Merge branch 'release'
2013-09-05 14:56:25 -04:00
David Baumgold
d20359aa44
Merge pull request #634 from antoviaque/vagrant-provisioning-resume
...
vagrant: Add flag to ensure install is completed at least once
2013-09-05 11:41:32 -07:00
Brian Talbot
f4bdd73839
Verification: adds in verified/enrollment status into dashboard course listings
2013-09-05 14:29:11 -04:00
Brian Talbot
f686990b02
LMS: adds in additional abstract border-variables with logical scale
2013-09-05 14:29:10 -04:00
Brian Talbot
f2e55a3d6a
Verification: abstracting out specific color-based Sass variables to be *somewhat* friendly to theming
2013-09-05 14:29:10 -04:00
cahrens
4e67783644
Don't show course about page link when we have the marketing site.
...
STUD-733
2013-09-05 14:26:08 -04:00
Frances Botsford
48fed2052f
adding in conditional IE hooks in lms main template
2013-09-05 14:18:27 -04:00
Vik Paruchuri
9e1813041a
Fix nopathtoitem error
2013-09-05 14:16:28 -04:00
David Ormsbee
22480b821a
Fix reset button for photo capture
2013-09-05 14:15:13 -04:00
chrisndodge
545d5770d5
Merge pull request #871 from edx/fix/cdodge/re-enable-enrollment-start-stop
...
due to the MixedModuleStore pending release, we need to make enrollment ...
2013-09-05 11:02:00 -07:00
Chris Dodge
4a12cb60c9
due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio
2013-09-05 12:43:24 -04:00
Frances Botsford
a8989f2fe6
adjusting go to course button for vcert receipt
2013-09-05 12:40:37 -04:00
Vik Paruchuri
a6068201e1
Add in a staff warning message about duplicates
2013-09-05 12:29:21 -04:00
Frances Botsford
304a329b08
initial receipt html and styling for vcert
2013-09-05 12:24:03 -04:00
Xavier Antoviaque
0a5b68263e
vagrant: Add flag to ensure install is completed at least once
...
The provisioning script used to check for the existence of the
`/opt/edx/node_modules` folder to decide if the installation has already
been completed. However, since additional instructions were executed
by the installer afterwards, any installation error (eg. download
timeouts on low quality connections) happening between the creation of
that folder and the end of the installation wouldn't be recovered from
on the next vagrant instance boot.
2013-09-05 13:10:48 -03:00
Anton Stupak
5d55714cad
Fix test.
2013-09-05 10:27:41 -04:00
Anton Stupak
961bd4c9cb
Fix selector.
2013-09-05 10:27:29 -04:00
polesye
5658e6bc22
Merge pull request #868 from edx/hotfix/lose_header_bug
...
Fix bug when editing video causes other components to lose their header
2013-09-05 07:26:09 -07:00
Anton Stupak
d93215c0b9
Fix test.
2013-09-05 17:02:53 +03:00
Brian Talbot
9c96fcf4cd
edx.org: ensures that the iframe-based register button has a transparent background
2013-09-05 10:00:34 -04:00
Diana Huang
4ab204cce7
Only create a new photo verification if one doesn't already exist.
2013-09-05 08:50:59 -04:00
Brian Talbot
70cdc9a705
edx.org: addresses vertical scrollbar on course register button when placed in iframe
2013-09-05 08:49:02 -04:00
Anton Stupak
af6d0eb145
Fix selector.
2013-09-05 10:49:42 +03:00
ichuang
69f72989c5
consistently use inline=False as default in capa inputtypes
2013-09-04 23:13:05 -04:00
Julian Arni
07014e8eb2
Reset modal when closed by clicking outside of it
2013-09-04 16:25:23 -04:00
Brian Talbot
5c8e7337a8
edx.org: revises course register button background for all cases (verified, riught column, and bottom of page)
2013-09-04 16:06:44 -04:00
Jason Bau
08168ec67f
Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel
...
Add link in lms legacy instructor dashboard to cms course_index
2013-09-04 13:03:21 -07:00
Brian Talbot
d4e849d2b2
edx.org: adds custom styling for register button in case of verified option/content displayed
2013-09-04 15:30:10 -04:00
Diana Huang
a1373f4830
Update content of the order confirmation e-mail.
2013-09-04 15:17:08 -04:00
Diana Huang
f819137b30
Fix bracket bug.
2013-09-04 15:17:08 -04:00
Frances Botsford
ccc3589ecb
removing test code from dev.py
2013-09-04 14:53:36 -04:00
Frances Botsford
1afdc70b2d
text code cleanup on photo page
2013-09-04 14:44:13 -04:00
Brian Talbot
732ac1783f
edx.org: adds background to register button's html body element for visual blending in course detail view
2013-09-04 14:40:53 -04:00
Frances Botsford
db57118f7d
i18n and updated secondary action buttons on the photo page
2013-09-04 14:35:48 -04:00
Jason Bau
ec989e4999
Address review comments for lms_link_to_cms
...
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
2013-09-04 11:29:22 -07:00
Frances Botsford
b2ddea7a80
updated copy for vcert flow
2013-09-04 13:46:38 -04:00
Ned Batchelder
ac2b7a3ac1
Merge pull request #863 from edx/ned/fix-simple-things-because,-damn
...
fix simple things because, damn
2013-09-04 09:12:43 -07:00
Chris Dodge
0847bc5e2b
pep8/pylint violations fixes
2013-09-04 11:34:35 -04:00
Sarina Canelake
577aeed35a
Don't fetch the editor for XML courses
2013-09-04 11:31:52 -04:00
Diana Huang
2e3a918da2
Clean up and fix some bugs on the 'already verified' page.
2013-09-04 11:31:03 -04:00
Diana Huang
18a497e150
Fix merge conflict in sass
2013-09-04 11:22:52 -04:00
Diana Huang
03a4af7add
Fix failing tests.
2013-09-04 11:21:31 -04:00
Ned Batchelder
3a5f718a32
fix simple things because, damn
2013-09-04 11:10:05 -04:00
David Ormsbee
e7c07d4e43
Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3
2013-09-04 10:59:18 -04:00
David Ormsbee
78acd083be
Merge branch 'master' into ormsbee/verifyuser3
...
Conflicts:
common/djangoapps/course_modes/models.py
lms/djangoapps/shoppingcart/models.py
lms/djangoapps/shoppingcart/processors/CyberSource.py
lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
lms/djangoapps/shoppingcart/tests/test_models.py
lms/djangoapps/shoppingcart/tests/test_views.py
lms/djangoapps/shoppingcart/urls.py
lms/djangoapps/shoppingcart/views.py
lms/envs/common.py
lms/envs/dev.py
lms/static/sass/base/_variables.scss
2013-09-04 10:58:30 -04:00
