Vik Paruchuri
6dfc490fc7
Json updates
2013-05-13 12:49:01 -04:00
Arthur Barrett
f6b554b10d
added initial schema migration for notes model
2013-05-13 12:26:33 -04:00
dcadams
f044bd4f02
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
2013-05-13 09:17:14 -07:00
Arthur Barrett
6bb6f1c743
add comment to explain json dump logic
2013-05-13 12:05:33 -04:00
Arthur Barrett
e2e32e31d9
make user id check more idiomatic
2013-05-13 11:55:42 -04:00
Arthur Barrett
6f7f924510
replace bare except with except DoesNotExist
2013-05-13 11:51:21 -04:00
Chris Dodge
d32e7a5b61
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
2013-05-13 11:06:49 -04:00
marco
54a33a0a3b
updated pinning icons
2013-05-13 11:04:51 -04:00
Vasyl Nakvasiuk
f1d1a3f606
refactoring after Python code review
2013-05-13 14:44:07 +03:00
Valera Rozuvan
13bed39dde
Refactoring after peer review.
2013-05-13 14:44:07 +03:00
Valera Rozuvan
f4b247d2bb
Refactoring, documenting, moving all HTML generation to template.
2013-05-13 14:44:07 +03:00
Vasyl Nakvasiuk
6deeb60278
update template for word_cloud, refactor empty json answer
2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
dac9b5c038
Word Cloud: add full cycle Python + HTML + JS
2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
dd5a7e7ba8
initialize JS for word_cloud
2013-05-13 14:44:01 +03:00
Alexander Kryklia
bb9bc42171
adds initial word_cloud_module files
2013-05-13 14:44:00 +03: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
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
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
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
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
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
Chris Dodge
5619306c6b
add comment that the models.py file has been moved
2013-05-10 13:43:15 -04:00
dcadams
a05006a415
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
2013-05-10 10:39:00 -07: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
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
Greg Price
0a8d426706
Make activation complete page use non-modal login link
2013-05-10 11:02:39 -04:00
Greg Price
c00b903757
Make course number in registration button not transformed to lowercase
2013-05-10 10:58:12 -04:00
Greg Price
a0fb4d6c85
Merge branch 'master' into drupal-new
...
Conflicts:
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/base/_base.scss
lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Chris Dodge
51809965fe
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
2013-05-10 10:01:53 -04:00
Chris Dodge
1b0eff52ed
create test cases to simulate error exporting/importing textbooks
2013-05-10 10:01:10 -04:00
Greg Price
c765906fc5
Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text
...
Update "thank you" text in help modal
2013-05-09 14:37:13 -07:00
Greg Price
89d0dc1963
Update "thank you" text in help modal
...
As per request from Mary.
2013-05-09 17:16:43 -04:00
Arthur Barrett
a6ad65cb98
trying to fix pylint errors
2013-05-09 16:57:19 -04:00
Arthur Barrett
a407c84bdf
add model unit tests
2013-05-09 16:34:02 -04:00
Chris Dodge
11244107fd
add an empty models.py file to django_comment_client
2013-05-09 16:16:11 -04:00
Arthur Barrett
9aed148dc1
add search test
2013-05-09 16:08:29 -04:00
Arthur Barrett
aad5096ca1
add more tests for update and delete actions
2013-05-09 15:43:34 -04:00
Arthur Barrett
2838dba199
fix pep8 violations
2013-05-09 15:12:22 -04:00
Arthur Barrett
dd583ce4f9
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-09 14:32:05 -04:00
Arthur Barrett
244261f1cf
added more unit tests
2013-05-09 14:31:38 -04:00
Diana Huang
f9023fd112
Merge pull request #1983 from edx/diana/jobs-page-update
...
Jobs page updates.
2013-05-09 11:04:14 -07:00
Diana Huang
e5b18a5688
Put Front End Developer back in.
2013-05-09 13:58:25 -04:00
