Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

6956 Commits

Author SHA1 Message Date
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
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
Brian Talbot
5de21ae541 adds/relocates shared vendor css (and assets) to static directories 2013-10-16 16:45:32 -04:00
Giulio Gratta
23bd9f5012 added help text to multiple speed video fields 2013-10-16 13:35:59 -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
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
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Julia Hansbrough
fd54b060d8 added self to authors style, changed GET to POST 2013-10-16 13:01:57 -04:00
Will Daly
3f88b87916 Added acceptance tests for bulk email (through beta dashboard) 2013-10-16 13:01:57 -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
brianhw
014089e62a Merge pull request #1364 from edx/ned/cherry-pick-pr-1297 
Add EmptyDataRawDescriptor.
 2013-10-16 09:09:19 -07:00
brianhw
7fca5e8b34 Merge pull request #1360 from edx/valera/carry_over_of_add_option_transcripts_remove_onhover_2 
Valera/carry over of add option transcripts remove onhover 2
 2013-10-16 09:03:29 -07:00
polesye
de48e4a9d6 Add EmptyDataRawDescriptor. 2013-10-16 10:39:02 -04:00
Diana Huang
8ec9a16d81 Fix parentheses so that we only pull the course modes we want. 2013-10-16 10:15:34 -04:00
Valera Rozuvan
4b371d4748 Fixing Jean Michel access. bug. 2013-10-16 15:45:13 +03:00