Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Chris Rossi
76b15eae65 Get json data. 2014-01-16 17:03:13 -05:00
Chris Rossi
46657b8f35 Grandfather email. 2014-01-16 17:03:13 -05:00
Chris Rossi
9755216a61 Use whitelist for testing. 2014-01-16 17:03:13 -05:00
Chris Rossi
35fdbf3a1c Send mail. 2014-01-16 17:03:13 -05:00
Chris Rossi
5d7befdebe Generate certificate URLs. 2014-01-16 17:03:13 -05:00
Chris Rossi
bb43d4cae4 House cleaning. 2014-01-16 17:03:13 -05:00
Chris Rossi
ec2678a5c5 Refactor LinkedIn API code to common location for reuse. 2014-01-16 17:03:13 -05:00
Chris Rossi
dc9c52d757 Pep8, pylint. 2014-01-16 17:03:13 -05:00
Chris Rossi
2f9e9e2494 Refactor findusers script to be fully lazy, in hopes we don't run out of memory with huge numbers of users. 2014-01-16 17:03:12 -05:00
Chris Rossi
411d39deea Script to log in to LinkedIn API. 2014-01-16 17:03:12 -05:00
Chris Rossi
b2db05fc89 Initial stab at placeholder email template. 2014-01-16 17:03:12 -05:00
Chris Rossi
fc17ed26d4 Properly handle already emailed courses. 2014-01-16 17:03:12 -05:00
Chris Rossi
2468c99c52 Test grandfather path. 2014-01-16 17:03:12 -05:00
Chris Rossi
2d5c4dae52 Test coverage. 2014-01-16 17:03:12 -05:00
Chris Rossi
e34d131f70 Skeleton for emails script. 2014-01-16 17:03:12 -05:00
vagrant
883563d8df Test max_calls == 0 2014-01-16 17:03:12 -05:00
Chris Rossi
a5d1cb3592 pep8 and pylint 2014-01-16 17:03:12 -05:00
Chris Rossi
64887c6870 Flesh out findusers script, except for LinkedIn API call, with tests. 2014-01-16 17:03:12 -05:00
Chris Rossi
cc53aab4ec Initial app and model for LinkedIn integration. 2014-01-16 17:03:12 -05:00
Greg Price
27d2c8e9f0 Merge pull request #2201 from edx/gprice/markdown-editor-i18n 
Internationalize the forums post Markdown editor
 2014-01-16 12:48:55 -08:00
Cristian Salamea
a465b082da Specific django-toolbar version (stable released) and update the panels in dev envs 2014-01-16 14:11:17 -05:00
Greg Price
f8732a8b3d Internationalize the forums post Markdown editor 
This includes removing the "PREVIEW" label for the preview pane from CSS
and adding it to the generated DOM.
 2014-01-16 14:10:51 -05:00
Giulio Gratta
9280f89f86 Merge pull request #2157 from edx/giulio/remove-ice 
Removed ice.min.js completely as ORA is changing anyway
 2014-01-16 10:37:58 -08:00
Don Mitchell
3885e6cf78 Merge branch 'release' 
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
 2014-01-16 12:51:22 -05:00
Jason Bau
429941810c move HOSTNAME_MODULESTORE_DEFAULT_MAPPING to lms.envs.aws (not lms.envs.cms.aws) 2014-01-15 17:21:02 -08:00
Greg Price
9075dcefb6 Merge pull request #2186 from edx/gprice/timeago-i18n 
Internationalize our use of jquery.timeago
 2014-01-15 14:23:52 -08:00
Giulio Gratta
31caba3a2a Removed ice.min.js and removed piping code 2014-01-15 14:06:19 -08:00
Greg Price
0f09a3093e Internationalize our use of jquery.timeago 
Also get rid of an unused template and extra copies of jquery.timeago.
 2014-01-15 16:46:38 -05:00
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase 
Bok-choy fixtures, Studio tests, and (some) ORA tests
 2014-01-15 12:18:47 -08:00
jsa
dfa4a03daa i18n: externalize strings in discussion forums templates and python code. 
JIRA: FOR-398, FOR-399
 2014-01-15 14:26:22 -05:00
Greg Price
ee1651daeb Merge pull request #2120 from edx/gprice/forum-unicode-tests 
Add forum tests for non-ASCII data
 2014-01-15 10:51:30 -08:00
Don Mitchell
7ff137866b Merge pull request #2180 from edx/usman/openended_post_hostname_argument 
Added hostname argument to openended_post command.
 2014-01-15 09:05:32 -08:00
Don Mitchell
7e02951571 Merge pull request #2064 from edx/dhm/auth_consolidate 
Replace authz with roles.py and reconcile their behaviors
 2014-01-15 07:21:03 -08:00
Will Daly
4afd5ea49f Refactored bok-choy directory structure 
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
 2014-01-15 09:37:32 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting 
Verified Certificate Reports
 2014-01-15 06:18:17 -08:00
Julia Hansbrough
1664452a14 Final iteration 2014-01-15 13:06:50 +00:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00:00
Jason Bau
e5215d72b1 Merge pull request #2165 from edx/jbau/course_about_better_errormsg 
add FAQ link to course_about error msg
 2014-01-14 14:10:29 -08:00
Jason Bau
1b2aa4543c add FAQ link to course_about error msg 
use double-quotes, not single
 2014-01-14 14:09:03 -08:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org 
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
 2014-01-14 14:36:01 -05:00
Greg Price
5b2ff9b21a Add unit tests for non-ASCII forum content 2014-01-14 13:56:36 -05:00
Calen Pennington
d2a0df4118 Merge pull request #2129 from cpennington/xblocks-xml-import-export 
XBlock Xml Serialization/Deserialization
 2014-01-14 10:56:09 -08:00
Greg Price
3c3ef50e13 Merge pull request #2168 from edx/gprice/forum-coffee-i18n 
Internationalize forums CoffeeScript code
 2014-01-14 10:55:08 -08:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
Greg Price
a1dc49cc9b Remove defunct forum post tagging code 2014-01-14 13:03:56 -05:00