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

22123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Andy Armstrong
a37d2c1b93 Fix Studio's XBlock dependency loading issues 
STUD-1465

Changed the XBlock rendering logic to use promises to track asynchronous tasks.
Each dependency is then only loaded once the previous one has completed, and the
XBlock initialization only happens once all dependencies are loaded. This gives
XBlocks the same semantics in Studio as they get when shown directly on a page.
 2014-03-25 16:36:06 -04:00
David Baumgold
4801b4b392 Merge pull request #3060 from edx/db/display-error-pages 
Display error page templates, for testing purposes
 2014-03-25 15:36:51 -04:00
David Baumgold
f5f7b77d4e Display error page templates, for testing purposes 
This commit allows us to test the server error template by visiting `/500`. This
way, we can catch errors in our error templates, instead of having infinitely
recursing errors.
 2014-03-25 14:55:14 -04:00
David Baumgold
64265ee58a Merge pull request #3032 from IONISx/feature-enable-mktg-site-is-missing 
Added ENABLE_MKTG_SITE to Features
 2014-03-25 13:22:28 -04:00
Piotr Mitros
65faf178eb Merge pull request #3057 from edx/pmitros/concept-xblock-prototype 
Concept XBlock prototype

Test environment taking a little longer than expect. Jarv said okay to merge, so merging,
 2014-03-25 12:28:52 -04:00
Piotr Mitros
20805974cd Merge 2014-03-25 12:28:02 -04:00
David Baumgold
820924fd83 Insert *right* at the front 2014-03-25 11:32:20 -04:00
David Baumgold
1219bd757e Pull Paver requirements out into a separate file 2014-03-25 11:32:20 -04:00
David Baumgold
4fbfbf11ff write_stderr() function is unnecessary 2014-03-25 11:32:19 -04:00
David Baumgold
e9b0cc713a from __future__ import print_function 
and print errors and warnings to sys.stderr
 2014-03-25 11:32:19 -04:00
David Baumgold
6f38ea438a Change if not args.skip_collect to if args.collect 
Simpler and clearer
 2014-03-25 11:32:19 -04:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
Sarina Canelake
05a13aa0c3 Merge pull request #3056 from edx/sarina/032514-language-update 
Update translations (autogenerated message)
 2014-03-25 11:22:11 -04:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase 
Install new ORA (edx-tim)
 2014-03-25 10:59:05 -04:00
Piotr Mitros
bd4eb72e31 Concept XBlock prototype 2014-03-25 10:58:35 -04:00
Sarina Canelake
9c2a476dcb Update translations (autogenerated message) 2014-03-25 10:46:53 -04:00
David Baumgold
274224bf6c Merge pull request #3051 from louyihua/fix-cms-email-translation 
Fix typo in studio's email text
 2014-03-25 10:40:13 -04:00
Will Daly
440d9ddb89 Install edx-ora2 
Support for displaying submissions API scores in Progress page.
 2014-03-25 09:42:55 -04:00
Gabe Mulley
963f568582 Merge pull request #2972 from mulby/gabe/clarify-answer-dist 
Clean up references to answer distribution-like things
 2014-03-25 08:40:37 -04:00
louyihua
b70b232205 i18n: Fix typo in studio's email 
The right parenthesis should be appeared before the method '.format', not after.
 2014-03-25 16:51:24 +08:00
Alexander Kryklia
de15848e9b Merge pull request #2622 from edx/alex/fix_duplicate_code_in_transcripts_ajax 
Remove duplicate code in transcripts_ajax.
 2014-03-25 10:36:21 +02:00
zubair-arbi
22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper 
remove course location from loc_mapper on delete
 2014-03-25 12:44:04 +05:00
Dave St.Germain
3539c56f89 Added image tags to the whitelist for matlab 2014-03-24 18:53:07 -04:00
Gabe Mulley
3f31833178 Clean up references to answer distribution-like things 
In the near future an answer distribution report will be displayed in the data download reports table.  In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.

Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.

Fixes: AN-694
 2014-03-24 16:57:56 -04:00
Dave St.Germain
62a2a6501d Added image tags to the whitelist for matlab 2014-03-24 14:53:21 -04:00
Adam
8aaabd7461 Merge pull request #3041 from edx/adam/fix-data-download 
fix typo in data download tab (LMS-2441)
 2014-03-24 14:43:58 -04:00
Dave St.Germain
93844b3ad1 Merge pull request #3025 from edx/dcs/fix-matlab-response 
Fixes BLD-948 by escaping messages from xqueue, preventing malformed
 2014-03-24 13:54:36 -04:00
Dave St.Germain
5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed 
html from getting onto the page. The client will then unescape the html
and display it.
 2014-03-24 13:28:08 -04:00
Sarina Canelake
2244ba5ef2 Merge pull request #3028 from edx/sarina/LMS-2262 
More helpful UX in beta membership widget
 2014-03-24 13:24:01 -04:00
Sarina Canelake
4398443fe8 Merge pull request #3036 from edx/sarina/032414-language-update 
032414 Language update
 2014-03-24 13:22:46 -04:00