Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • c1e037918c add docstring on StaticContent utility method Chris Dodge 2013-08-07 21:07:51 -04:00
  • bffec584f7 add docstring Chris Dodge 2013-08-07 21:01:14 -04:00
  • 3667fe8bd0 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui marco 2013-08-07 16:35:32 -04:00
  • 56dee21142 partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss marco 2013-08-07 16:35:14 -04:00
  • e942e93f9d Merge branch 'release' into master Feanil Patel 2013-08-07 16:14:21 -04:00
  • 7237f8026f Merge pull request #604 from edx/hotfix/2013-08-07 Feanil Patel 2013-08-07 12:55:40 -07:00
  • df25770fa7 Assign isExternal JS function to window object David Baumgold 2013-08-06 16:39:02 -04:00
  • 8ae3341667 Merge pull request #605 from edx/peter-fogg/fix-videoalpha-acceptance Peter Fogg 2013-08-07 12:07:15 -07:00
  • a19c1a3c20 Make the virtualenvs on jenkins use site-packages for numpy, scipy, etc. Jay Zoldak 2013-08-07 15:03:23 -04:00
  • d11d761704 Merge pull request #585 from edx/sarina/update-xblock-version Sarina Canelake 2013-08-07 11:45:36 -07:00
  • df024b0bb1 Fix VideoAlpha acceptance test. Peter Fogg 2013-08-07 13:25:53 -04:00
  • 3a34529958 Need to call .save when modifying descriptor Sarina Canelake 2013-08-06 17:19:44 -04:00
  • b6bab0a121 Update XBlock version Sarina Canelake 2013-07-25 17:35:43 -04:00
  • ead87d1fde Merge pull request #602 from edx/jonahstanley/fix-acceptance-template Jonah Stanley 2013-08-07 10:12:06 -07:00
  • ed620e635b Reset the file within the test itself JonahStanley 2013-08-07 13:07:38 -04:00
  • a38f71cdbc Fixed the upload test JonahStanley 2013-08-07 13:06:25 -04:00
  • e30a9a6fe3 Created a new lettuce test to catch bug, updated other lettuce tests David Baumgold 2013-08-07 11:03:19 -04:00
  • ee3ce7b6c2 Don't ignore null datetimes on subsection settings David Baumgold 2013-08-07 09:45:44 -04:00
  • ae019ef8c9 Abstracted functionality to get datetime into separate JS function David Baumgold 2013-08-06 17:09:12 -04:00
  • aab9661fe9 Scoped pad2 function to the one place that it's called David Baumgold 2013-08-06 16:48:09 -04:00
  • c0bd7db293 Removed unused JS functions David Baumgold 2013-08-06 16:47:23 -04:00
  • d2c4ac2597 Fixed Jasmine tests David Baumgold 2013-08-06 14:30:19 -04:00
  • 9c09323b0d Properly parse and save section release times David Baumgold 2013-08-06 11:28:57 -04:00
  • 87ce16c70e Cleanup/reformatting David Baumgold 2013-08-06 11:28:35 -04:00
  • e8e09afa0a Make sure that we properly parse and save section release times David Baumgold 2013-08-06 10:45:14 -04:00
  • 2191a11151 Merge pull request #598 from edx/christina/email-studio-request Christina Roberts 2013-08-07 09:51:14 -07:00
  • 6e784d606f Merge pull request #596 from edx/db/ff-subsection-datetime-bug David Baumgold 2013-08-07 09:25:17 -07:00
  • 5919456f24 Fixed some course-team bugs and other css stuff JonahStanley 2013-08-07 12:03:25 -04:00
  • 2c78f0623c Merge pull request #603 from edx/alex/fix-videoalpha-importing-from-xml Alexander Kryklia 2013-08-07 08:47:42 -07:00
  • bbd8d84a28 Include the URL to the course creator admin table. cahrens 2013-08-07 11:34:51 -04:00
  • 5941f5b795 Fixed the other places that the css occurs JonahStanley 2013-08-07 11:30:50 -04:00
  • 56244783fd Merge pull request #591 from edx/vaxxxa/word_cloud_acceptance_tests Vasyl Nakvasiuk 2013-08-07 08:08:12 -07:00
  • 97aaab9cc6 Created a new lettuce test to catch bug, updated other lettuce tests David Baumgold 2013-08-07 11:03:19 -04:00
  • 495b5a366f Fix videoalpha import from xml Alexander Kryklia 2013-08-07 16:27:00 +03:00
  • 9e93d5588c Changed css_selector JonahStanley 2013-08-07 10:14:50 -04:00
  • 18be93c3d9 Don't ignore null datetimes on subsection settings David Baumgold 2013-08-07 09:45:44 -04:00
  • 57f8d21869 Merge pull request #599 from edx/db/fix-studio-login-next David Baumgold 2013-08-07 06:24:49 -07:00
  • ae8b2c883c add Word Cloud acceptance tests Vasyl Nakvasiuk 2013-08-06 15:04:07 +03:00
  • 16b5b95128 Merge pull request #506 from edx/ksteph/bugfix_offline_gradecalc Kristin 2013-08-06 14:53:30 -07:00
  • 10344905ba Abstracted functionality to get datetime into separate JS function David Baumgold 2013-08-06 17:09:12 -04:00
  • eefed18b7c Scoped pad2 function to the one place that it's called David Baumgold 2013-08-06 16:48:09 -04:00
  • 2d534a35af Removed unused JS functions David Baumgold 2013-08-06 16:47:23 -04:00
  • 82ac56068e Assign isExternal JS function to window object David Baumgold 2013-08-06 16:39:02 -04:00
  • e6f15bf611 Send notification to admin when a user enters 'pending' state. cahrens 2013-08-06 15:58:23 -04:00
  • 55f2cbc92f Split up event notification, make sorting on username work. cahrens 2013-08-06 15:53:07 -04:00
  • 4c95078eb0 Merge pull request #578 from edx/christina/autoenroll Christina Roberts 2013-08-06 12:33:56 -07:00
  • 147f7ed959 Merge pull request #573 from edx/fix/adam/ORA-load-image Adam 2013-08-06 12:15:54 -07:00
  • b69be70f65 Merge pull request #575 from edx/db/integrate-jsonresponse David Baumgold 2013-08-06 11:55:49 -07:00
  • 714d3b9662 pylint fixes David Baumgold 2013-08-06 14:36:13 -04:00
  • a0123d3a27 Fixed Jasmine tests David Baumgold 2013-08-06 14:30:19 -04:00
  • 08bb13edb4 Merge pull request #595 from edx/adam/i18n-bug-fixes Adam 2013-08-06 11:25:36 -07:00
  • 7ba6d191aa Merge pull request #577 from edx/jkarni/feature/pip-upgrade jkarni 2013-08-06 11:17:14 -07:00
  • ae517fee01 Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml Peter Fogg 2013-08-06 11:06:46 -07:00
  • 6716783009 Fix import mocks. Julian Arni 2013-08-06 14:01:22 -04:00
  • 0bbd80fedf Add verbose option Julian Arni 2013-08-06 14:00:31 -04:00
  • c4d6102af6 Merge pull request #584 from edx/fix/cdodge/allow-courseware-links-in-capa-module chrisndodge 2013-08-06 10:55:46 -07:00
  • 13339fb9e0 Merge pull request #592 from edx/slater/dev_env_fixup Slater-Victoroff 2013-08-06 10:52:13 -07:00
  • 6db1be6e00 add jasmine tests to verify link rewriting in HTML editor Chris Dodge 2013-08-06 13:38:14 -04:00
  • b24fdd9e22 Merge pull request #576 from edx/feature/cdodge/display-location-information-in-course-listings chrisndodge 2013-08-06 10:27:38 -07:00
  • 9c84440501 PR comment cleanup. Peter Fogg 2013-07-29 16:20:41 -04:00
  • 3e654550c8 Studio: corrects minor styling/formatting for multi-value metadata fields Brian Talbot 2013-07-29 15:51:42 -04:00
  • 99458e7223 Studio: revises visual layout/presentation of multi-value metadata fields Brian Talbot 2013-07-29 15:08:17 -04:00
  • 08c5f955aa Unstyled prototype for new list editor design. Peter Fogg 2013-07-24 13:58:54 -04:00
  • f317244ac4 Convert Video Alpha to metadata-only. Peter Fogg 2013-07-19 11:47:28 -04:00
  • 74b815274f Add a list view for metadata editor. Peter Fogg 2013-07-17 11:47:56 -04:00
  • 22fdef6b84 Properly parse and save section release times David Baumgold 2013-08-06 11:28:57 -04:00
  • 2445845d88 Make sure that we properly parse and save section release times David Baumgold 2013-08-06 10:45:14 -04:00
  • 55b68168e7 Cleanup/reformatting David Baumgold 2013-08-06 11:28:35 -04:00
  • ccc10f25f5 Small fixup to final print statement in Create Dev Env script Slater-Victoroff 2013-08-06 09:47:26 -04:00
  • 402d50bbf1 tz fix in openendedchild Adam Palay 2013-08-02 15:57:04 -04:00
  • 7a180c290b handle cases where the 'base-asset-url' is undefined, e.g. in Jasmine tests Chris Dodge 2013-08-06 11:16:37 -04:00
  • 4d5727a2da Merge pull request #570 from edx/fix/cdodge/add-metadata-caching-to-delete-course chrisndodge 2013-08-06 07:52:17 -07:00
  • d894600207 template fixes on instructor dash Adam Palay 2013-08-06 10:16:57 -04:00
  • cb54081d2e Fix notification problem Vik Paruchuri 2013-08-06 09:55:49 -04:00
  • 22d33db542 fix broken test due to HTML change Chris Dodge 2013-08-06 09:55:09 -04:00
  • 3732d418c9 Add helper methods to hide internals of how users are enrolled in courses. cahrens 2013-08-05 16:15:18 -04:00
  • 9728dceeb0 Adds RawDescriptro for VideoAlpha Alexander Kryklia 2013-08-06 11:29:51 +03:00
  • 67d1e55984 Merge pull request #590 from edx/alex/fix-videoalpha-descriptor Vasyl Nakvasiuk 2013-08-06 01:47:54 -07:00
  • f3a4d49591 Adds RawDescriptro for VideoAlpha Alexander Kryklia 2013-08-06 11:29:51 +03:00
  • dff3312178 refactor the coffeescript a bit more. Hopefully to resolve Jasmine failures Chris Dodge 2013-08-05 21:50:55 -04:00
  • 5dd202e592 update edge.html Adam Palay 2013-08-05 18:45:54 -04:00
  • d5aba29938 Merge pull request #588 from edx/fix/adam/redirect Adam 2013-08-05 15:49:22 -07:00
  • 4a99b7bfd6 update edge.html Adam Palay 2013-08-05 18:45:54 -04:00
  • 17b5ccf13a creates "edge" case Adam Palay 2013-08-05 18:08:32 -04:00
  • bf5af6c8cf add university_profile/edge.html for edge landing page Adam Palay 2013-08-05 17:11:33 -04:00
  • fa567f1fc6 Merge pull request #587 from edx/fix/adam/redirect Adam 2013-08-05 15:16:54 -07:00
  • 5d0328aa3e creates "edge" case Adam Palay 2013-08-05 18:08:32 -04:00
  • cac6a3195d add university_profile/edge.html for edge landing page Adam Palay 2013-08-05 17:11:33 -04:00
  • ef4220ee43 Add unit tests to exercise common_exceptions_400 decorator David Baumgold 2013-08-05 16:54:56 -04:00
  • d64894de02 Studio: revises markup and visual styling for course listings metadata Brian Talbot 2013-08-05 16:20:03 -04:00
  • 73b9e261e4 redirects lms landing page to student.views.index if there is no marketing site Adam Palay 2013-08-05 13:23:45 -04:00
  • d2f911211e fix cut/paste comment confusion Chris Dodge 2013-08-05 15:57:20 -04:00
  • da9a4b5d4f alter the HTML editor so that it can do the /static/ <--> /c4x/ substitutions when toggling back and forth between the visual and advanced editors Chris Dodge 2013-08-05 12:08:12 -04:00
  • 861f1ef7bb add a test for the static url generation Chris Dodge 2013-07-31 18:12:11 -04:00
  • b8bc1d0171 remove redudent asset_url return value when uploading files Chris Dodge 2013-07-31 18:02:38 -04:00
  • 3dbe4c189f add unit tests around asserting that /static/ links are not re-written on import Chris Dodge 2013-07-31 17:47:05 -04:00
  • d329e3c833 don't attempt to do URL rewriting in the import step, let the LMS/CMS runtimes do it on the fly on reference Chris Dodge 2013-07-31 17:23:09 -04:00
  • 6200b2903f have the Files and Upload pages surface a 'portable_url' which uses the /static/ shorthand which is more portable across course runs Chris Dodge 2013-07-30 14:58:27 -04:00
  • 2c75caca20 adjustment to sidebar help text on PDF textbook page in studio Frances Botsford 2013-08-05 16:10:08 -04:00
  • 71c299930e Merge pull request #582 from edx/fix/adam/redirect Adam 2013-08-05 13:06:44 -07:00