cahrens
125c9c13c1
Got clearing of fields working.
2013-05-12 15:45:31 -04:00
marco
c36046bedd
Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui
2013-05-12 13:18:45 -04:00
marco
2360a111c8
attempt to trigger js event for mode button press, not breaking yet but nonfunctional
2013-05-12 12:08:04 -04:00
Piotr Mitros
622b53d952
Finished docstring
2013-05-12 08:47:33 -04:00
Piotr Mitros
0cc763bc12
Removed debug code
2013-05-12 08:44:48 -04:00
Piotr Mitros
21e0d4fe61
Fixed whitespace bug
2013-05-11 21:19:14 -04:00
Piotr Mitros
911110c6bc
Imports djanalytics, and adds URLs
2013-05-11 16:19:04 -04:00
Mark L. Chang
277215be3a
rebased
...
Merge branch 'feature/markchang/500-copy-change' of github.com:edx/mitx into feature/markchang/500-copy-change
2013-05-11 16:17:17 -04:00
Mark L. Chang
f864a6c00c
more copy tweaks
2013-05-11 16:16:30 -04:00
Mark L. Chang
317831a813
copy change
2013-05-11 16:16:30 -04:00
Arthur Barrett
beabdf1434
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-11 14:52:39 -04:00
Arthur Barrett
11a48dc962
replacing lists with namedtuples to improve readability
2013-05-11 14:50:35 -04:00
Arthur Barrett
ee1ee26c49
log the course_id when notes are disabled
2013-05-11 13:57:07 -04:00
Chris Dodge
d95e87cf67
insert the textbook XML element when writing definition to xml
2013-05-11 10:34:36 -04:00
Brian Talbot
e4b5d21ba6
edx.org - adds in text-decoration nullification and revised padding for course registration buttons
2013-05-10 17:24:48 -04:00
Brian Talbot
17affb0ac7
edx.org - reduces padding on course listing register buttons (all states) and resets box-sizing to border box to make a proper box model for element
2013-05-10 17:00:25 -04:00
Jason Bau
348e982678
Merge pull request #2015 from edx/fix/jbau/parameterize-cms-email
...
Fix/jbau/parameterize cms email
2013-05-10 13:58:51 -07:00
Steve Strassmann
c071ee448f
pep8 compliance
2013-05-10 16:51:26 -04:00
Will Daly
6b0394172d
Changed test_acceptance to test_acceptance_lms and test_acceptance_cms
...
Updated testing docs to reflect changes to the rake file
Added option to pass arguments (including --pdb) to rake test_acceptance
Updated readme
2013-05-10 16:50:00 -04:00
Jason Bau
43779a92a0
Merge branch 'fix/jbau/parameterize-cms-email' of https://github.com/edx/mitx into fix/jbau/parameterize-cms-email
2013-05-10 13:43:26 -07:00
Jason Bau
408e26a0c1
parameterizes CMS email settings
2013-05-10 13:42:28 -07:00
cahrens
f4b06b2e96
Beginnings of is-set work.
2013-05-10 16:41:07 -04:00
Steve Strassmann
571a9af0c0
declared exports
2013-05-10 16:37:28 -04:00
cahrens
fd52980a2d
Option view, changes getting persisted.
2013-05-10 16:02:22 -04:00
Chris Dodge
1db66957af
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
2013-05-10 15:44:55 -04:00
Steve Strassmann
70cca0540d
reorder imports for pep8
2013-05-10 15:23:28 -04:00
Peter Baratta
a1db394bcd
Test for infinity in numerical and formula responses
2013-05-10 15:22:23 -04:00
Peter Baratta
f970bbd121
Add tests on the problem level that show the infinite answer bug
2013-05-10 15:21:29 -04:00
Steve Strassmann
1c5815a844
per-file log objects
2013-05-10 15:11:10 -04:00
Steve Strassmann
a52cf85c08
rake task dependency for transifex
2013-05-10 14:50:49 -04:00
Steve Strassmann
f30f6207d5
clean up rakefile syntax for task dependencies
2013-05-10 14:47:47 -04:00
Steve Strassmann
35d72f30b9
update .gitignore; fix logger import in execute.py
2013-05-10 14:40:30 -04:00
Steve Strassmann
2d96664128
pull from master
2013-05-10 14:22:37 -04:00
Greg Price
ea4a8cf2ad
Merge pull request #1992 from edx/fix/gprice/login-button-link
...
Make login link button in header work with course enrollment flow
2013-05-10 11:14:39 -07:00
Steve Strassmann
01d4fbeb7c
reorder imports
2013-05-10 14:14:36 -04:00
Greg Price
d50608e9c2
Merge pull request #2002 from edx/fix/gprice/drupal-activation-login-link
...
Make activation complete page use non-modal login link
2013-05-10 11:10:10 -07:00
Steve Strassmann
8c8377f1df
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
...
pull master
2013-05-10 13:59:07 -04:00
Steve Strassmann
9350a2c067
refactoring views
2013-05-10 13:56:30 -04:00
Chris Dodge
5619306c6b
add comment that the models.py file has been moved
2013-05-10 13:43:15 -04:00
Mark L. Chang
4003f8633d
more copy tweaks
2013-05-10 13:39:46 -04:00
dcadams
a05006a415
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
2013-05-10 10:39:00 -07:00
Mark L. Chang
f7655576cd
copy change
2013-05-10 13:21:09 -04:00
marco
04bb7335e7
removed extra section heading in settings DOM, placed settings after editor
2013-05-10 13:18:43 -04:00
Greg Price
64d18c0ec4
Merge pull request #2010 from edx/fix/gprice/course-num-case
...
Make course number in registration button not transformed to lowercase
2013-05-10 10:08:06 -07:00
Chris Dodge
d39d44ba49
keep migrations in djangoapp_comment_client
2013-05-10 12:58:00 -04:00
Greg Price
ec53e3ca90
Merge pull request #1994 from edx/fix/gprice/remove-dashboard-news
...
Remove edX news from dashboard if marketing site is enabled
2013-05-10 08:55:59 -07:00
Greg Price
d04e8492a8
Merge pull request #1996 from edx/fix/gprice/drupal-course-about-404
...
Return 404 for course about pages if the marketing site is enabled
2013-05-10 08:52:45 -07:00
Greg Price
7d544d449f
Remove edX news from dashboard if marketing site is enabled
2013-05-10 11:03:49 -04:00
Greg Price
6f06a3d92a
Make login link button in header work with course enrollment flow
...
When an unauthenticated user clicks the registration button for a course, they
are redirected to the registration page with query params that are ultimately
included in the form that gets submitted so they can be enrolled in the course
upon successful registration. The header login button is fixed to pass the same
query parameters to the login page so the user can be enrolled in the course
upon successful login.
2013-05-10 11:03:38 -04:00
Greg Price
7dd2973eca
Return 404 for course about pages if the marketing site is enabled
...
It would be better to redirect to the marketing site course about pages, but
the URLs for those are not easily computed, and we do not have time to set up
a full mapping in the LMS config.
2013-05-10 11:03:16 -04:00
