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

18333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
e381adbc3e Make js unit tests out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
8ba94bb2a5 Remove js unit tests. 2013-08-12 14:31:47 +03:00
Vasyl Nakvasiuk
28b0ba5e10 Migrate video tests to videoalpha tests, remove video tests. 2013-08-12 14:31:47 +03:00
ichuang
12ad9c8558 make CMS user view not show ErrorDescriptor courses 2013-08-11 15:27:12 +00:00
chrisndodge
4f321897df Merge pull request #620 from edx/feature/cdodge/convert-to-portable-links-on-import-and-clone 
Feature/cdodge/convert to portable links on import and clone
 2013-08-11 06:20:11 -07:00
Peter Fogg
8b2346fc51 Merge pull request #628 from edx/peter-fogg/fix-unit-delete-jump 
Fix jumping to the top of the page on unit delete.
 2013-08-10 06:48:51 -07:00
Chris Dodge
e23ec4f221 on the new envs configuration file, we need to squelch pylint errors on the from dev import * 2013-08-10 00:29:17 -04:00
Chris Dodge
20b957518c resolve last code violation 2013-08-09 20:53:17 -04:00
Chris Dodge
f170d85547 fix wrapping, but mainly want to kick off another build due to Jenkins problem 2013-08-09 20:46:14 -04:00
Chris Dodge
1c2958e35d address PR feedback 2013-08-09 20:46:14 -04:00
Chris Dodge
c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. 2013-08-09 20:46:14 -04:00
Chris Dodge
b1b8f19c88 add another test. Seems like we never had an explicit test on an import into a new course-id. This fixes that 2013-08-09 20:46:13 -04:00
Chris Dodge
6b0e992d9e change regex names to better reflect what the actually match on 2013-08-09 20:46:13 -04:00
Chris Dodge
d9d8d96e05 also support a link rewriting on course import and clone for the following format /courses/[org]/[course]/[run]/. We just need to substitute in the new course-id. 2013-08-09 20:46:13 -04:00
Chris Dodge
607573fbd9 add test files 2013-08-09 20:46:13 -04:00
Chris Dodge
e2358af6a9 add ability to rewrite links on the old /courses/<org>/<course>/<run>/jump_to/i4x://<org>/<course> .. intracourseware linking to the new portable /jump_to_id/<id> format 2013-08-09 20:46:13 -04:00
Chris Dodge
25d6de243e add portable link rewriting on clone. Added tests. 2013-08-09 20:46:12 -04:00
Chris Dodge
36fda35040 do portable link rewriting on import and add test to confirm it 2013-08-09 20:46:12 -04:00
marco
910523eee5 merge conflicts resolved 2013-08-09 18:45:54 -04:00
marco
68199da821 added oe-tools header areas to eventually consolitate all messaging 2013-08-09 18:44:15 -04:00
Vik Paruchuri
29d9cfc54e Better handle edge cases 2013-08-09 18:04:11 -04:00
caesar2164
5b5c8151d0 Merge pull request #618 from edx/giulio/secure-embeds 
changing http:// to // on intro video urls
 2013-08-09 14:19:21 -07:00
Giulio Gratta
464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds 2013-08-09 14:13:41 -07:00
Vik Paruchuri
c4a2f7dcdc Fix invalid state 2013-08-09 17:01:07 -04:00
Sarina Canelake
6b16ef0adf Merge pull request #631 from edx/sarina/upgrade-diff-cover 
Upgrade diff-cover to newest version
 2013-08-09 13:59:56 -07:00
Vik Paruchuri
5c9538a9a1 Address review comments 2013-08-09 16:46:25 -04:00
Jonah Stanley
f4799f983e Merge pull request #630 from edx/jonahstanley/fix-courseteam-tests 
Jonahstanley/fix courseteam tests
 2013-08-09 13:09:17 -07:00
Sarina Canelake
d6e06e441f Upgrade diff-cover to newest version 2013-08-09 15:55:43 -04:00
JonahStanley
0595459c01 Revert back to old way of logging someone else in 2013-08-09 15:27:46 -04:00
Peter Fogg
cde8ee50d7 Fix jumping to the top of the page on unit delete. 2013-08-09 15:18:08 -04:00
Vik Paruchuri
6543343388 Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui 2013-08-09 14:51:13 -04:00
Vik Paruchuri
33da3ec1cf Fix self assessment template 2013-08-09 14:50:57 -04:00
cahrens
835edbf32f Change locators to a restful interface. 
Don't use ; @ and # as separators.
 2013-08-09 14:49:32 -04:00
Vik Paruchuri
8cf82f2973 Fix self assessment test 2013-08-09 14:38:30 -04:00
Miles Steele
e9aca13636 enable beta dashboard 2013-08-09 14:22:56 -04:00
Miles Steele
f6fc1aeed9 hide empty management list selector, add explanation text 2013-08-09 14:22:56 -04:00
Miles Steele
58c6b9bb61 add privilege copy 2013-08-09 14:22:55 -04:00
Miles Steele
53bda391ae Merge pull request #625 from edx/fix/msteele/instr-i18n 
Fix enroll-multiple button
 2013-08-09 11:05:32 -07:00
JonahStanley
8feaa0ffa4 Added in a wait upon logging in 2013-08-09 13:57:22 -04:00
Miles Steele
8f8d70aeae fix enroll multiple button, fix module_error report 2013-08-09 13:45:27 -04:00
Feanil Patel
822f3a7865 Merge pull request #607 from edx/feanil/master_with_release 
Feanil/master with release
 2013-08-09 10:44:44 -07:00
Adam
abd17a2472 Merge pull request #623 from edx/adam/unicode-encode-error 
make template string unicode
 2013-08-09 10:35:32 -07:00
Miles Steele
25d45b8578 Merge pull request #574 from edx/feature/msteele/instrdash 
Add cronjob analytics to instructor dashbaord
 2013-08-09 10:26:50 -07:00
Vik Paruchuri
6e41c082b1 Fix tests 2013-08-09 12:30:05 -04:00
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -04:00
Will Daly
9769f364e1 Updated tests to weaken "number" input field requirement, which 
isn't supported in Firefox.
 2013-08-09 12:10:53 -04:00
marco
166c4c6939 cleaned up merge issue in combined_open_ended.html 2013-08-09 11:31:33 -04:00
marco
e1cba4b0b4 cleaned up html structure for various pages, style fixed for show/hide prompt item 2013-08-09 11:26:59 -04:00
Vik Paruchuri
5d16bc9eb6 Remove ad-hoc patch for xblock issue 2013-08-09 11:24:07 -04:00