Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
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
polesye
1ee1eb6946 Fix comments. 2013-10-18 20:01:13 +03:00
polesye
547dc11c99 Revert "Fix a malformed custom_parameter bug." 
This reverts commit 75bdc1eebfd444bf00102b486a881f5776bbc407.
 2013-10-18 20:01:13 +03:00
polesye
a6a5300b90 Fix custom parameter. 2013-10-18 20:01:13 +03:00
polesye
e62c047fdf Fix a malformed custom_parameter bug. 2013-10-18 20:01:13 +03:00
polesye
c4bb2ac757 Remove adding prefix to custom parameters. 2013-10-18 20:01:12 +03: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
ichuang
757ce61d3e Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path 2013-10-16 22:00:13 -04: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
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