Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,026 Commits 1 Branch 0 Tags
673d4fbccbbcedf8070c93faaf700d99e3eff5cb
Commit Graph

5372 Commits

Author SHA1 Message Date
David Baumgold
559f1e194e Merge pull request #5941 from edx/studio-images 
Moved Studio images from img/ directory to images/ directory
 2014-11-14 10:33:26 -05:00
Ben Patterson
a19b97c61f 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.
 2014-11-13 14:41:50 -05:00
David Baumgold
e00424a091 Moved Studio images from img/ directory to images/ directory 
OPEN-304
 2014-11-12 17:19:23 -05:00
Greg Price
dec9e41d1b Merge pull request #5853 from edx/gprice/fix-complementary 
Fix spelling of complementary role
 2014-11-12 14:36:35 -05:00
Christina Roberts
24039fb813 Merge pull request #5881 from edx/christina/notification-requirejs 
Use factory file so JS used by studio_xblock_wrapper.html goes through RequireJS Optimizer
 2014-11-12 09:08:05 -05:00
stv
cb894cf35e Fix PEP8: E261 at least two spaces before inline comment 2014-11-10 19:31:09 -08:00
stv
16afc89b9b Fix PEP8: E241 multiple spaces after ',' 2014-11-10 19:31:09 -08:00
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
00ae488960 Fix PEP8: E225 missing whitespace around operator 2014-11-10 19:30:18 -08:00
Carson Gee
d02747ff60 Merge pull request #5910 from mitocw/cg/git_export_error_output 
Correct unresolved ugettext_lazy error strings in git_export command
 2014-11-10 16:33:51 -05:00
Carson Gee
3816ac2ab0 Correct unresolved ugettext_lazy error strings in git_export command 2014-11-10 15:23:08 -05:00
stv
5677b143db Fix PEP8: W391 blank line at end of file 2014-11-10 11:00:18 -08:00
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
cahrens
ddc0015cdf Clarify types of Python values. 2014-11-10 13:42:11 -05:00
cahrens
99c4413bd0 Simply check for existing text and type. 2014-11-10 13:13:48 -05:00
cahrens
c550963fb9 Set up validation_messages so that it goes through the RequireJS optimizer. 2014-11-10 13:13:44 -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
Greg Price
067e270a84 Fix spelling of complementary role 2014-11-05 15:48:51 -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