Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

8693 Commits

Author SHA1 Message Date
Brian Talbot
c42bff6528 LMS: preps track selection view for upgrade cases 2013-10-30 09:26:31 -04:00
Diana Huang
56f6711252 Add in new hooks for the dashboard into the upgrade path. 2013-10-30 09:26:31 -04:00
Diana Huang
ebd63b6188 Add an upgrade parameter to the verification views. 2013-10-30 09:26:31 -04:00
Will Daly
83fcc318c6 Fixed test that was failing in Vagrant due to filesystem encoding 
mismatch
 2013-10-30 09:23:48 -04:00
Don Mitchell
80c83f0b88 Merge pull request #1508 from edx/dhm/expect_json 
Change expect_json to put parsed json in new attr
 2013-10-29 14:02:32 -07:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
Diana Huang
d3a4747b06 Add new user_status functionality to PhotoVerification. 2013-10-29 15:13:45 -04:00
Calen Pennington
ac8eeb681f Make sequence module use ajax_url properly 2013-10-29 10:36:22 -04:00
Calen Pennington
ae32abfd62 Give a better error message when capa recieves an unknown action 2013-10-29 10:36:22 -04:00
Calen Pennington
10ee2dea82 Clean up imports 2013-10-29 10:36:22 -04:00
polesye
23590102da BLD-205: fix total count. 2013-10-29 15:38:29 +02:00
Will Daly
1435c90306 Disable multiple YT test due to flakinesss 2013-10-29 09:01:20 -04:00
Gabe Mulley
3f89967645 Merge pull request #1478 from mulby/gabe/track-user-id 
add user_id to tracking context
 2013-10-29 05:48:43 -07:00
Gabe Mulley
4f4e58b5f6 add user_id to tracking context 
AN-213
 2013-10-29 08:18:01 -04:00
polesye
6130189bdf Fix slider and pause bugs. 2013-10-29 11:34:47 +02:00
polesye
389beedcf9 Fix speed change bug. 2013-10-29 11:34:47 +02:00
Brian Talbot
bd858b328e Merge pull request #1189 from edx/talbs/studio-cssarch 
Studio: Revised CSS Architecture (resolves STUD-806)
 2013-10-28 17:44:50 -07:00
Diana Huang
92c94b5317 Merge pull request #1483 from edx/diana/certs-upgrade-path 
Verified Certificate Upsell
 2013-10-28 14:28:50 -07:00
Vik Paruchuri
9f9f5e4c2a Ensure that peer grading modules whose linked problem is removed change over to panel mode 2013-10-28 16:40:13 -04:00
Vik Paruchuri
fd72005a17 Ensure that peer grading modules whose linked problem is removed change over to panel mode 2013-10-28 16:35:16 -04:00
David Baumgold
d844743667 Merge pull request #1520 from edx/db/accept-db-var 
pylint: db is a valid variable name
 2013-10-28 13:08:13 -07:00
Diana Huang
4be5bccbcf Make sure the correct mode is chosen during upgrade 
LMS-1127
 2013-10-28 15:09:20 -04:00
Brian Talbot
e9a2787bb3 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-28 14:58:14 -04:00
Diana Huang
35ebdfdca4 Better handling of the expiration date. 
LMS-1127
 2013-10-28 14:39:46 -04:00
David Baumgold
ff5baa7ace pylint: db is a valid variable name 2013-10-28 14:31:23 -04:00
David Baumgold
3a98ee5882 Merge pull request #1295 from IainNZ/patch-1 
Added a [code] block to the problem markdown parser
 2013-10-28 10:34:05 -07:00
Christina Roberts
5449a3ccbb Merge pull request #1506 from edx/christina/codemirror-css 
Add css mode to the compressed file.
 2013-10-28 06:18:58 -07:00
Usman Khalid
e027e50028 Merge pull request #1345 from edx/usman/lms1222-email-confirm-transaction-errors 
Commit/rollback transaction after rendering response to prevent TransactionManagementErrors due to db access in templates.
 2013-10-28 03:13:01 -07:00
Brian Talbot
b7594142fc Studio: adds in specific older IE support area into Sass/CSS architecture 2013-10-26 21:26:53 -04:00
Brian Talbot
95dd21738c Studio: revises CSS reference/pipeline architecture for better organization, reduced redundancy, and to handle IE9 selector limits 2013-10-26 21:26:53 -04:00
Iain Dunning
a75b764cda Added a [code] block to the problem markdown parser 
Adds a code block to the problem markdown parser that translates
[code]
TestTest
[/code]
to
<pre><code>
TestTest
</code></pre>
 2013-10-26 13:12:58 -04:00
dcadams
5fbda0c63b Merge pull request #1396 from edx/dcadams/fix_static_paths 
Fix for static path parsing
 2013-10-25 14:54:59 -07:00
David Adams
20f1feb7b1 Fix for static path parsing 
When a url contains a query parameter it gets incorrectly parsed
when replacing the /static portion.

This fix handles urls with query parameters.
 2013-10-25 13:02:29 -07:00
cahrens
c7c0aacb00 Add css mode to the compressed file. 
STUD-833
 2013-10-25 15:33:31 -04:00
Diana Huang
23762a1569 Move more logic into the views 
Also includes some tests

Story: LMS-1127
 2013-10-25 15:29:44 -04:00
David Baumgold
dc589f723c Merge remote-tracking branch 'origin/release' 2013-10-25 15:29:03 -04:00
Julia Hansbrough
16356e5cf6 Fixed LMS-1062 2013-10-25 15:23:51 -04:00
Brian Talbot
618d307d1f LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00
Diana Huang
115ccf87de Add in new hooks for the dashboard into the upgrade path. 2013-10-25 15:21:42 -04:00
Diana Huang
e13dd094af Add an upgrade parameter to the verification views. 2013-10-25 15:21:42 -04:00
Jason Bau
832e262400 Merge pull request #1497 from edx/jbau/fix-ora-uploads 
test bucket existence before creation
 2013-10-25 10:53:25 -07:00
Carlos Andrés Rocha
7d76f36018 Make course xml export work for all modulestores 
Also let xml import work on modulestores that don't use write signaling
 2013-10-25 11:58:17 -04:00
Jason Bau
d0185c934a make OEE upload test pass 2013-10-25 08:32:50 -07:00
Jason Bau
63bdeea44b test bucket existence before creation 2013-10-25 08:32:50 -07:00
Usman Khalid
8f356fc3ec student.views.confirm_email_change: commit/rollback transaction after rendering response instead of before 2013-10-25 15:02:53 +00:00
Usman Khalid
6ddd0ae5ab student.tests: Added db access in mock_render_to_response() to test any issues with @transaction.commit_manually 2013-10-25 15:02:52 +00:00
Diana Huang
67da62f83c Update the JS to match the new semantics. 
Bug: LMS-1311
 2013-10-24 17:12:40 -04:00
Brian Talbot
de12777555 simplifying semantic and stylistic properties of skip nav UI 2013-10-24 17:12:40 -04:00
Diana Huang
43bdb5da54 Minor fixes to match new HTML and CSS updates. 
LMS-1311
 2013-10-24 17:12:20 -04:00
Brian Talbot
5b63b176da revises semantics and Sass used for skip navigation 2013-10-24 17:12:19 -04:00