Adam Palay
c9ce25bcb2
small unicode fix in instr dash
2013-10-02 16:24:13 -04:00
Jay Zoldak
a3525875fd
Merge pull request #1138 from edx/zoldak/locked-asset-tests
...
Refactor upload tests and add locked asset tests for registered user
2013-10-02 05:13:29 -07:00
Jay Zoldak
6e3ece92e3
Refactor upload acceptance tests and add locked asset tests for registered user
2013-10-02 08:12:58 -04:00
Nick Parlante
67722f1a81
Merge pull request #1147 from edx/nick/tab-edit
...
Create management command to edit course's tabs
2013-10-01 14:31:40 -07:00
marco
81a2ac413d
Merge branch 'release'
...
Conflicts:
lms/djangoapps/instructor/views/instructor_dashboard.py
2013-10-01 17:05:02 -04:00
Will Daly
bb60c4046d
Merge pull request #1190 from edx/will/fix-test-docs
...
Fix run single test example
2013-10-01 13:02:13 -07:00
Will Daly
b5fc5d89d3
Fix run single test example
2013-10-01 15:53:16 -04:00
Ned Batchelder
ac23149f58
Merge pull request #1100 from edx/ned/new-xml
...
New XML infrastructure for XBlocks
2013-10-01 12:27:36 -07:00
Ned Batchelder
0bb11335b2
We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability.
2013-10-01 13:53:59 -04:00
Nick Parlante
0ed1ee917e
Create edit_course_tabs management command
...
Just works on the tabs list in mongo, nothing
deeper than that.
Added implementation functions in tabs.py,
providing a first step for some future
GUI editor.
2013-10-01 10:49:51 -07:00
Ned Batchelder
cdb80bb8ed
Fix the new tests to use the new way to make XBlocks.
2013-09-30 21:09:44 -04:00
Ned Batchelder
718328e4e6
Get rid of all mention of XModuleDescriptor.
2013-09-30 21:09:43 -04:00
Ned Batchelder
a1d464aed9
Update XBlock requirement to new XML code.
2013-09-30 21:09:43 -04:00
Ned Batchelder
3a6450c3fc
Use XModuleDescriptor.parse_xml to interpret XML.
2013-09-30 21:09:43 -04:00
Ned Batchelder
c36adf84a0
Minor cosmetic code fixes.
2013-09-30 21:09:43 -04:00
Ned Batchelder
d7e441088b
Adjust parameters to construct_xblock_from_class to match XBlock repo.
2013-09-30 21:09:43 -04:00
jmclaus
e73bc906c8
Merge pull request #1134 from edx/jmclaus/bugfix_video_controls_focus_outline
...
All video controls have a full outline when receiving focus
2013-09-30 13:23:54 -07:00
jmclaus
aeac8dddbb
All video controls have a full outline when receiving focus
2013-09-30 20:47:05 +02:00
Jason Bau
7d578e4f1f
Update CHANGELOG.rst
2013-09-30 11:23:40 -07:00
Jason Bau
829d0d5dd0
Merge pull request #1174 from edx/jbau/fix/optional-enable-shopping-cart
...
make ENABLE_SHOPPING_CART truly optional
2013-09-30 11:05:38 -07:00
Jason Bau
06cac195f0
make ENABLE_SHOPPING_CART truly optional
...
course_about was throwing 500s if ENABLE_SHOPPING_CART=False
2013-09-30 09:09:17 -07:00
Carlos Andrés Rocha
16caf1cdb5
Merge pull request #1177 from rocha/fix-enrollment-counts
...
Fix course enrollment count in instructor dashboard
2013-09-30 09:07:10 -07:00
Ned Batchelder
7e8825757d
Merge pull request #1176 from edx/ned/organize-gitignore
...
Add .noseids to .gitignore, but first organize it.
2013-09-30 09:06:32 -07:00
Carlos Andrés Rocha
2e7e354076
Fix course enrollment count in instructor dashboard
...
Fix AN-115
2013-09-30 11:41:49 -04:00
Ned Batchelder
0f3bb1e7cd
Ignore .noseids files wherever they appear.
2013-09-30 11:10:44 -04:00
Ned Batchelder
486d32caae
Rearrange and comment .gitignore so I can find things.
2013-09-30 11:09:34 -04:00
jmclaus
427f1184ae
Merge pull request #1150 from edx/jmclaus/bugfix_outline_mouseover_first_caption
...
First caption does not display outline on initial mouseover.
2013-09-30 07:26:30 -07:00
Vik Paruchuri
577749ff80
Merge pull request #1163 from edx/fix/vik/image-upload
...
Streamling, test, and fix issues with image uploading
2013-09-27 15:34:23 -07:00
Don Mitchell
1c6e00572a
Merge pull request #1137 from edx/dhm/pr271_fixups
...
old pr 271 comment fixups
2013-09-27 14:19:25 -07:00
Greg Price
c850be4ab9
Merge pull request #1167 from edx/fix/kevin/forums_accessibility
2013-09-27 14:18:09 -07:00
Greg Price
db325e78e3
Merge pull request #1169 from edx/gprice/forum-load-more-focus
...
Improvements in forums nav sidebar
2013-09-27 14:13:00 -07:00
Kevin Chugh
9a5e6f1fdd
code review cleanup
2013-09-27 17:12:48 -04:00
Vik Paruchuri
c11f708d0f
Merge pull request #1080 from edx/fix/vik/oe-problems
...
Clean up open ended problems view and fix error.
2013-09-27 14:12:15 -07:00
Vik Paruchuri
19fb2017be
Streamline and test uploading ... remove requirement that uploads be images, can now upload any file.
2013-09-27 17:08:34 -04:00
Greg Price
cbbb5c7e7e
Improve focus management of forums nav sidebar
...
Now, when the list is reset (e.g. by sorting), the first thread is
focused. When the "Load more" link is clicked, upon loading more
threads, focus moves to the thread immediately following the thread
that was previously last in the list.
2013-09-27 16:57:11 -04:00
Adam
031f331ab6
Merge pull request #1157 from edx/adam/a11y
...
make seq tooltips appear on focus
2013-09-27 13:41:01 -07:00
Don Mitchell
d79220122c
Change DescriptionLocator to DefinitionLocator
2013-09-27 16:27:02 -04:00
Kevin Chugh
d816d5fade
update coffeescript to dynamically render sr spans
2013-09-27 16:24:30 -04:00
Adam Palay
202e4f94e7
make seq tooltips appear on focus
...
remove focus from tab when clicked
2013-09-27 16:22:46 -04:00
Calen Pennington
37627704dc
Merge pull request #1117 from cpennington/manage.py-only-tests
...
Move nose arguments around so that we can run tests with manage.py
2013-09-27 13:13:03 -07:00
Don Mitchell
f8c7278470
Follow patterns
...
Move init to top of class
Change asserts to more meaningful exception types
Refactor hard-to-read fn
2013-09-27 16:03:57 -04:00
Vik Paruchuri
9a6ae8f740
Clean up open ended problems view and fix error.
2013-09-27 16:02:12 -04:00
Greg Price
b12e502c02
Merge pull request #1168 from edx/fix/vik/num-results-template
2013-09-27 12:59:01 -07:00
Vik Paruchuri
4ab47c4d05
Fix mako syntax in rubric template.
2013-09-27 15:57:41 -04:00
e0d
759a853464
Merge pull request #1063 from edx/e0d/django-1.4.8
...
Upgrading to 1.4.8
2013-09-27 12:54:44 -07:00
Usman Khalid
bc56ab7c13
Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows
...
Disables the previous/next arrows on pdf books on the first/last pages
2013-09-27 12:50:38 -07:00
Calen Pennington
67ccf1e3bb
Move nose/django arguments for tests out of rake so that raw manage.py works when running tests
2013-09-27 15:41:58 -04:00
Usman Khalid
316b4eee95
Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional
...
Added setting to disable 'find courses' links
2013-09-27 12:40:07 -07:00
Greg Price
f39886ef57
Ensure nav sidebar is sized correctly on page load
2013-09-27 15:34:32 -04:00
Usman Khalid
64d4ebdaa1
Revert last commit
2013-09-28 00:14:07 +05:00
