Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,154 Commits 1 Branch 0 Tags
9e58ef692dc2a169bf55df458da0e5bf0a5554e1
Commit Graph

22154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carson Gee
9e58ef692d fix raw grade dump in standard instructor dashboard 
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
 2014-03-28 11:10:14 -04:00
Usman Khalid
e1afbe5011 Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes 
Unicode support fixes
 2014-03-28 20:08:27 +05:00
Dave St.Germain
3e9d1b395e Merge pull request #3097 from edx/dcs/paver-reqs 
Reduce false cache misses when evaluating prerequisites
 2014-03-28 09:40:35 -04:00
Nimisha Asthagiri
2561c0106e Merge pull request #3064 from edx/nimisha/studio-reorder-and-hide-tabs 
Nimisha/studio reorder and hide tabs
 2014-03-28 06:55:54 -04:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page. 
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
 2014-03-28 05:41:32 -04:00
Brian Talbot
3b0f71482e Studio - revising markup, templates and styling for page editing UI: 
* added in fixed state markup/logic
* added in collection markup/logic
* revised styling for page titles, collection, and fixed elements
 2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Valera Rozuvan
6bcae9aa94 Merge pull request #3085 from edx/valera/make_youtube_mocked_server_serve_youtube_api 
Make YouTube mocked server serve YouTube API
 2014-03-28 11:10:40 +02:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API 
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
 2014-03-28 10:34:34 +02:00
Valera Rozuvan
b35994f12e Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc 
Update doc string for YouTube stub server.
 2014-03-28 09:15:35 +02:00
Dave St.Germain
59333915c6 Reduce false cache misses when evaluating prerequisites 2014-03-28 00:23:23 -04:00
Alison Hodges
30f7f1cfa1 Merge pull request #3071 from edx/ahodges/documentation/bulkbeta 
LMS-1287: Added section for batch add of beta testers
 2014-03-27 17:50:18 -04:00
Alison Hodges
8e41323588 LMS-1287: Added section for batch add of beta testers 2014-03-27 17:48:59 -04:00
Dave St.Germain
a6bde7cc9e Fix broken test due to refactoring. 2014-03-27 16:44:07 -04:00
Dave St.Germain
a820b3f7a8 Merge pull request #2793 from edx/dcs/mat-17 
Add an option to prevent multiple logins of the same user.
 2014-03-27 16:12:45 -04:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Valera Rozuvan
f03a94b0f2 Update doc string for YouTube stub server. 
Included information on how to launch the server
on its own.
EOF
 2014-03-27 21:21:38 +02:00
Valera Rozuvan
6517b06708 Merge pull request #3092 from edx/valera/fix_tender 
Fix failing tender.
 2014-03-27 21:15:12 +02:00
Valera Rozuvan
e50fad6475 Fix failing tender. 2014-03-27 20:36:08 +02:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Valera Rozuvan
0e2e19e066 Update testing.md file. 
How to run Python tests for stub servers.
 2014-03-27 20:01:56 +02:00
David Baumgold
012f3f14f4 Merge pull request #3082 from edx/db/rake-coffee-to-paver-skip-collect 
Skip collectstatic when falling through from rake assets:coffee
 2014-03-27 13:20:03 -04:00
Mark Hoeber
fffe1c4ad1 Merge pull request #3069 from edx/markhoeber/documentation/doc-196 
Markhoeber/documentation/doc 196

Release notes for 3/27/14
 2014-03-27 11:10:45 -04:00
Mark Hoeber
ca63c67f8e Release notes 3/26/14 
DOC-196
 2014-03-27 10:48:55 -04:00
Carson Gee
26f133904c Merge pull request #3083 from carsongee/cg/git_export_lazy_translation_fix 
Properly get lazily translated exception message
 2014-03-26 23:24:52 -04:00
Carson Gee
2c03c63990 Properly get lazily translated exception message 2014-03-26 21:46:22 -04:00
David Baumgold
450592f0ba Skip collectstatic when falling through from rake assets:coffee 2014-03-26 21:09:20 -04:00
David Baumgold
97f30aaedf Merge pull request #3081 from edx/sef/paver-fix-devstack-theme 
fix paver theming on devstack (SERVICE_VARIANT support)
 2014-03-26 19:49:38 -04:00
Sef Kloninger
6ed59014d5 fix paver theming on devstack (SERVICE_VARIANT support) 
When running in devstack, you need to set the SERVICE_VARIANT so that
assets.py knows what environment file to use.  Recall that in devstack
we have all our settings in ../lms.env.json, not just ../env.json.  So
you need to run like this:

    SERVICE_VARIANT=lms paver lms --settings=devstack

Previously you'd get this error:

    Warning: could not find environment JSON file at 'lms.env.json'

Note there is no path on the file, that's the bug.  By making
self.REPO_ROOT absolute, we can walk up the tree and correctly find
the file, which is /edx/app/edxapp/lms.env.json fwiw.
 2014-03-26 16:28:54 -07:00
David Baumgold
7c5ff94e23 Merge pull request #3075 from edx/db/paver-find-theme-dir 
Help paver find the theme directory
 2014-03-26 17:54:28 -04:00
David Baumgold
37c4cb360a Help paver find the theme directory 2014-03-26 17:51:45 -04:00
Piotr Mitros
5f9ef9a402 Concept added to Studio advanced components 2014-03-26 16:37:45 -04:00
Adam
2e174f2aa7 Merge pull request #3070 from edx/adam/middleware 
wiki middleware fix (LMS-2461)
 2014-03-26 16:36:17 -04:00
Mark Hoeber
704024f8a5 Merge pull request #2928 from edx/markhoeber/documentation/stud-1347 
Documentation for changes to static pages
 2014-03-26 14:24:03 -04:00
David Baumgold
2d452d8bb2 Merge pull request #3005 from singingwolfboy/db/paver 
Paver v3
 2014-03-26 13:41:05 -04:00
Christina Roberts
e394a19222 Merge pull request #3067 from edx/christina/revert_tinymce 
Revert to older version of TinyMCE.
 2014-03-26 13:14:37 -04:00
Mark Hoeber
8cbdfbafe2 Documentation for static page changes 
STUD-1347
 2014-03-26 11:14:48 -04:00
David Baumgold
c79ddd7322 Merge pull request #3048 from louyihua/master 
Make emails in lms translatable
 2014-03-26 11:08:15 -04:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE. 
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
 2014-03-26 11:06:59 -04:00
louyihua
0316f3b758 i18n: make emails in lms translatable 
The email texts in lms/templates/emails are not extracted by rake i18n:generate because the babel_mako.cfg does not include them.
And a several emails are not translatable because they do not use ugettext.
 2014-03-26 22:33:21 +08:00
Valera Rozuvan
2cb94d82d3 Merge pull request #3047 from edx/valera/add_ipdb_requiement 
Removing ipython from edx dependencies
 2014-03-26 16:32:29 +02:00
Usman Khalid
76e592634a Some more str->unicode fixes in instructor and courseware apps. 
LMS-2429
 2014-03-26 18:57:02 +05:00
Waheed Ahmed
62fdf33c6f Merge pull request #2938 from edx/waheed/lms2167-show-submission-history-not-internationalized 
Internationalized submission history view.
 2014-03-26 18:31:41 +05:00
Valera Rozuvan
674345931e Removing ipython from edx dependencies. 
Ipython is not strictly required to run edx-platform. It can
be setup as part of Vagrant provision scripts, or manually
by each developer as required in specific cases.
 2014-03-26 12:16:14 +00:00
Anton Stupak
de72759cf2 Merge pull request #3033 from edx/anton/fix-flaky-video-acceptance-tests 
Video: Fix flaky acceptance tests.
 2014-03-26 13:57:57 +02:00
polesye
a1c957ecd3 BLD-951: Fix flaky tests. 2014-03-26 11:45:17 +02:00
Waheed Ahmed
94af663683 Submission history view not internationalized. 
LMS-2167
 2014-03-26 13:14:02 +05:00
jmclaus
2c0636da8d Merge pull request #3055 from edx/jmclaus/feature_iframe_template 
Added template for iFrames. [BLD-611]
 2014-03-26 05:58:59 +01:00
jmclaus
61752e69ff Added template for iFrames. [BLD-611] 2014-03-26 05:03:43 +01:00
Andy Armstrong
2a3509f798 Merge pull request #3046 from edx/andya/fix-xblock-loading-in-studio 
Fix Studio's XBlock dependency loading issues
 2014-03-25 17:25:57 -04:00