cahrens
d42736708c
Merge branch 'master' into feature/christina/unify-fields
2013-06-13 16:19:13 -04:00
Vik Paruchuri
cd49e1bb68
Check to see if a location is valid before displaying it for instructor grading
2013-06-13 16:00:28 -04:00
marco
b946a10c0c
cleaned up topic header to allow for multiple line titles still being visible
2013-06-13 15:50:21 -04:00
Vik Paruchuri
c2e5c60713
Remove correct/incorrect message, and auto-add in needed markdown for studio
2013-06-13 15:34:00 -04:00
Peter Fogg
fa84abc3eb
Add unit tests for creating VideoDescriptor from old XML. Brings test coverage for video_module.py to 91%.
2013-06-13 14:40:12 -04:00
Calen Pennington
e791e84ea7
Remove the stores_state field from XModule
...
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
2013-06-13 14:38:59 -04:00
Bethany LaPenta
85f1386918
Fixed test_system looking like a test to nosetests, also fixed a class in test_error_module.py that had one class inheriting from another
2013-06-13 14:30:07 -04:00
Don Mitchell
71054b24b0
Merge pull request #151 from edx/bug/dhm/timeconv
...
Squash 3 more naive datetime warnings. I think the only ones left are in
2013-06-13 09:07:42 -07:00
Peter Fogg
ef56c49056
Update XML in old video tests. This change tags like <video youtube="1.0:abcdefg"> to <video youtube_id_1_0="abcdefg".
2013-06-13 11:43:51 -04:00
Renzo Lucioni
d136fdac9a
added comment to make clear that leaving the variable analytics outside of the feature flag block is intentional
2013-06-13 11:35:26 -04:00
Renzo Lucioni
8508e3f647
dummy object creation without conditionals
2013-06-13 11:35:26 -04:00
Don Mitchell
6af4402abd
Squash 3 more naive datetime warnings. I think the only ones left are in
...
migrations.
2013-06-13 10:56:48 -04:00
cahrens
fae8fd3841
Merge branch 'master' into feature/christina/unify-fields
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/fields.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_fields.py
requirements/edx/github.txt
2013-06-13 10:55:13 -04:00
Miles Steele
7fb9bfd685
fix test string comparison
2013-06-13 10:25:36 -04:00
Peter Fogg
66ab6597ca
Remove outdated unit test for VideoModule constructor.
2013-06-13 09:46:42 -04:00
marco
1af4d90a1a
removed icon stack from email area of helpgrid
2013-06-12 16:02:17 -04:00
marco
e5158578f4
icon color changes and profile link style to match profile page
2013-06-12 15:14:14 -04:00
marco
48f47696c4
sass build cleanup for baseline fixes
2013-06-12 14:39:10 -04:00
marco
73e122755a
cleaned up margin and padding to use baseline variable
2013-06-12 14:37:52 -04:00
marco
03d514524b
removed border to the right of discussion list
2013-06-12 13:49:46 -04:00
marco
c63fb7c14d
basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss
2013-06-12 13:47:39 -04:00
Calen Pennington
5b8163dc9c
Merge pull request #92 from edx/fix/cale/url-tests
...
Fix tests that vary urls.py
2013-06-12 10:47:13 -07:00
Miles Steele
0825319cc7
fix gradebook tests
2013-06-12 13:16:08 -04:00
Peter Fogg
4e2c4f02d6
Fix times not being parse from HH:MM:SS format into floats and update video module logic tests.
2013-06-12 12:37:06 -04:00
e0d
273df4e113
added pylint ignores, fixed missing import
2013-06-12 11:24:28 -04:00
Peter Fogg
63e376daf8
Fix failing test bug.
2013-06-12 10:48:04 -04:00
Jean Manuel Nater
a25a0d71ac
refactored tests in courseware to draw course info from mongo instead of xmlmodulestore
2013-06-12 10:42:52 -04:00
e0d
fd4d816816
Merge pull request #133 from edx/e0d/migrate-as-other-user
...
Adding a new env to handle escalating privileges to run db migrations.
2013-06-12 05:10:28 -07:00
Diana Huang
58d561ac8e
Merge pull request #126 from edx/diana/fix-display-text
...
Fix typo and an unclear description.
2013-06-11 14:36:06 -07:00
JonahStanley
e843f80e1f
Fixed naming issue and hopefully clicking issue
2013-06-11 17:09:39 -04:00
Diana Huang
f79d1e215a
Fix some typos and unclear descriptions.
2013-06-11 16:48:11 -04:00
e0d
c96511a278
Adding comments.
2013-06-11 16:37:37 -04:00
Jay Zoldak
32562b7055
Fix broken lettuce tests
2013-06-11 15:16:12 -04:00
Peter Fogg
dbb127599f
Merge peter-fogg/fix-video-captions-setting.
2013-06-11 15:11:14 -04:00
e0d
1511ec841a
Better error handling.
2013-06-11 15:00:39 -04:00
e0d
d2554909d8
Adding a new env to handle escalating privileges to run db migrations.
2013-06-11 14:42:39 -04:00
Don Mitchell
64b909c5f0
Merge pull request #12 from edx/feature/dhm/timeconv
...
Feature/dhm/timeconv
2013-06-11 11:11:05 -07:00
Jay Zoldak
37d7bc2365
Update lettuce test for problems with new css for show and hide answers.
2013-06-11 13:52:35 -04:00
caesar2164
646e2bd486
Merge pull request #93 from edx/giulio/accessibility
...
A number of important accessibility changes
2013-06-11 08:38:53 -07:00
Brian Talbot
443a50845a
lms - adds back in missing/previously added .sr screen reader-focused styling and references in place of the .visuallyhidden application
2013-06-10 16:22:21 -07:00
Brian Talbot
d74f952b37
updates masquerade unit test to account for new show answer button with problems
2013-06-10 16:22:20 -07:00
Brian Talbot
8e30981f6f
revises the show/hide answer input to use an HTML button element for accessibility purposes
2013-06-10 16:22:14 -07:00
Giulio Gratta
7390b517f0
required labels, active accordion item, move previous arrow to before unit sequence
2013-06-10 16:22:14 -07:00
Giulio Gratta
70332f897b
courseware active location, suppress browser form validation, and progress graph accessibilit changes
2013-06-10 16:22:13 -07:00
Giulio Gratta
2cad6fe261
user button and menu accessiblity hidden span addition
2013-06-10 16:22:13 -07:00
Greg Price
ca8927ed67
Tweak text in help modal per request from Mary
2013-06-10 18:01:44 -04:00
Greg Price
7be6880fd2
Add course id tagging to feedback submissions
2013-06-10 18:01:44 -04:00
Greg Price
17647abd5c
Add datadog reporting to the feedback submission mechanism
2013-06-10 18:01:43 -04:00
Don Mitchell
168cb306d3
Move tz_aware into connection config rather than settings.
...
Make django use_tz
2013-06-10 17:16:35 -04:00
Don Mitchell
28f8910db4
Make pymongo tz_aware
2013-06-10 17:16:34 -04:00
