Commit Graph

19825 Commits

Author SHA1 Message Date
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -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
Greg Price
8f9f3bb914 Merge pull request #1883 from edx/gprice/markdown-button-keypress
Activate Markdown editor buttons on keypress
2013-12-10 07:38:15 -08:00
Mark Hoeber
41602e65e8 Merge pull request #1898 from edx/sylvia/documentation/bld-552
Created "MathJax in Studio" page
2013-12-10 07:31:06 -08:00
Will Daly
9b4b3dfa12 Merge pull request #1903 from edx/will/fix-underscore-staff-grading
Add underscore to staff grading template
2013-12-10 06:29:46 -08:00
Will Daly
8374989c11 Add underscore to staff grading template 2013-12-09 23:55:29 +00:00
Sarina Canelake
461b4739cb Merge pull request #1776 from edx/sarina/inst-dash-acceptance
Instructor dashboard acceptance tests
2013-12-09 15:53:33 -08:00
Sarina Canelake
874d7a02d6 Fix LTI acceptance tests 2013-12-09 18:28:41 -05: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
Diana Huang
1ee6d151e2 Merge pull request #1894 from edx/diana/remove-extraneous-text
Remove extraneous refund text
2013-12-09 13:24:09 -08:00
David Baumgold
e032b4ba54 Merge pull request #1897 from edx/db/remove-old-readmes
Remove old READMEs
2013-12-09 12:58:55 -08: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
spearce
5e718f939a Created "MathJax in Studio" page
Created "A Brief Introduction to MathJax in Studio" page (as appendix
G) and included a link in "Math Expression Input" topic.
2013-12-09 15:45:52 -05:00
Anton Stupak
0d3d7588bf Merge pull request #1855 from edx/anton/add-dnd-template
Add additional example of DnD.
2013-12-09 12:34:28 -08:00
David Baumgold
724cc02556 Merge pull request #1847 from edx/db/update-npm-package
update npm package name to edx
2013-12-09 12:18:45 -08:00
polesye
7196cf21ee BLD-479: Add additional example of DnD. 2013-12-09 22:04:45 +02:00
David Baumgold
b784979976 Merge pull request #1792 from edx/man2life-i18n-no-forums
i18n (no forums)
2013-12-09 11:28:18 -08:00
Mark Hoeber
63a4811464 Merge pull request #1895 from edx/release-notes/12-9-13
Release notes/12 9 13
2013-12-09 10:41:36 -08:00
Diana Huang
12a771e2f3 Remove extraneous refund text
Bug: LMS-1603
2013-12-09 11:29:10 -05:00
Mark Hoeber
c328daeba5 Edit changes
Edited 12-9-13 file
2013-12-09 10:52:16 -05:00
Mark Hoeber
3f6997e616 Merge pull request #1892 from edx/sylvia/documentation/test
ORA documentation updates
2013-12-09 07:39:31 -08: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
3730eb3ba2 Merge pull request #1856 from edx/valera/fix_e_reader_error_new_page
Fix for BLD-465: e-reader error when popping out window.
2013-12-09 03:03:03 -08: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
Mark Hoeber
bb1945b84c Release notes for 12-9-2013
Release notes for 12-9-2013
2013-12-08 11:06:48 -05:00
Mark Hoeber
62035c03c7 rn for 12/9/13
new file
2013-12-06 16:28:53 -05: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
Will Daly
f7ffc1d25b Merge pull request #1884 from edx/will/disable-js-course-overview-test
Disabled AJAX Errors Course Overview JS test
2013-12-06 12:49:40 -08:00
Don Mitchell
298e7a2343 Shorten collection name to keep index name w/in limit 2013-12-06 15:37:38 -05:00
Greg Price
b5eeef01a0 Activate Markdown editor buttons on keypress
The buttons now activate on pressing space or enter.

JIRA: FOR-66
2013-12-06 14:51:43 -05:00
Adam
8f990a09cc Merge pull request #1881 from edx/adam/fix/instr-dash-500
import GlobalStaff to legacy.py (LMS-1599)
2013-12-06 11:04:40 -08:00
Will Daly
fa1acae80d Disabled AJAX Errors Course Overview JS test 2013-12-06 13:55:49 -05:00
spearce
cb5afe9709 ORA documentation updates
Updated main ORA documentation based on several bugs; added new
student-facing ORA docs
2013-12-06 13:19:08 -05:00
Christina Roberts
95c86248bd Merge pull request #1869 from edx/christina/export-error
On export error, handle quotes within string.
2013-12-06 09:54:25 -08:00
Adam Palay
11b635c00b import GlobalStaff to legacy.py (LMS-1599) 2013-12-06 12:49:51 -05:00
cahrens
bbeded71ec On export error, handle quotes within string.
STUD-1013
2013-12-06 12:02:02 -05:00
David Baumgold
03c8c0e1e7 Merge pull request #1880 from edx/db/mitx-edx-locmem
update LocMemCache location to use edx instead of mitx
2013-12-06 08:30:07 -08:00
David Baumgold
c436c6aa13 Merge pull request #1879 from edx/db/mitx-edx-sqlite
Change mitx.db to edx.db for dev sqlite
2013-12-06 08:29:17 -08:00
David Baumgold
1134b88415 update LocMemCache location to use edx instead of mitx 2013-12-06 11:22:26 -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
Mark Hoeber
faf5af1c7a New Release Notes
Release notes in RST format
2013-12-06 09:52:28 -05:00
spearce
94b8f11cba test 2013-12-06 09:33:28 -05:00
Mark Hoeber
5bf2f4b07b New release notes project
added files for past dates
2013-12-05 16:40:00 -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
f747c762d8 Merge pull request #1772 from edx/db/locator-refactor-textbooks
Refactor textbooks to use locator URLs
2013-12-05 13:25:14 -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