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

14519 Commits

This Branch
This Branch
All Branches
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
1ef29053ba Merge pull request #167 from edx/feanil/segment_io_lms 
Update to look for segment io key in auth data.
 2013-06-14 12:12:57 -07:00
Feanil Patel
e5c20e051c Update to look for segment io key in auth data. 2013-06-14 14:28:38 -04:00
Peter Baratta
5b388f52c1 Merge pull request #125 from edx/pbaratta/calc-add-trig 
Simplify calc.py; add trig/other functions
 2013-06-14 10:08:09 -07:00
Feanil Patel
5b793bb6ad Merge pull request #141 from edx/feanil/sass_unicode 
Default to unicode for sass compilation.
 2013-06-14 10:06:23 -07: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
David Baumgold
ce70b00f98 Merge pull request #145 from edx/feature/db/rake-coffee-clobber 
remove compiled coffeescript files before recompiling with rake
 2013-06-14 06:50:36 -07:00
Valera Rozuvan
0f6e259439 Merge pull request #127 from edx/anton/fix_event_tracking 
Add additional events for tracking
 2013-06-14 01:38:40 -07:00
Anton Stupak
74426bdcc6 Add tracking of additional events 2013-06-14 11:30:21 +03:00
Valera Rozuvan
89da47a134 Merge pull request #138 from edx/valera/bugfix_firefox_videoalpha_speed_1 
force-refresh youtube iframe when changing speeds back to 1.0 in firefox
 2013-06-14 01:28:59 -07:00
Valera Rozuvan
2568a9b881 Merge pull request #123 from edx/valera/no_autoplay_videoalpha_studio 
Valera/no autoplay videoalpha studio
 2013-06-14 01:14:08 -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
Valera Rozuvan
754be2caa1 If Video Alpha is playing a YouTube video in Firefox in HTML5 mode, then when switching to speed 1.0 it will simply reload the iframe, instead of using the built-in method to change the speed. The fixes the bug temporarily, while the YouTube team fixes the bug internally in the API. Commented additions to fix YouTube firefox speed 1.0 switch bug. 2013-06-14 11:11:37 +03:00
David Baumgold
a6bcb797b0 remove compiled coffeescript files before recompiling with rake 
This prevents inapplicable tests from running when switching branches
 2013-06-13 16:51:24 -04: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
David Baumgold
10f29dfc16 Merge pull request #158 from edx/feature/db/rake-jasmine-watch 
Added rake jasmine:cms:browser:watch command
 2013-06-13 13:48:57 -07:00
Peter Baratta
ab700e6352 Add CHANGELOG message 2013-06-13 16:46:17 -04:00
Peter Baratta
bd1f912125 Merge branch 'master' into pbaratta/calc-add-trig 2013-06-13 16:43:27 -04:00
Peter Baratta
46686d8f7d Quick fixes in calc.py 
Especially the var[0].isdigit() one.
 2013-06-13 16:38:43 -04:00
Calen Pennington
0667150f4e Merge pull request #157 from edx/feature/cale/remove-stores-state 
Remove the stores_state field from XModule
 2013-06-13 13:26:09 -07:00
cahrens
c5fd4044f2 Update for ModelType ("Stringy" version) change. 2013-06-13 16:21:32 -04:00
cahrens
d42736708c Merge branch 'master' into feature/christina/unify-fields 2013-06-13 16:19:13 -04:00
David Baumgold
03f02bcf24 Added rake jasmine:cms:browser:watch command 2013-06-13 14:57:54 -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
Ned Batchelder
75cbc4dbbb Merge pull request #154 from edx/ned/adding-changelog 
Starting the CHANGELOG process.
 2013-06-13 11:16:11 -07:00
Ned Batchelder
a7df1a1d9d Starting the CHANGELOG process. 2013-06-13 14:15:11 -04:00
cahrens
c01041938c Upgrade xblock version to get strict ModelTypes. 2013-06-13 13:33:30 -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
5c94acaaf9 Merge pull request #149 from edx/renzo/segment-io-fix 
dummy object creation without conditionals
 2013-06-13 08:58:31 -07:00
Renzo Lucioni
b57abec48e added my name and email to AUTHORS 2013-06-13 11:57:26 -04:00
Peter Baratta
662c577951 Undo change to jenkins/test.sh in anticipation of merge 
Original change: SHA 58e98d
This was resolved by merging in Cale's branch
  https://github.com/edx/edx-platform/pull/44
 2013-06-13 11:36:21 -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
cahrens
dac174e448 Merge cleanup. 2013-06-13 11:31:18 -04:00
cahrens
9d0867ea11 Merge cleanup. 2013-06-13 11:31:10 -04:00
cahrens
c7e37887b3 Merge updates. 2013-06-13 11:22:34 -04:00
Peter Baratta
5735ccaad5 Address Sarina's comments from the PR 
-Clean up `SUFFIXES` from interspersed commented-out suffixes
-Remove unused `LOG`
-Remove unused method `raiseself` of UndefinedVariable and its usage
 2013-06-13 11:16:18 -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
cahrens
0f8d7c744c Test cleanup. 2013-06-13 10:42:23 -04:00
James Tauber
d4d92135ca Merge pull request #119 from kern3020/master 
Fix formatting problem in README.md
 2013-06-13 07:40:26 -07:00
Ned Batchelder
86cdc06d82 Merge branch 'release' 
message to explain why this merge is necessary,
 2013-06-13 10:35:56 -04:00
Peter Fogg
d52329be23 Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting 
Make video captions respect course author's setting.
 2013-06-13 06:32:33 -07:00
cahrens
6e92ddf3dd Cannot set String field to a dict anymore! 2013-06-12 17:07:41 -04:00
cahrens
89d0003603 Be strict about ModelType expected types, rename Object as Dict. 2013-06-12 14:59:17 -04:00
Calen Pennington
25aec96e86 Merge pull request #124 from edx/fix/cale/test-ruby-install 
Do a bundle install before trying to use rake, so that we have all the p...
 2013-06-12 11:30:10 -07:00