Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,519 Commits 1 Branch 0 Tags
ffeabae069cd88e136b6bbfa66d3e5a9d6becd4d
Commit Graph

5070 Commits

Author SHA1 Message Date
John Jarvis
ffeabae069 moving settings into the auth tokens section 2013-06-17 09:07:02 -04:00
John Jarvis
770b9f1f87 fixing segment io settings bug 
* Moving to the auth tokens section
* Removing the feature flag logic since all features are loaded earlier
```
    for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
        MITX_FEATURES[feature] = value
```
 2013-06-17 09:01:20 -04:00
Feanil Patel
e5c20e051c Update to look for segment io key in auth data. 2013-06-14 14:28:38 -04:00
Nate Hardison
224d0074fd Merge pull request #96 from edx/nate/fix-missing-faq-route 
Replace /faq route in LMS urls
 2013-06-14 08:09:42 -07:00
Valera Rozuvan
72d7c9ca97 Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if. 2013-06-14 11:12:32 +03:00
Alexander Kryklia
9f4dcbcd1b disables pylint warning for lettuce tests syntax 2013-06-14 11:12:32 +03:00
Valera Rozuvan
4c544d6f49 Added lettuce tests for autoplay in videoalpha. 2013-06-14 11:12:32 +03:00
Valera Rozuvan
66e106a9e2 Copied autoplay attribute from video xmoudle to videoalpha. Now students will have the video autoplaying, and in Studio it will be pause by default. 2013-06-14 11:12:32 +03:00
Christina Roberts
9e0997d3c8 Merge pull request #111 from edx/feature/christina/unify-fields 
Move "stringy" functionality into xblock fields
 2013-06-13 13:49:14 -07:00
cahrens
d42736708c Merge branch 'master' into feature/christina/unify-fields 2013-06-13 16:19:13 -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
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
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
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
e0d
273df4e113 added pylint ignores, fixed missing import 2013-06-12 11:24:28 -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
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
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
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
dcadams
0b4e03e8bc Merge pull request #66 from edx/feature-dcadams-usermanagement 
Feature user-management autoenroll
 2013-06-10 10:10:57 -07:00
Calen Pennington
6c24694a7c Fix tests that vary urls.py 
Create a mixin class that can be used for tests that customize urls.py
to force django to reload it, so that they don't break other tests.
 2013-06-10 10:56:50 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -04:00
caesar2164
3fe830a803 Merge pull request #98 from edx/giulio/fix-image-urls 
move url() wrapper into SASS variable
 2013-06-07 09:53:01 -07:00
Greg Price
2c29481611 Merge pull request #106 from edx/release 
Merge hotfix-2013-06-07
 2013-06-07 08:05:58 -07:00
Greg Price
625a9581eb Fix XSS vulnerability in instructor dashboard 2013-06-07 10:23:03 -04:00
e0d
6cf7d26381 Merge pull request #95 from edx/fix/e0d/no-name-e 
fixing bug noticed in production
 2013-06-07 07:13:39 -07:00
Valera Rozuvan
d9651d7497 GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info. 2013-06-07 16:12:50 +03:00
Giulio Gratta
7104937fb8 move url() wrapper into SASS variable 2013-06-06 17:54:41 -07:00
Nate Hardison
b05ff885fa Replace /faq route in LMS urls 
This route was mistakenly removed by the theming changes since the
"FAQ" marketing link actually points to help_edx, not faq_edx.
 2013-06-06 14:18:08 -07:00