Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,093 Commits 1 Branch 0 Tags
91f6481e6de52271ee1cd9b7ac2bc081bbab124d
Commit Graph

4094 Commits

Author SHA1 Message Date
Calen Pennington
aa57481ecc Add handler_url usable by descriptors 
[LMS-1614]
 2013-12-20 14:05:53 -05:00
Brian Talbot
93d7dfb6b0 Merge pull request #1956 from edx/talbs/studio-fonts 
Studio: Updating Google Font Syntax
 2013-12-20 10:20:36 -08:00
Christina Roberts
3c0df16b0c Merge pull request #2004 from edx/christina/fix-thumbnail-warning 
Properly format errors/warnings.
 2013-12-20 10:11:12 -08:00
Ned Batchelder
dfb04bc4c9 Merge pull request #2017 from edx/ned/i18n-minor-improvements 
Minor i18n improvements
 2013-12-20 10:03:06 -08:00
Don Mitchell
6c4aae731a Merge pull request #1980 from edx/dhm/locator_block_id 
Rename BlockUsageLocator's block_id field from usage_id
 2013-12-20 08:52:46 -08:00
Don Mitchell
a46e112a04 Improve test coverage 
and fix found errors.
 2013-12-20 10:44:01 -05:00
Ned Batchelder
c37ab38599 Remove needless non-package non-specs from urls.py 2013-12-20 10:26:34 -05:00
zubair-arbi
ef51f74a36 Merge pull request #1749 from zubair-arbi/zub/bugfix/std823-addbaseview 
Added baseview(extended from backbone view), which can further extended ...
 2013-12-20 06:37:58 -08:00
Will Daly
d23f48f573 Merge pull request #2002 from edx/will/rebalance-shards 
Rebalance acceptance test shards
 2013-12-20 05:45:22 -08:00
Zubair Afzal
a6fbcbd781 Add baseview(extended from backbone view), which can further extended by other views + Add fucntion to modify iframe and embed tags + add related tests 
STUD-823
 2013-12-20 18:38:24 +05:00
cahrens
65756bbf94 Properly format errors/warnings. 
STUD-1063
 2013-12-19 16:52:20 -05:00
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
polesye
042cb5c698 BLD-206: Add template for the zooming image in Studio. 2013-12-19 21:47:32 +02:00
Will Daly
28e25b75ff Rebalance acceptance test shards 2013-12-19 10:41:45 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor 
Stub Server Port Conflicts and Refactor
 2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain 
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
 2013-12-19 09:12:41 -05:00
Julia Hansbrough
0d91e61e60 Added flag for lms-specific functionality 
Studio doesn't do email changes, thus has no email reset template; thus, we must disable password/email-reset related tests when running with studio settings
 2013-12-18 14:18:12 -05:00
Don Mitchell
94d3a73aed Merge pull request #1982 from edx/dhm/doc_store_config 
Move default DOC_STORE_CONFIG to common
 2013-12-18 07:33:31 -08:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
Brian Talbot
10ca08facb Studio: updating font face imports 
* since Sass can now process @import rules
* to simplify the number of external calls
* maintains the http/https agnostic work
* removes unused Bree Serif font face
 2013-12-17 15:52:25 -05:00
Christina Roberts
461b805951 Merge pull request #1951 from edx/christina/fix-xhr 
Workaround for "xhr.restore" failures.
 2013-12-17 12:23:10 -08:00
cahrens
0ef923e043 Add documentation. 2013-12-17 13:22:32 -05:00
Don Mitchell
5f2517978d Move default DOC_STORE_CONFIG to common 2013-12-17 13:09:38 -05:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id 
usage_id implies self-sufficiency. The block_id is relative to its structure.
 2013-12-17 12:15:32 -05:00
frances botsford
8a23f432c7 Merge pull request #1896 from edx/frances/fix/studio-outline-cleanup 
FED Cleanup of Studio Outline page
 2013-12-17 07:27:14 -08:00
Anton Stupak
8554c3f0ab Merge pull request #1914 from edx/anton/show-answer-imageresponse 
Show answer for imageresponse
 2013-12-17 07:12:25 -08:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
Zubair Afzal
8fc0590a12 set default value for empty integer/float fields 
STUD-894
 2013-12-17 14:45:33 +05:00
cahrens
9f91935f63 Do not restore sinon global objects in afterEach. 
STUD-1040
 2013-12-16 17:22:05 -05:00
Frances Botsford
1618c916bb fix for duplicate drag and drop indicators on studio outline page 2013-12-16 15:30:42 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Frances Botsford
2d678d0c5e Responding to review feedback on studio outline cleanup 
Bug fix for dragging past last element in list.
STUD-879
 2013-12-16 12:52:33 -05:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Will Daly
7bf68907f3 Merge pull request #1935 from edx/will/ignore-symlink-staticfiles 
Add ignore patterns for staticfiles to avoid processing symlink dirs
 2013-12-16 09:01:17 -08:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -05:00
Carson Gee
ccc87337d6 Add sysadmin dashboard 
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
 2013-12-15 19:06:05 -05:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries 
STUD-1039
 2013-12-13 14:34:34 -05:00
Don Mitchell
f4beb8b8c3 Reduce sql queries for groupname tests. 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-13 14:33:11 -05:00
Christina Roberts
17b5c2126c Merge pull request #1910 from edx/christina/locations 
Create explicit Locations.
 2013-12-13 09:18:21 -08:00
Bertrand Marron
ddff90c1cb Fix auth email configuration 
Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.
 2013-12-13 17:02:50 +01:00
Nick Parlante
6dc98391eb Merge pull request #1939 from edx/nick/no-apostrophe 
Mention " vs. '  in advanced settings help
 2013-12-12 14:02:52 -08:00
Sarina Canelake
8e67645d1a Merge pull request #1919 from tusbar/studio-email-config 
Add email configuration to cms/envs/aws.py
 2013-12-12 13:48:24 -08:00
Nick Parlante
0931e5fbe2 Mention " vs. ' syntax in help text 
Not that I could ever make such a bonehead error!
 2013-12-12 11:53:52 -08:00
Will Daly
4c842409f7 Add ignore patterns for staticfiles to avoid processing symlink dirs 2013-12-12 10:33:38 -05:00
e0d
7be524d769 Removing duplicated initialization code. 2013-12-11 12:59:07 -05:00
Bertrand Marron
f576673a87 Add email configuration to cms/envs/aws.py 
This allows emails to be sent by Studio.
 2013-12-11 16:11:23 +01:00
Bertrand Marron
4e641b946d Add default email settings 
These are the django default settings.
 2013-12-11 16:11:23 +01:00
cahrens
ec55d8c1a9 Create explicit Locations. 
STUD-1030
 2013-12-11 10:03:34 -05:00
David Baumgold
2bc4198760 Merge pull request #1853 from edx/db/update-comments 
Updating comments and docs for MITx -> edX transition
 2013-12-10 11:10:37 -08:00