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

19363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
9b749c4201 add ajax callback entry point to remove the asset 2013-06-17 11:09:52 -04:00
Chris Dodge
3fa6e77dff add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan 2013-06-17 11:09:52 -04:00
Don Mitchell
48ee275799 Fix a few remaining tz naive dates 
And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
 2013-06-17 11:09:26 -04:00
Renzo Lucioni
1e3efadc28 switch to using environment variables to get key for Segment.io 2013-06-17 10:58:37 -04:00
Renzo Lucioni
7518f32f5e Instrument sequentials with segment-io so we know when people switch tabs manually or using the arrows to navigate 2013-06-17 10:30:17 -04:00
Valera Rozuvan
67bcbe228b Merge pull request #178 from edx/valera/adding_changeleog_info 
Added info to changelog for recent pull requests.
 2013-06-17 06:44:45 -07:00
Valera Rozuvan
3ea9f79132 Merge pull request #179 from edx/valera/additional_comments_on_youtube_api_bug 
Addtional comments for YouTube API bug.
 2013-06-17 06:44:23 -07:00
John Jarvis
d1ebfbc9b5 Merge pull request #180 from edx/jarv/fix-segment-io 
fixing segment io settings bug
 2013-06-17 06:09:01 -07:00
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
Valera Rozuvan
184c0a5c40 Added comment regarding the fact that the temporary bug fix should be eventually removed. 2013-06-17 09:17:48 +03:00
Valera Rozuvan
bb70907e20 Added info to changelog for recent pull requests. 2013-06-17 08:48:55 +03:00
Jason Bau
da2fda1045 Fix for broken forums due to forum entry with no start_date 
modification of @jrbl's version to handle a dict with value None
 2013-06-15 01:30:42 -07:00
Peter Fogg
d8f307a50b Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-14 15:33:51 -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
cahrens
2cf71b7ff3 Add helper method for typing in CodeMirror, make it robust to Mac and Unix. 2013-06-14 15:12:25 -04:00
marco
163610d557 updated pinning icons and removed images 2013-06-14 15:10:17 -04:00
marco
d5105b7a4b updated flag icons to be font-awesome based 2013-06-14 15:04:39 -04:00
marco
b9d97e468c removed new post icon and added font-awesome replacement 2013-06-14 14:42:16 -04:00
Peter Fogg
e0045499f3 Update acceptance test. 2013-06-14 14:41:33 -04:00
Feanil Patel
e5c20e051c Update to look for segment io key in auth data. 2013-06-14 14:28:38 -04:00
cahrens
21dc4d863e Put back in some older code to save source_code property. 2013-06-14 14:10:40 -04:00
Peter Fogg
6035d0a23a Addresses latest comments on pull request #132. In particular: 
- Make 1.0x speed default Youtube ID Lyla's introduction video.
- Add acceptance tests for toggling captions on/off.
- Move captions settings acceptance tests into video-editor.feature.
- Rename acceptance test methods to reflect their function.
- Remove undefined variable from video Jasmine tests.
- Test VideoDescriptor.from_xml when no attributes are set.
- Convert Stringy* to non-Stringy equivalents.
- Test parsing of Youtube ID strings and times in more cases.
- Remove some commented-out code.
 2013-06-14 14:08:28 -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
marco
b6c4cc4a63 new post button using font-awesome 2013-06-14 11:44:48 -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
Peter Fogg
206f582503 Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml. 2013-06-14 10:44:05 -04: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
JonahStanley
daf5ef146e Fixed weird issue of needed to sometimes first find then click instead of css_click 2013-06-13 16:33:39 -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
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