Don Mitchell
9fc5a8a4d6
Allow - ~ and . in course, branch, & block ids
2013-10-17 13:31:44 -04:00
Don Mitchell
2b99947241
Merge pull request #1309 from edx/dhm/mongo_migrate
...
Compute ObjectId locally rather than delegating to Mongo db
2013-10-17 08:32:55 -07:00
Don Mitchell
dda08930cd
Compute ObjectId locally rather than delegating to Mongo db
...
Was following a std sql pattern, but non-sql db's are slow write
and pymongo's ObjectId() is supposed to generate a true GUID
equivalent to waiting for the db to do so.
2013-10-17 10:49:07 -04:00
frances botsford
9f5bd4e65b
Merge pull request #1373 from edx/frances/fix/studio-grading-helptext
...
Bug fix STUD-771: updated grading help text...
2013-10-17 07:42:16 -07:00
Don Mitchell
978c19dd2c
Merge pull request #1325 from edx/dhm/paginate_assets
...
Add asset pagination
2013-10-17 07:16:09 -07:00
Don Mitchell
214a3bd251
pylint/pep8 cleanups
2013-10-17 09:52:13 -04:00
Don Mitchell
ee2a3750ac
Test leaving /start out of url.
2013-10-17 09:51:56 -04:00
David Baumgold
b0689a4ed5
Merge pull request #1375 from edx/db/requirejs-load-tender
...
Fix up Tender load order
2013-10-17 06:29:15 -07:00
Don Mitchell
a6ad531d50
Merge pull request #1287 from edx/dhm/restful_crud
...
Restful api prototype
2013-10-17 05:50:05 -07:00
Will Daly
17d8bd219a
Merge pull request #1319 from edx/will/enable-bulk-email-tests
...
Enable and update bulk email acceptance test
2013-10-17 05:44:48 -07:00
David Ormsbee
fc320ffef0
Merge pull request #1334 from edx/fix/ichuang/instructor-dashboard-grades-for-assignment
...
Fix/ichuang/instructor dashboard grades for assignment
2013-10-17 03:43:17 -07:00
Jay Zoldak
dbfc38dfa9
Merge pull request #1370 from edx/zoldak/refactor-cms-acceptance-js
...
refactor studio component creation in acceptance tests
2013-10-16 14:47:29 -07:00
David Baumgold
76e6f8bc0d
Fix up Tender load order
...
So that tender_widget.js loads after we've defined window.Tender
2013-10-16 17:25:58 -04:00
Jay Zoldak
33f6d3b819
Address code review comments
2013-10-16 17:08:32 -04:00
Don Mitchell
d45beaebfa
Test the new RESTful course index and outline views.
2013-10-16 16:54:32 -04:00
Don Mitchell
095a4e3d93
Remove IDE-specific placeholder from before we had manage.pyUse manage.py instead (with cms --settings dev runserver --noreload --traceback 8001)
2013-10-16 16:54:32 -04:00
Don Mitchell
fbc68df88b
Ensure bootstrapping tests start w/ clean slate.
2013-10-16 16:54:31 -04:00
Don Mitchell
95ea4dc9cc
Tests for Locator <-> Location help functions
2013-10-16 16:54:31 -04:00
Don Mitchell
010905eb99
RESTful api for getting course listing and opening course in studio.
...
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
2013-10-16 16:54:31 -04:00
Frances Botsford
ff52afbd79
i18n the tip text on studio grading page, and adding a missing space on the 'New Assignment' button
2013-10-16 16:26:09 -04:00
Brian Talbot
4d7606f024
Merge pull request #1369 from edx/talbs/fix-a11y-modals
...
LMS: Close Modal Control Uses HTML <button> Element (resolves LMS-582)
2013-10-16 13:18:25 -07:00
Brian Talbot
96cd85d824
LMS: converts close modal controls to use HTML <button> element
2013-10-16 16:14:29 -04:00
Frances Botsford
f90e336b18
updated grading help text on weight of total grade to be more clear that it should be an integer without the percent sign
2013-10-16 15:52:05 -04:00
brianhw
5918ee557f
Merge pull request #1351 from edx/brian/fix-dupe-emails
...
Check that email subtasks are known to the InstructorTask before executing.
2013-10-16 12:18:04 -07:00
Greg Price
17e2221604
Merge pull request #1326 from edx/gprice/cs-header-auth
...
Use HTTP header for comments service auth
2013-10-16 12:07:20 -07:00
Jay Zoldak
751994b9aa
pep8 and pylint fixes
2013-10-16 15:03:14 -04:00
Jay Zoldak
37933cb5f9
refactor studio component creation in acceptance tests
2013-10-16 15:02:49 -04:00
Diana Huang
02acd570e3
Merge pull request #1367 from edx/diana/modal-role-labelling
...
Add roles and labels to the dialogs on the dashboard.
2013-10-16 11:02:45 -07:00
Joe Blaylock
80cf19390f
Merge pull request #833 from edx/jrbl/pass_grades_to_certificates
...
Pass student grade label to certification process
2013-10-16 10:57:47 -07:00
frances botsford
ce83924fc0
Merge pull request #1361 from edx/frances/fix/lms-verification-layout-tweaks
...
some layout tweaks to the verification choose your track page
2013-10-16 10:52:40 -07:00
Frances Botsford
8c224a2aad
fixes on review and some corrections to verification sass
2013-10-16 13:51:38 -04:00
David Baumgold
ab5664ab9d
Merge pull request #1366 from edx/db/fix-video-test
...
Fix video unit test
2013-10-16 10:42:53 -07:00
Diana Huang
1871bca4ca
Add roles and labels to the dialogs on the dashboard.
...
LMS-1310
2013-10-16 13:26:32 -04:00
David Baumgold
545563c77b
Fix video unit test
2013-10-16 12:55:19 -04:00
polesye
283777dac2
Merge pull request #1297 from edx/anton/fix-lti-export
...
LTI: Fix import/export.
2013-10-16 09:54:21 -07:00
David Baumgold
e363e5a72d
Merge pull request #1337 from edx/db/fix-video-requirejs
...
fix video module issue with require.js
2013-10-16 09:40:48 -07:00
Frances Botsford
d949eb924d
correcting some incorrect rules in verification sass
2013-10-16 11:57:20 -04:00
Christina Roberts
637b66197b
Merge pull request #1331 from edx/christina/index
...
Move index code into index.js.
2013-10-16 07:24:30 -07:00
jmclaus
4647b62ce2
Merge pull request #1314 from edx/jmclaus/bugfix_HD_control_state
...
Added two states to HD control: HD off - HD on
2013-10-16 07:23:08 -07:00
Frances Botsford
1b430066f7
some layout tweaks to the verification choose your track page
2013-10-16 09:07:38 -04:00
Will Daly
fd49f09284
Merge pull request #1358 from edx/will/fix-course-overview
...
Wait for non-blank link in course-overview test
2013-10-16 05:24:28 -07:00
jmclaus
49bd356766
Used chaining. Cached gettext call.
2013-10-16 14:09:03 +02:00
jmclaus
585751ffca
Updated template and fixtures
2013-10-16 14:09:03 +02:00
jmclaus
3a798adb0f
Added two states to HD control: HD off - HD on
2013-10-16 14:09:03 +02:00
Valera Rozuvan
d408d7adec
Enabled 2nd disabled Jasmine test.
2013-10-16 15:02:59 +03:00
David Baumgold
deb36999ca
Remove outdated comment
2013-10-16 07:56:00 -04:00
Valera Rozuvan
269089711e
Enabled 2 disabled Jasmine tests. Fixed them.
2013-10-16 14:15:10 +03:00
Valera Rozuvan
cf3ea89289
Rebased. Updated Jasmine describe messages to make them more clearer.
2013-10-16 13:43:58 +03:00
David Baumgold
e930b96b52
Remove references to onYouTubePlayerAPIReady and onHTML5PlayerAPIReady
2013-10-16 13:28:28 +03:00
David Baumgold
bcf4fd5f3d
Mock YT.ready in Xmodule JS tests
...
and disable tests that fail for unrelated reasons
2013-10-16 13:28:28 +03:00
