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

23850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
polesye
0e2bf2234d BLD-726: ChoiceTextGroup i18n. 2014-06-11 16:09:58 +03:00
Sarina Canelake
04c9426524 Merge pull request #4048 from edx/sarina/fix-notes-import 
Fix Notes import
 2014-06-10 21:37:05 -04:00
Sarina Canelake
890093ebbf Fix Notes import 2014-06-10 18:13:32 -04:00
Sarina Canelake
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -04:00
Sarina Canelake
21a784b469 Merge pull request #3968 from edx/hotfix/2014-06-03 
Fix performance regression
 2014-06-10 16:40:31 -04:00
Julia Hansbrough
b7b0414607 Merge pull request #4036 from edx/flowerhack/conditional-module-rendering 
Flowerhack/conditional module rendering
 2014-06-10 11:35:19 -04:00
Julia Hansbrough
6e702c3131 Fix conditional module rendering 2014-06-10 15:32:32 +00: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
Sarina Canelake
749cb4ee7d Merge pull request #4031 from edx/sarina/other-ok-fixes 
Sarina/other ok fixes
 2014-06-09 15:18:13 -04:00
Sarina Canelake
305c126e68 Merge pull request #4030 from edx/sarina/fix-openended-logging 
Sarina/fix openended logging
 2014-06-09 15:18:07 -04:00
Sarina Canelake
bf6c342dcf Fix location.url [LMS-2786] 2014-06-09 15:17:20 -04:00
Diana Huang
baf0cee0be Fix gen_cert_report to use CourseKeys. 2014-06-09 15:17:13 -04:00
Sarina Canelake
a9cad6a5bb Fix logging bug in openended grading 2014-06-09 15:16:18 -04:00
Calen Pennington
87557a1af8 Add tests of RoleCache 2014-06-09 15:15:03 -04:00
Julia Hansbrough
2757ac4fcb Opaque-keys: response to code review 2014-06-09 15:13:31 -04:00
Julia Hansbrough
3a9f0b3f74 Fix import 2014-06-09 15:13:31 -04:00
Calen Pennington
dc7b2f0762 Don't create model objects to check the roles cache 2014-06-09 15:13:31 -04:00
Don Mitchell
c808277007 Change document_class back to dict 2014-06-09 15:13:31 -04:00
Don Mitchell
acc02b0e09 Fix to excess asset query 2014-06-09 15:13:23 -04:00
Julia Hansbrough
ade82c2d05 Notes convert course_id to course_key 2014-06-09 15:12:23 -04:00
Julia Hansbrough
e3459cd3cb Opaque-Keys: Response to code review 2014-06-09 15:12:22 -04:00
Julia Hansbrough
3f3e9724d0 Add fallback for org based roles 2014-06-09 15:10:49 -04:00
Calen Pennington
29bb179afc Revert back to mongo-python-driver based on the 2.4.1 tag. 2014-06-09 15:10:48 -04:00
Diana Huang
729f0eb203 Fix variable name. 2014-06-09 15:10:48 -04:00
Diana Huang
a8a77b34cd Update hash to latest version. 2014-06-09 15:10:48 -04:00
Don Mitchell
6230e14d23 Use commit hash v tag for pymongo 2014-06-09 15:10:48 -04:00
Don Mitchell
36dacba63a Update to tagged version of pymongo 2014-06-09 15:10:47 -04:00
Don Mitchell
d66b480740 pymongo son optimizations 2014-06-09 15:10:47 -04:00
Don Mitchell
84ee2b19f2 OpaqueKey copy and deepcopy are identity ops 
because keys are immutable
 2014-06-09 15:10:47 -04:00
Don Mitchell
2c6437a279 Fix performance regression 
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
 2014-06-09 15:10:47 -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