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

5355 Commits

Author SHA1 Message Date
Ben Patterson
4db5b31138 Don't use 'test' db for mysql since it's reserved. 
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.

Conflicts:
	scripts/reset-test-db.sh
 2014-11-17 11:28:23 -05:00
Adam
9a6acf2dff Merge pull request #5837 from edx/adam/sandbox 
change djfs settings not to throw an error when the app starts up
 2014-11-07 13:49:53 -05:00
Mark Hoeber
831453c531 Merge pull request #5817 from edx/markhoeber-1138 
Export Template Update with Caution
 2014-11-07 09:39:03 -05:00
Mark Hoeber
5015aa5515 Export Template Update with Caution 2014-11-07 09:38:27 -05:00
Christina Roberts
fd587b976c Merge pull request #5710 from edx/christina/general-component-errors 
Support validation messages for any xblock (on container page).
 2014-11-06 16:47:49 -05:00
Brian Talbot
181715f200 Studio: revising xblock validation message list styling 2014-11-06 15:49:10 -05:00
Brian Talbot
31dce7671e Studio: revising element-level xblock information styling 2014-11-06 15:49:10 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page. 
TNL-683
 2014-11-06 15:48:55 -05:00
David Baumgold
f0a37cf43a Merge pull request #5841 from edx/cms-consistent-branding-image-names 
Rename Studio logo
 2014-11-06 14:56:31 -05:00
Adam Palay
459e4696c0 change djfs settings not to throw an error when the app starts up 2014-11-06 13:56:33 -05:00
Don Mitchell
396a8aca07 Remove multi-threading test as unnecessary and flakey 
also fix other users of check_mongo_calls to use None if they don't care about sends
PLAT-239
 2014-11-06 13:22:48 -05:00
David Baumgold
cfaa9dd588 Rename Studio logo 
OPEN-301
 2014-11-06 09:34:17 -05:00
Don Mitchell
fc83c299ca Generalize assets to any block_type but using 
AssetKey and the metadata store
PLAT-204
 2014-11-05 16:01:50 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements 
Unit Test Improvements
 2014-11-05 19:55:39 +05:00
Sarina Canelake
fece2b9dd2 Merge pull request #5821 from edx/sarina/remove-old-admin-files 
Remove admin files deprecated in Django 1.4
 2014-11-04 10:55:13 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
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
Sarina Canelake
ed76907c0d Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4

Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
 2014-11-01 00:01:17 -04: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
muhammad-ammar
fcaa783e43 Unit Test Improvements 
TE-489
 2014-10-31 11:55:13 +00: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