Commit Graph

4642 Commits

Author SHA1 Message Date
cahrens
0c5b511c57 Include tail from header tag in course update.
Fixes bug STUD-590.
2013-10-17 17:14:11 -04:00
Jay Zoldak
5d84cd0627 Add synchronization logic for waiting after adding components in acceptance tests 2013-10-17 16:48:40 -04:00
Don Mitchell
fe438bec27 Ensure contentstore has no assets before generating test set 2013-10-17 11:08:25 -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
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
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
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
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
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
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
Will Daly
f2c417b638 Write Django logs to file during acceptance tests 2013-10-16 15:44:35 -04: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
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
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
polesye
2e216a2c14 Clean up the code. 2013-10-16 15:45:04 +03:00
polesye
46abe397e2 Fix acceptance tests. 2013-10-16 15:44:59 +03:00
polesye
0bd706b6a1 Tidy up the code. 2013-10-16 15:44:55 +03:00
Valera Rozuvan
55fde6e5a7 Updated acceptance tests. 2013-10-16 15:44:30 +03:00
Valera Rozuvan
1f84053046 Updated acceptance tests. 2013-10-16 15:44:25 +03:00
Valera Rozuvan
e1e0cba033 Added acceptance tests. 2013-10-16 15:44:21 +03: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
David Baumgold
40e540284f wait to load video module until YT API is ready 2013-10-16 13:28:28 +03:00
Valera Rozuvan
a7f3bb2b00 Added back on hover CC button functionality.
Fixing falling test. Added fix for RequireJS & XModule loader video race condition.
Removed unnecessary comments from SCSS and JS files.
Added entry to Change Log.
2013-10-16 12:02:19 +03:00
Will Daly
adc46716b6 Wait for non-blank link in course-overview test 2013-10-15 21:21:09 -04:00
Christina Roberts
ccd692dd86 Merge pull request #1133 from edx/jkarni/fix/customtag-error
Jkarni/fix/customtag error
2013-10-15 14:23:45 -07:00
Will Daly
52a475885c Merge pull request #1350 from edx/db/enable-tender
re-enable tender
2013-10-15 14:10:43 -07:00
Julian Arni
d9ba410388 Review fixes 2013-10-15 16:52:35 -04:00
Julian Arni
9798da413d Review fixes 2013-10-15 16:16:10 -04:00
Frances Botsford
de1ee17323 fixing alignment error on studio component error message, i18n error message 2013-10-15 16:16:09 -04:00
Julian Arni
b7485fd812 Review fixes 2013-10-15 16:16:09 -04:00
Frances Botsford
9f188ed20c additional copy and styling for component syntax error in studio 2013-10-15 16:16:09 -04:00
Julian Arni
2721966d76 Added acceptance tests for get_html exception handling
Make tests conform to new import UI
2013-10-15 16:16:09 -04:00
Frances Botsford
faadc33fcc leveraging some of the existing notification styling for component errors in studio 2013-10-15 16:16:09 -04:00
Julian Arni
62a8c420ed Check for exceptions when rendering studio and students views.
Otherwise it's possible to reach stuck states.
2013-10-15 16:16:09 -04:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
2013-10-15 15:53:48 -04:00
Brian Talbot
e825cfb1db Merge pull request #1311 from edx/talbs/fix-studio-importui
Studio: FIX - Import Status UI Consistency
2013-10-15 11:29:48 -07:00
David Baumgold
eec7118f2b enable tender
This reverts commit 96485694d3.
2013-10-15 14:19:26 -04:00
cahrens
00ebcf7fe7 Move index code into index.js. 2013-10-15 14:14:55 -04:00
Christina Roberts
8e45668a83 Merge pull request #1329 from edx/christina/import-cleanup
Remove dead code and move import code into import.js.
2013-10-15 11:11:30 -07:00
Christina Roberts
54498e15ae Merge pull request #1328 from edx/christina/toggle-sock
Move sock JS code into its own file.
2013-10-15 10:55:44 -07:00
Brian Talbot
8769a1a687 Studio: revises layout for success step and actions in import view 2013-10-15 13:44:33 -04:00