polesye
e5f583294a
Address comments.
2013-12-11 13:28:34 +02:00
polesye
39e97225ff
Fix tests.
2013-12-11 13:28:33 +02:00
polesye
2e87b1a66f
BLD-543: Fix bug with reordering in Studio.
2013-12-11 13:28:33 +02:00
David Ormsbee
d5bff2e28c
Merge pull request #814 from edx/bugfix/ichuang/make-edit-link-use-static-asset-path
...
fix: make edit link use static_asset_path in xmodule_modifiers.py
2013-12-10 13:58:13 -08:00
Julia Hansbrough
421f02518b
Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events
...
Events for entering verified flow & buying
2013-12-10 11:47:47 -08:00
David Baumgold
2bc4198760
Merge pull request #1853 from edx/db/update-comments
...
Updating comments and docs for MITx -> edX transition
2013-12-10 11:10:37 -08:00
Calen Pennington
80fd12b9aa
Merge pull request #1692 from cpennington/pure-xblock-handler-urls
...
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
2013-12-10 10:54:55 -08:00
David Baumgold
fb13bed947
Updating comments and docs for MITx -> edX transition
2013-12-10 13:21:18 -05:00
Calen Pennington
d937da8d47
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
...
[LMS-1613]
2013-12-10 12:04:18 -05:00
Greg Price
c84164510e
Merge pull request #1882 from edx/gprice/remove-moderator-toggle
...
Remove forum user profile moderator toggle button
2013-12-10 07:40:39 -08:00
Sarina Canelake
b406ba0f83
Acceptance tests for grades download
...
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.
LMS-58
2013-12-09 18:28:41 -05:00
Sarina Canelake
c547ac7286
Fix bulk email acceptance test
2013-12-09 18:28:41 -05:00
David Baumgold
b60d060358
Remove old READMEs
...
These files seem to have been copied over from old XML courses,
and shouldn't be in our repository.
2013-12-09 15:57:22 -05:00
polesye
7196cf21ee
BLD-479: Add additional example of DnD.
2013-12-09 22:04:45 +02:00
Greg Price
cec58f885b
Remove forum user profile moderator toggle button
...
This button has been broken for at least a year, so the code has
suffered from bit rot and should be reimplmemented if the feature is
necessary in the short term (which is unlikely since it has been broken
for so long).
2013-12-09 10:23:21 -05:00
Valera Rozuvan
9072b9cc5d
e-reader error when popping out window
...
Moving work on BLD-465 from PR 1811.
Fixing missing import clause in Python.
Addressing DB's comment.
BLD-465.
2013-12-09 10:38:57 +02:00
Don Mitchell
0684f6a40a
Merge pull request #1878 from edx/dhm/pymongo_client
...
Upgrade pymongo usage from deprecated connection to client
2013-12-06 13:14:28 -08:00
Don Mitchell
298e7a2343
Shorten collection name to keep index name w/in limit
2013-12-06 15:37:38 -05:00
David Baumgold
2666b96976
Change mitx.db to edx.db for dev sqlite
2013-12-06 11:21:19 -05:00
Don Mitchell
b5691cd4d1
Upgrade pymongo usage from deprecated connection to client
...
LMS-1551
2013-12-06 10:47:06 -05:00
Don Mitchell
39f4cb806c
Merge pull request #1832 from edx/dhm/publish
...
SplitMongo publish method
2013-12-05 13:34:38 -08:00
David Baumgold
effee03bd7
Merge pull request #1867 from edx/db/update-factory-boy
...
Update factory_boy to 2.2.1
2013-12-05 13:22:22 -08:00
Don Mitchell
43789a9252
Fixed test to ensure deletion on publish
2013-12-05 16:15:19 -05:00
Don Mitchell
7a4204b72a
SplitMongo publish method
...
STUD-451
2013-12-05 16:15:19 -05:00
David Baumgold
d15391fdfa
Update factory_boy to 2.2.1
2013-12-05 15:50:49 -05:00
Ned Batchelder
1cbc171616
Merge master in prep for merging back the hotfix changes.
2013-12-05 15:48:49 -05:00
Ned Batchelder
be3ab1c5e9
Drop the temp table
2013-12-05 14:56:30 -05:00
Ned Batchelder
108e02e1ed
Remove the one-time-use managemant command.
2013-12-05 14:41:30 -05:00
Julia Hansbrough
83f42f5691
Response to CR
2013-12-05 19:14:45 +00:00
Julia Hansbrough
f880bcb652
Response to CR
2013-12-05 19:14:45 +00:00
Julia Hansbrough
e8196d9761
Events for entering verified flow & buying
2013-12-05 19:10:27 +00:00
Greg Price
88610cb8fb
Change forum role granted to staff on enrollment
...
This applies to global staff (is_staff=True), not course staff.
Previously, staff were granted the Moderator role but not the Student
role upon enrolling in a course. If the Moderator role were later
revoked, then the user would have no role and be unable to post in the
forums, which is confusing for the user. edX staff indicated they would
prefer to not automatically receive the Moderator role, so the Student
role is granted instead. Note that staff will still be able to grant
themselves Moderator privileges through the instructor dashboard if
they wish.
JIRA: FOR-338
2013-12-05 12:54:12 -05:00
Adam
f7d86bfff5
Merge pull request #1814 from edx/adam/fix-ora-typo
...
fix typo in ORA template (ORA-136)
2013-12-05 07:37:52 -08:00
Alexander Kryklia
bceadd4830
Merge pull request #1819 from edx/anton/fix-lti-scores
...
Fix LTI max_score method.
2013-12-05 02:40:19 -08:00
Ned Batchelder
326d9dbeac
Merge pull request #1851 from edx/ned/merge-lti-hotfix
...
Ned/merge lti hotfix
2013-12-04 13:48:22 -08:00
Calen Pennington
e561c1354d
Add managemant command to generate sql to clean up tp truncated student ids in ORA db
2013-12-04 16:18:40 -05:00
Adam Palay
4d506016e7
Add a backwards migration to delete the archive table
2013-12-04 16:07:43 -05:00
Александр
e96108629d
Fix LTI tests.
2013-12-04 15:55:47 -05:00
Александр
c4515faedf
Make has_score to be XField insted of decriptor property.
...
Conflicts:
common/lib/xmodule/xmodule/lti_module.py
2013-12-04 15:55:42 -05:00
polesye
e4403815e7
Fix LTI max_score method.
2013-12-04 15:54:51 -05:00
David Baumgold
e26fc08d2b
Update logging.getLogger() calls to use edx instead of mitx
2013-12-04 15:18:15 -05:00
Calen Pennington
838622f5bd
Handle integrity errors when creating/retrieving AnonymousUserId entries
2013-12-04 13:56:53 -05:00
Adam Palay
7171397d95
extend max_length of anonymous_user_id (LMS-1571)
2013-12-04 13:56:53 -05:00
David Baumgold
b32f2bc170
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:59:35 -05:00
David Baumgold
1a585a88a9
Merge pull request #1833 from edx/db/mitx_markdown-edx_markdown
...
mitx_markdown => edx_markdown
2013-12-04 09:58:50 -08:00
zubair-arbi
5347923304
Merge pull request #1829 from zubair-arbi/zub/bugfix/std1008-disablepeertrackchanges
...
Disable Peer Track Changes
2013-12-04 08:04:33 -08:00
David Baumgold
6af8ecef03
mitx_markdown => edx_markdown
2013-12-04 10:23:47 -05:00
Zubair Afzal
5dba3fb47a
Disable Peer Track Changes
...
STUD-1008
2013-12-04 16:43:17 +05:00
David Baumgold
f3f4af8087
settings.MITX_FEATURES => settings.FEATURES
2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df
Merge pull request #1823 from edx/db/mitxmako-edxmako
...
mitxmako => edxmako
2013-12-03 11:36:50 -08:00
