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
c1450c8375
Merge pull request #1349 from mulby/gabe/course-id-context
...
add course_id to all emitted events
2013-10-17 15:45:37 -07:00
Jason Bau
e5cda013a2
Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware
...
Jbau/shoppingcart user middleware
2013-10-17 15:41:11 -07:00
Gabe Mulley
d2b03e28fb
add course_id to event context
2013-10-17 17:44:01 -04:00
Greg Price
0138322c2b
Merge pull request #1371 from edx/gprice/cs-request-logging
...
Log all comments service requests
2013-10-17 14:32:04 -07:00
Jason Bau
7223bb125e
make condition inline
2013-10-17 14:21:44 -07:00
cahrens
0c5b511c57
Include tail from header tag in course update.
...
Fixes bug STUD-590.
2013-10-17 17:14:11 -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
Jay Zoldak
5d84cd0627
Add synchronization logic for waiting after adding components in acceptance tests
2013-10-17 16:48:40 -04:00
Will Daly
e53c1f5f32
Merge pull request #1186 from edx/will/js-test-xunit
...
JavaScript xunit reports.
2013-10-17 13:37:53 -07:00
Giulio Gratta
6accfcd567
change various text items to be more clear for users, as well as some grammar
2013-10-17 13:18:58 -07:00
Brian Talbot
aba8fa6870
Merge pull request #1391 from edx/talbs/fix-lms-carouselcss
...
LMS: FIX - Resolves path to vendor carousel CSS (again)
2013-10-17 13:00:34 -07:00
Brian Talbot
58548af9c7
LMS - revises pipeline vendor file references
2013-10-17 15:55:37 -04:00
Sarina Canelake
b3faf5c476
Merge pull request #1390 from edx/sarina/disable-student-email-settings-with-auth
...
Student Dash: Disable "Email Settings" when course isn't authorized
2013-10-17 12:17:58 -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
brianhw
ff7d906d07
Merge pull request #1388 from edx/brian/fix-email-subtask-dupes
...
Check that a subtask has not already completed before running.
2013-10-17 11:22:21 -07:00
Will Daly
7316a3dc3b
js-test-tool generates xunit reports.
2013-10-17 14:22:09 -04: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
Will Daly
c1a5f18e9b
Updated testing docs
2013-10-17 14:17:48 -04:00
Sarina Canelake
bec6be1b9b
Merge pull request #1389 from edx/sarina/error-catch
...
Catch email exceptions on the legacy dash
2013-10-17 11:03:57 -07:00
Sarina Canelake
582e21b92d
Course Auth tests for legacy dash
2013-10-17 13:49:42 -04:00
Sarina Canelake
951837f7c9
Catch email exceptions on the legacy dash
2013-10-17 13:39:13 -04:00
Brian Talbot
d0fe1d69a0
Merge pull request #1385 from edx/talbs/fix-lms-css
...
LMS: CSS Fixes for Re-architected Pipeline
2013-10-17 10:38:05 -07:00
Brian Talbot
25b24bef2b
LMS: revises IE banner logic to show for IE9 as well
2013-10-17 13:38:02 -04:00
Brian Talbot
73f2cdf670
LMS: syncs up IE warning banner UI with new IE detection technique
2013-10-17 13:38:02 -04:00
Brian Talbot
1c7882a6bb
LMS: syncs up edge-based view with new pipeline CSS assets
2013-10-17 13:38:02 -04:00
Brian Talbot
309d7d99ad
LMS: removes overkill/turbo :invalid pseudo class style for form inputs
2013-10-17 13:38:02 -04:00
Brian Talbot
f83fb88099
Merge pull request #1382 from edx/talbs/fix-css-vendor
...
LMS: FIX - Resolves path to vendor carousel CSS
2013-10-17 10:37:15 -07:00
Brian Talbot
1db0c1dc74
LMS: resolves incorrectly named vendor CSS files
2013-10-17 13:37:15 -04:00
Brian Talbot
d871d97112
Merge pull request #1383 from edx/talbs/fix-wiki-css
...
LMS: FIX - Updates Wiki Templates to Use Re-architected CSS
2013-10-17 10:36:28 -07:00
Brian Wilson
a699674015
Check that a subtask has not already completed before running.
2013-10-17 13:32:44 -04:00
Don Mitchell
9fc5a8a4d6
Allow - ~ and . in course, branch, & block ids
2013-10-17 13:31:44 -04:00
Don Mitchell
4b225de3a0
Merge pull request #1381 from edx/bug/clear_assets
...
Ensure contentstore has no assets before generating test set
2013-10-17 10:25:37 -07: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
Brian Talbot
5e46796e90
LMS: updates wiki templates to reference new pipeline assets
2013-10-17 11:46:22 -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
fe438bec27
Ensure contentstore has no assets before generating test set
2013-10-17 11:08:25 -04:00
Julia Hansbrough
87d0ab91d5
Removed unused template
2013-10-17 15:02:05 +00: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
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
