Diana Huang
dadcdd0599
Fix lettuce signup feature to match Drupal site.
2013-05-17 10:51:38 -04:00
Diana Huang
acfcd0f8a4
Fix the login lettuce feature for the new Drupal site.
2013-05-17 10:51:38 -04:00
Diana Huang
b6c0081064
Look for the existence of the links, not for
...
the actual urls
2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97
Fix bug in lettuce tests where the unregister dialog wasn't
...
getting closed fast enough.
2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e
Merge branch 'master' into drupal-new
2013-05-16 16:27:36 -04:00
Greg Price
b8d2276de7
Remove dashboard links for unstarted courses
...
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
2013-05-16 15:06:48 -04:00
Greg Price
ff2ba68d79
Tweak behavior of registration button for marketing site
...
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
2013-05-16 15:06:48 -04:00
Arthur Barrett
adcd1dd886
update annotator.min.css with change to fix adder button and serve the minified one.
2013-05-16 14:48:06 -04:00
Arthur Barrett
52e5fe223c
update annotator.js library and fix the annotator-adder button hover state in courseware.
2013-05-16 14:27:21 -04:00
Arthur Barrett
e89cd7a397
fix test to check for 400 status code instead of 500.
2013-05-16 13:38:14 -04:00
Arthur Barrett
1fbe43a650
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-16 13:23:12 -04:00
Arthur Barrett
0dd8dabf13
validation errors should return 400 status code instead of 500.
2013-05-16 13:18:36 -04:00
Will Daly
342b3bb0e9
Merge branch 'master' into feature/will/ci-lettuce-tests
...
Resolved conflict with changes to Rakefile in master
Conflicts:
rakefile
2013-05-16 11:21:59 -04:00
Calen Pennington
0701e1a776
Use local node_modules as system_node_path if none is set
2013-05-15 15:25:42 -04:00
Will Daly
1240c5ae92
Merge branch 'master' into feature/will/ci-lettuce-tests
2013-05-15 11:40:54 -04:00
Will Daly
b3e959773d
Disabled logging of warnings/errors for acceptance tests
...
to make the logs readable
2013-05-15 11:31:52 -04:00
Chris Dodge
6cec66979a
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
2013-05-15 11:16:47 -04:00
Arthur Barrett
3a178bab1f
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-15 11:12:42 -04:00
Greg Price
87cc4fab5a
Add tags to comment service request Datadog timer
2013-05-14 14:49:56 -04:00
Will Daly
36fb8f91e0
Acceptance tests now use the same mongo db as the unit test suite.
...
The LMS/CMS acceptance tests both use the collection acceptance_modules
2013-05-14 12:45:38 -04:00
Will Daly
daef910494
Mae mongo DB and collection names consistent for all
...
acceptance tests.
2013-05-14 12:34:15 -04:00
Arthur
c8bdc1ab66
update readme
2013-05-14 12:42:26 -03:00
Greg Price
c8970cafee
Add comment service request time logging to Datadog
2013-05-14 11:32:40 -04:00
Arthur Barrett
149f2ff897
add readme
2013-05-14 11:26:15 -04:00
Arthur Barrett
5e39971fcc
merge master. resolved conflicts in component.py and course.py.
2013-05-14 10:54:21 -04:00
Will Daly
e2d7f6a027
Changed module store directory root to test_root/data
2013-05-14 10:45:27 -04:00
Will Daly
72a42413e2
Fixed database to work on Jenkins (now stored in test_root),
...
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
2013-05-14 10:33:25 -04:00
David Baumgold
d376cb52ca
Forgot to update phantom-jasmine location for LMS
2013-05-13 17:31:57 -04:00
Arthur Barrett
026773b508
fix pep8 warnings and add empty message to notes tab
2013-05-13 16:54:32 -04:00
Arthur Barrett
bea943d537
merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.
2013-05-13 16:26:28 -04:00
e0d
eb843172ff
Enable Delft and Georgetown to be handled by the dynamic path
2013-05-13 14:02:41 -04:00
VikParuchuri
e122efc5a3
Merge pull request #1991 from edx/feature/vik/oe-tests
...
Feature/vik/oe tests
2013-05-13 10:49:33 -07:00
Arthur Barrett
66d3ccff17
sanitize note text and other input in the model as well as escape template output to close potential security hole
2013-05-13 13:40:19 -04:00
Arthur Barrett
be98b5fa3e
merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)
2013-05-13 13:26:55 -04:00
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
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
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
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
