Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

403 Commits

Author SHA1 Message Date
Will Daly
17e54a8a07 Added LMS_BASE to devstack settings to enable View Live in Studio 2013-11-23 10:42:12 -05:00
Feanil Patel
729f2e3bfa Merge pull request #1637 from edx/feanil/aws_creds 
Set empty aws credentials to None.
 2013-11-20 07:57:16 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion 
The input string is not expected to contain any unicode characters
 2013-11-19 14:34:06 -05:00
John Jarvis
71184220e6 convert STATIC_URL to ascii 2013-11-19 12:25:59 -05:00
John Jarvis
0e6b21ef71 adding slash 2013-11-19 11:40:31 -05:00
John Jarvis
54bb55fa52 fixes issue where STATIC_URL was overwritten without git.revision 
fixes this commit - 5ec77010e3
 2013-11-19 11:35:45 -05:00
Sarina Canelake
bd8fce5a8a Change dummy locale to Esperanto 2013-11-19 10:28:02 -05:00
Sarina Canelake
878097d06e Provide language codes for i18n testing 2013-11-19 09:15:53 -05:00
John Jarvis
399df1141e resolving merge conflicts 2013-11-18 11:52:26 -05:00
John Jarvis
f5a772135d adding override for GITHUB_REPO_ROOT 
This is the base directory for course data
 2013-11-18 11:24:45 -05:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Gabe Mulley
9ad435a8b8 fix emission of enrollment events from the CMS 
I suspect there are very few circumstances that an enrollment event is emitted from the CMS, but if it ever were to happen, it would bomb out because the "crum" middleware is not used in that app.  We are hoping to replace this request caching hack in the near future, but for now it is the best option we could come up with.

I noticed the stack appear when I created a new course in my dev environment.  Presumably the course author is automatically enrolled in the course, which, causes the tracking code to bomb out.  Luckily we catch the error and just log it, but we really should be capturing this type of enrollment event.
 2013-11-18 08:48:46 -05:00
Brian Talbot
cb92b75343 Merge pull request #1647 from edx/talbs/fix-studio-notificationsie 
Studio: Resolves Notifications UI showing in IE9 + CSS Split
 2013-11-14 13:05:47 -08:00
Will Daly
e6f0203aab Silence noisy loggers in the devstack 2013-11-13 10:52:03 -05:00
Will Daly
b7dab70628 Added devstack settings 
Fixed pep8/pylint violations

Added email feature flags; use full names for pylint disables
 2013-11-12 13:48:29 -05:00
Brian Talbot
722ddb62d3 Studio: resolves IE notifications display issue and abstracts CSS to avoid IE selector/rule limit 
STUD-815
 2013-11-12 13:00:22 -05:00
Will Daly
4e9de855d1 Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline 
Acceptance tests use asset pipeline
 2013-11-08 09:39:19 -08:00
Feanil Patel
9dd182800b Set empty aws credentials to None. 2013-11-08 12:22:09 -05:00
Calen Pennington
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
Will Daly
7830bb203f Acceptance tests use asset pipeline 2013-11-04 14:04:04 -05:00
Adam
98b3d18edc Merge pull request #1492 from edx/adam/remove-@edx 
remove instances of @edx.org email addresses in our default settings (Bug: LMS-1363)
 2013-11-04 08:02:08 -08:00
Brian Talbot
95dd21738c Studio: revises CSS reference/pipeline architecture for better organization, reduced redundancy, and to handle IE9 selector limits 2013-10-26 21:26:53 -04:00
Adam Palay
6b6e568063 remove instances of @edx.org email addresses in our default settings 
Bug: LMS-1363
 2013-10-24 17:02:15 -04:00
John Jarvis
68d31b9808 adding STATIC_ROOT_BASE to lms/envs/aws.py 2013-10-23 10:30:05 -04:00
John Jarvis
25c6f9455b fixes static_root override 2013-10-23 10:28:09 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
John Jarvis
1ac732abb4 adding git.revision for cms 2013-10-22 12:08:48 -04:00
John Jarvis
8ca156bd00 adding STATIC_ROOT to cms 2013-10-21 14:41:00 -04:00
Don Mitchell
8dc9fa8861 Test providing a collection in doc_store_config to contentstore. 2013-10-21 12:15:51 -04:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env 
Fix error when reading tokens on aws configuration
 2013-10-21 08:24:15 -07:00
e0d
e6955c641f The default value was removed from common. 2013-10-21 10:45:05 -04:00
e0d
fb62f0c52a Merge pull request #1417 from edx/e0d/config-fix 
E0d/config fix
 2013-10-21 07:29:52 -07:00
e0d
5adf524ad6 removing redundant default. 2013-10-21 09:55:27 -04:00
Carlos Andrés Rocha
b764b9b4cf Fix error when reading tokens on aws configuration 
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
 2013-10-21 03:19:22 -04:00
e0d
5995a76254 sanity restored. 2013-10-18 16:26:23 -04:00
e0d
a008cc6b74 path fix. 2013-10-18 16:12:51 -04:00
cahrens
a8ad56fa0e Remove pipeline config not needed with RequireJS. 
Was re-introduced in a bad merge.
 2013-10-18 15:57:50 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master 
Post release 2013 10 17 master
 2013-10-18 11:16:24 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" 
This reverts commit a517dc2085.
 2013-10-18 09:22:30 -04:00
Will Daly
7aff8a7791 Merge pull request #1362 from edx/will/acceptance-test-logs 
Write Django logs to file during acceptance tests
 2013-10-18 05:07:53 -07:00
Gabe Mulley
d2b03e28fb add course_id to event context 2013-10-17 17:44:01 -04:00
Adam Palay
1fc993ce18 add functionality to disable users 
add middleware to detect students with disabled accounts

add tests
 2013-10-16 16:57:11 -04:00
Will Daly
f2c417b638 Write Django logs to file during acceptance tests 2013-10-16 15:44:35 -04:00
John Jarvis
92a7d75b5d Merge pull request #1305 from edx/jarv/revert-1240 
Revert "Merge pull request #1240 from edx/dhm/config_separation"
 2013-10-10 10:27:58 -07:00
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware 
add some middleware to determine whether draft modulestore or non-draft ...
 2013-10-10 10:24:51 -07:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation" 
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
 2013-10-10 13:14:08 -04:00
David Baumgold
838f4df6b5 Merge pull request #1269 from edx/db/clarify-debug 
Clarify USE_I18N settings
 2013-10-09 13:55:30 -07:00
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation 
Segregate the mongo db config from the modulestore config
 2013-10-09 13:24:30 -07:00