Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,882 Commits 1 Branch 0 Tags
613f2d890779701d8cd5cd66b7ce92a261efb7bc
Commit Graph

6674 Commits

Author SHA1 Message Date
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
jmclaus
1810022d73 Caption functionality announced when tabbing to list 2013-10-20 21:56:12 +02:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Will Daly
4de777b716 Merge pull request #1414 from edx/will/zero-tolerance 
Zero Tolerance
 2013-10-18 13:30:34 -07:00
Don Mitchell
46201e9ee1 Merge pull request #1412 from edx/dhm/bug_id_syntax 
URLencode $ and . in location.name when used as key
 2013-10-18 13:17:03 -07:00
Will Daly
6654bb4cdf Disable flakey seek test 2013-10-18 16:10:10 -04:00
Don Mitchell
80af538dd1 URLencode $ and . in location.name when used as key 2013-10-18 16:05:02 -04:00
Will Daly
fe387fb133 Disable slider test 2013-10-18 15:59:14 -04:00
Will Daly
344e9f7f5d Fix flakey js caption test 2013-10-18 15:58:29 -04:00
polesye
70e5e80e31 Merge pull request #1339 from edx/anton/fix-video-js-unit-tests 
Fix broken tests for video player
 2013-10-18 11:45:43 -07:00
Don Mitchell
d15bfb672a Merge pull request #1407 from edx/dhm/bug_config 
Add temporary args to swallow deprecated parms.
 2013-10-18 11:39:44 -07:00
Don Mitchell
f4cf331553 Add temporary args to swallow deprecated parms. 2013-10-18 14:39:06 -04:00
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master 
Post release 2013 10 17 master
 2013-10-18 11:16:24 -07:00
Ned Batchelder
009b3e9c50 Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups 
Simple cleanups of DictFieldData
 2013-10-18 11:02:38 -07:00
Brian Talbot
38153f95d6 Merge pull request #1292 from edx/talbs/update-sass-bourbon-neat 
Sass 3.2.12, Neat 1.4.0
 2013-10-18 10:17:27 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
polesye
32ca988760 Fix video voulme test. 2013-10-18 18:44:48 +03:00
polesye
c85bbabb93 Fix timeout. 2013-10-18 18:44:48 +03:00
polesye
e95ee9948b Add acceptance test instead of broken js unit test. 2013-10-18 18:44:48 +03:00
polesye
7121db0a09 BLD-353: Fix js unit tests. 2013-10-18 18:44:48 +03:00
Brian Talbot
3a639ece1f updating Neat generated utility files 2013-10-18 11:35:25 -04:00
polesye
79f11de6de Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug 
Video player: Fix multi speed bug
 2013-10-18 08:09:42 -07:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" 
This reverts commit a517dc2085.
 2013-10-18 09:22:30 -04:00
Ned Batchelder
d3c7c0834d Simple cleanups of DictFieldData 
I tried to make DictFieldData strict about only being used with one
block.  That effort failed ultimately, but these are reasonable changes
I made along the way.
 2013-10-18 04:51:42 -04:00
polesye
df091e5023 Remove $.cookie. 2013-10-18 11:04:06 +03:00
polesye
dda6fbd45c Fix typo. 2013-10-18 08:51:46 +03:00
polesye
730113837b Add js unit tests. 2013-10-18 08:47:09 +03:00
polesye
eeab7847b4 Add resizing. 2013-10-18 08:47:09 +03:00
Giulio Gratta
cca057df56 Merge pull request #1395 from edx/giulio/ICE-confirm-reset 
Add confirm dialog to ICE reset changes
 2013-10-17 17:23:22 -07:00
Gabe Mulley
d2b03e28fb add course_id to event context 2013-10-17 17:44:01 -04:00
Giulio Gratta
af0239ab0b add confirm dialog to ICE reset changes 2013-10-17 14:11:05 -07:00
Giulio Gratta
0b8058d8c0 Merge pull request #1377 from edx/giulio/ICE-undo 
Tweaking ICE undo feature
 2013-10-17 13:58:45 -07:00
Sarina Canelake
9fb1d9ecf2 Remove 'Email Settings' link on student dashboard for unauth courses 2013-10-17 15:10:47 -04:00
Giulio Gratta
db802fb543 update code to reflect comment 2013-10-17 11:30:54 -07:00
Don Mitchell
2678f2a148 Merge pull request #1386 from edx/dhm/bug-courseid 
Allow - ~ and . in course, branch, & block ids
 2013-10-17 11:21:21 -07:00
Don Mitchell
9fc5a8a4d6 Allow - ~ and . in course, branch, & block ids 2013-10-17 13:31:44 -04:00
Giulio Gratta
5e45861dfb Merge pull request #1374 from edx/giulio/video-help-text 
Added help text to multiple speed video fields
 2013-10-17 09:46:07 -07:00
Julia Hansbrough
d82fa03884 Merge pull request #1380 from edx/flowerhack/fix/certDollarValueConfirm 
Flowerhack/fix/cert dollar value confirm
 2013-10-17 09:04:48 -07: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
Julia Hansbrough
04bc669d09 Fixed bug LMS-1117 
When registering for an verified certificate, if you selected a suggested price option, closed the browser halfway through the steps, and re-opened, the contribution would be written in the text input field instead of preselecting the appropriate radio button.  This commit fixes that behavior
 2013-10-17 14:59:43 +00: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
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
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
Giulio Gratta
1fad68b5ca Adding ICE undo feature 2013-10-16 16:01:56 -07:00
brianhw
12d98daecf Merge pull request #1376 from edx/adam/disable-accounts-2 
Adam/disable accounts 2
 2013-10-16 15:01:46 -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
Adam Palay
1fc993ce18 add functionality to disable users 
add middleware to detect students with disabled accounts

add tests
 2013-10-16 16:57:11 -04:00
Adam Palay
421174980a add UserStanding model 
add migration
 2013-10-16 16:57:06 -04:00
Don Mitchell
fbc68df88b Ensure bootstrapping tests start w/ clean slate. 2013-10-16 16:54:31 -04:00