Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,820 Commits 1 Branch 0 Tags
5dfd4d4dccc47bf794f3de7e39a39f363c6dde4b
Commit Graph

23820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jsa
5dfd4d4dcc clarify and internationalize the search spell correction message. 2014-06-11 12:41:34 -04:00
Mark Hoeber
b5cd3e1be5 Merge pull request #3994 from edx/markhoeber/documentation/doc-448 
Production stack doc in ops guide
 2014-06-09 17:18:30 -04:00
Brian Talbot
6ddf45e707 Merge pull request #4029 from edx/talbs/studio-flexbile-status-notifications 
Studio: Flexible Status Notifications
 2014-06-09 16:59:25 -04:00
David Baumgold
44695337f8 Merge pull request #4002 from edx/db/move-pep8-to-setup-cfg 
Move .pep8 content to setup.cfg
 2014-06-09 14:33:56 -04:00
Brian Talbot
1209daa7f3 making system status notifications flexible based on content 2014-06-09 14:08:20 -04:00
brianhw
8801b3a12b Merge pull request #3954 from edx/brian/fix_session_id 
Encrypt the session id before writing to tracking logs.
 2014-06-09 14:01:29 -04:00
John Jarvis
54c10b68ee Merge pull request #4023 from edx/jarv/downgrade-requests-oauthlib 
locking version of requests-oauthlib to 0.4.0
 2014-06-09 13:28:09 -04:00
Will Daly
b33a511172 Merge pull request #4001 from edx/will/ora2-i18n-js-strings 
Serve ORA2 JavaScript i18n strings
 2014-06-09 12:40:37 -04:00
Will Daly
dc34d753c0 Serve ORA2 JavaScript i18n strings 2014-06-09 11:35:09 -04:00
Will Daly
fb5037cc3c Merge pull request #4024 from edx/will/test-speedups 
Update test database cache
 2014-06-09 10:20:17 -04:00
Will Daly
c4366d7485 Update database caches to include latest migrations 2014-06-09 09:25:14 -04:00
Waheed Ahmed
68513407ca Merge pull request #3978 from edx/waheed/lms2734-added-logging-for-email 
Added logging for sender email address on BotoServerError.
 2014-06-09 18:19:52 +05:00
Waheed Ahmed
200394f608 Added logging for sender email address on BotoServerError. 
LMS-2734
 2014-06-09 12:22:41 +05:00
John Jarvis
c54b8db6a7 locking version of requests-oauthlib to 0.4.0 
requests version 1.2.3 does not appear to be compatible with the
new version of requests-oauthlib.

requests-oathlib tries to import to_native_string in util.py:

```
File
"/root/.virtualenvs/edx-platform/local/lib/python2.7/site-packages/requests_oauthlib/oauth1_auth.py",
line 10, in <module>
    from requests.utils import to_native_string
ImportError: cannot import name to_native_string
```
 2014-06-07 13:28:30 -04:00
Julia Hansbrough
7beaf4ed8a Merge pull request #4019 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tools Reverting commit @3bfb633 and updating openseadragon.js for latest build
 2014-06-06 17:30:03 -04:00
clytwynec
6c6f67dc1f Merge pull request #3945 from edx/clytwynec/rake2paver-tests 
Deprecated unit tests from rake to paver
 2014-06-06 16:14:42 -04:00
Jay Zoldak
1cf6b5f4f7 Merge pull request #3944 from edx/zoldak/bok-choy-user-not-staff 
Bok choy tests should not all run as global staff
 2014-06-06 15:47:47 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
David Baumgold
e159ff9b5d Remove unused verbose property 2014-06-06 15:35:33 -04:00
David Baumgold
4221bf9ec0 Set verbosity on paver test tasks 2014-06-06 15:35:33 -04:00
Christine Lytwynec
da6d70a92b updating diff-cover, adding --compare-branch feature to paver task 2014-06-06 15:35:33 -04:00
Christine Lytwynec
2e2136d39c Deprecated unit tests from rake to paver 2014-06-06 15:35:32 -04:00
Jay Zoldak
00d5c5b490 Reuse course creator user in bok-choy tests and have them not be global staff 2014-06-06 15:17:14 -04:00
Joe Blaylock
fa9a022cca Merge pull request #4016 from edx/jrbl/bugfix_lxml_flattening 
Bugfix certificates request queue HTML flattening
 2014-06-06 11:10:33 -07:00
Alison Hodges
1b58ca5d1b Merge pull request #3975 from edx/ahodges/documentation/DOC307 
Ahodges/documentation/doc307
 2014-06-06 14:03:52 -04:00
Alison Hodges
60b38ba801 Added new section on states, image, fixed old images 2014-06-06 14:02:40 -04:00
Julia Hansbrough
d2b2699166 Merge pull request #3969 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tool: Urgent update for ChinaX AB Testing
 2014-06-06 13:55:10 -04:00
Ned Batchelder
3584d571a3 Merge pull request #4017 from edx/ned/fix-duplicate-xmodule-tests 
Remove duplicates in a class list so tests aren't duplicated
 2014-06-06 13:19:24 -04:00
David Baumgold
f45840acb5 Move .pep8 content to setup.cfg 2014-06-06 13:17:46 -04:00
Ned Batchelder
ec5aee2949 Remove duplicates in a class list so tests aren't duplicated 2014-06-06 13:17:36 -04:00
David Baumgold
30815dba01 Merge pull request #3960 from edx/db/update-ddt 
Update ddt to 0.8.0
 2014-06-06 13:16:58 -04:00
Mark Hoeber
35e44d8610 fix nfsd in devstack 2014-06-06 13:05:10 -04:00
Mark Hoeber
d478a3d420 Product stack documentation 
DOC-448
 2014-06-06 13:04:14 -04:00
lduarte1991
dc9ae84e56 Merge pull request #2 from lduarte1991/lduarte-harvardx-pr3 
Annotation Tools: Fix delete bug and factor out xmodule settings
 2014-06-06 12:42:24 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings 
Removed print context
 2014-06-06 12:39:35 -04:00
Joe Blaylock
277dcb1113 Bugfix certificates request queue HTML flattening 2014-06-06 09:31:46 -07:00
David Baumgold
8dd4731d42 Merge pull request #3965 from edx/db/django-babel-underscore 
Extract i18n strings from *.underscore files using django-babel-underscore
 2014-06-06 10:36:12 -04:00
lduarte1991
54974a51ca Annotation Tools: Added CommonAnnotatorMixin 2014-06-06 10:09:22 -04:00
Jay Zoldak
210bffd44c Merge pull request #4013 from edx/zoldak/disable-cc-test 
Skip video cc test BLD-1115
 2014-06-06 09:42:13 -04:00
Jay Zoldak
d837cdc54f Skip video cc test BLD-1115 2014-06-06 09:25:22 -04:00
lduarte1991
9c0d14ea2b Annotator Tools: OpaqueKeys update for Notes 2014-06-05 15:53:26 -04:00
benmcmorran
aca0971a06 Merge pull request #3997 from edx/benmcmorran/template-text-formatting 
Reformats markdown problem templates avoid extra line breaks.
 2014-06-05 15:33:55 -04:00
Jim Abramson
f5cfd1ef96 Merge pull request #3986 from edx/jsa/search-spell-correction 
Add support for search spell corrections to Forums UX.
 2014-06-05 15:14:00 -04:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -04:00
Ben McMorran
914f0f7415 Fixes spelling of Michigan in template. 2014-06-05 14:07:03 -04:00
Ben McMorran
da6c337702 Revert "Fixes spelling of Michigan in template." 
This reverts commit 9e9e69ace3.
 2014-06-05 14:03:49 -04:00
Ben McMorran
9e9e69ace3 Fixes spelling of Michigan in template. 2014-06-05 13:59:40 -04:00
lduarte1991
68acf66f6c Annotation Tools: PR Fixes 
- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA
 2014-06-05 13:05:37 -04:00
Christina Roberts
da09898778 Merge pull request #3928 from edx/christina/custom-split-editor 
Implement a custom editor for the split_module.
 2014-06-05 12:55:09 -04:00
Ben McMorran
e18fd76d07 Reformats markdown problem templates avoid extra line breaks. 2014-06-05 12:54:39 -04:00