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

5336 Commits

Author SHA1 Message Date
David Baumgold
688d4c968a Merge pull request #4806 from edx/talbs/studio-stylesweep-unused 
Studio: Removing older/deprecated style rules
 2014-11-03 13:36:05 -05:00
Christina Roberts
7f98540e21 Merge pull request #5808 from edx/zub/bugfix/tnl-138-createunitthrowserror 
fix click event for actual target
 2014-11-03 10:36:17 -05:00
zubair-arbi
dd71ca0f8a fix click event for actual target 
TNL-138
 2014-11-03 09:37:02 -05:00
Feanil Patel
7d2a2f896c Merge pull request #5291 from fmyzjs/s3_storgae 
When s3fs cannot be accessed replaced with osfs
 2014-10-31 09:52:02 -04:00
David Baumgold
2a669e57b9 re-add search-icon.png 2014-10-30 16:25:36 -04:00
Adam
75fab0ccfd Merge pull request #5538 from edx/adam/generalized-draft-import-export-2 
Adam/generalized draft import export 2
 2014-10-30 13:53:57 -04:00
David Baumgold
7141e4851b content-types is no longer around 2014-10-30 13:52:31 -04:00
David Baumgold
6577138dff Removed more files from cms 2014-10-30 13:41:30 -04:00
David Baumgold
766fac735f Remove extra large-FOO-icon.png files 2014-10-30 13:34:53 -04:00
Daniel Friedman
355a3b45ad Merge pull request #5764 from edx/dan-f/highlight-active-unit-in-outline 
Highlight active unit in studio container page's outline
 2014-10-30 13:13:34 -04:00
Adam Palay
a6c31fc46b generalize draft import/export TNL-574 
add test for videomodule

Import drafts handles modules w/o xml_attributes
and ones using the old parent_sequential_url pointer

Handle drafts for modules which don't define nor extract xml_attributes

Support  and  in get_items qualifiers

Unit test for   value query
 2014-10-30 12:22:05 -04:00
David Baumgold
22ed23ae8d deleting more things 2014-10-30 12:07:58 -04:00
Brian Talbot
ee368e8740 Studio: cleaning up/removing unused sass 
* removing unused font-family-centric Sass variables
* removing unused graphic images and Sass references
* clean up of style removal fallout
 2014-10-30 12:07:52 -04:00
Daniel Friedman
3b3b3dcd9e Show current unit in unit outline. 
TNL-291
 2014-10-30 11:08:49 -04:00
Brian Talbot
a4e1cc483b Studio: correcting minor Sass indent and property syntax issues 2014-10-30 11:08:49 -04:00
Brian Talbot
d88dcfbd7e Studio: visually styling current unit on course unit/container view's mini outline 2014-10-30 11:08:49 -04:00
John Eskew
c9071353fd Merge pull request #5742 from edx/jeskew/asset_manager_read_wrapper 
Wrap all asset read operations.
 2014-10-28 15:57:28 -04:00
John Eskew
786a32e7cf Wrap all asset read operations. 
First step in moving assets out of the contentstore (optionally).
https://openedx.atlassian.net/browse/PLAT-77
 2014-10-28 14:20:36 -04:00
zubair-arbi
f7d6060276 Merge pull request #5658 from edx/zub/bugfix/tnl-554-conflictingimportmessages 
show warning on navigate away from import page only for first two stages
 2014-10-28 18:56:23 +05:00
Waheed Ahmed
41d2fa1a5e Fixed upload button on high level source editing popup. 
TNL-222
 2014-10-28 13:02:57 +05:00
Jason Zhu
4e528140f8 When s3fs cannot be accessed replaced with osfs 2014-10-28 00:01:55 +08:00
Sarina Canelake
3d1c54fefa Merge pull request #5595 from Stanford-Online/caijim/resetbutton 
Support and tests for adding a reset button to units
 2014-10-24 11:49:24 -04:00
zubair-arbi
293ac9277a show warning on navigate away from import page only for first two stages 
TNL-554
 2014-10-24 16:22:33 +05:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Jim
6d19a0c87c Support and tests for adding a reset button to units 
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
 2014-10-23 12:14:27 -07:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer 
Add RequireJS Optimizer.
 2014-10-23 15:29:42 +03:00
Don Mitchell
00ca7cbde5 Merge pull request #5649 from edx/dhm/update_ok 
Update opaque_keys to new release
 2014-10-22 09:42:29 -04:00
Don Mitchell
2ac069a6ae Merge pull request #5653 from edx/dhm/PLAT-189 
Add command line command to create course in either split or mongo
 2014-10-22 09:41:55 -04:00
Don Mitchell
0d36dd7264 Merge pull request #5646 from edx/dhm/migrate_bug 
Fix command line migrator
 2014-10-21 16:55:59 -04:00
Don Mitchell
a4d13dc42c Add command line command to create course in either split or mongo 
PLAT-189
 2014-10-21 16:34:36 -04:00
Ben Patterson
bf0378f39f Merge pull request #5669 from edx/benp/solano2-flaky-couse-export 
Add wait to fix flaky tests.
 2014-10-21 15:31:01 -04:00
Ben Patterson
f3facddee6 Add wait to fix flaky tests. 2014-10-21 14:21:42 -04:00
Don Mitchell
f89a6944de Re-enable the unit tests and fix 2014-10-21 13:14:21 -04:00
Don Mitchell
98f962274c Update opaque_keys to new release 2014-10-21 09:30:33 -04:00
Oleg Marshev
f5294358a6 Do not deprecate giturl. 2014-10-21 13:21:38 +03:00
Brian Talbot
d238fa1477 Studio: resolving a display issue for longer usernames in Studio's navigation 2014-10-20 16:55:14 -04:00
Jesse Zoldak
1d7c8d39b2 Update js-test config with new sources 2014-10-20 15:23:34 -04:00
Don Mitchell
4fc8ed8e7a Fix command line migrator 2014-10-20 14:34:33 -04:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references 
Remove references to /tmp in tests
 2014-10-17 12:12:53 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests 
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
 2014-10-17 10:00:12 -04:00
cahrens
d3012af733 Do not save an xblock after rendering the Studio view. 
TNL-399

Content and settings are no longer saved when Studio view is rendered.
 2014-10-17 09:29:32 -04:00
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00
David Baumgold
eba03512d5 Replace course status message 2014-10-15 11:35:56 -04:00
David Baumgold
0f07bad3ed Some strings were missing i18n calls 2014-10-15 11:35:56 -04:00
Brian Talbot
0a633eaf09 Studio: resolving post-course rerun outline UI alert icon display issue 
UX-1054
 2014-10-14 14:09:15 -04:00