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

Commit Graph

  • 9d683ed171 Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue chrisndodge 2014-09-16 11:17:40 -04:00
  • 8f6eedec3f Merge pull request #5247 from edx/sarina/09162014-translation-update Sarina Canelake 2014-09-16 10:56:19 -04:00
  • b618516dc1 Update translations (autogenerated message) Sarina Canelake 2014-09-16 10:54:09 -04:00
  • 98ef21a9cb Pyfilesystem fix for AWS Piotr Mitros 2014-09-15 11:27:12 -04:00
  • 47cd0f3e62 EX-81 / Ex-84 changes asadiqbal08 2014-09-15 17:54:33 +05:00
  • 651ee94515 Merge pull request #5232 from edx/split/asset_charset Don Mitchell 2014-09-16 09:40:06 -04:00
  • 6a26e9c186 Update github for asset char LMS-11380 Don Mitchell 2014-09-15 17:02:34 -04:00
  • 12f280b62a [TNL-198] Do not generate JS and CSS source maps in production Tim Babych 2014-09-12 18:13:25 +03:00
  • b2b46332f8 wait for notification on adding video component TNL-392 zubair-arbi 2014-09-16 17:20:31 +05:00
  • b7b4760074 Merge pull request #5175 from edx/benp/solano2-jstest-failure Ben Patterson 2014-09-16 08:09:41 -04:00
  • 8efa9daec1 Fixed bok choy flaky test for studio. TNL-284 Waheed Ahmed 2014-09-15 17:43:10 +05:00
  • 739d2f0906 Ex-74 Registration Code redemption Muhammad Shoaib 2014-09-03 12:50:04 +00:00
  • 23531e8966 Merge pull request #5220 from edx/cdodge/dont-redirect-to-dashboard-when-having-and-empty-dashboard chrisndodge 2014-09-15 22:06:13 -04:00
  • c6bbae3903 Merge pull request #5126 from edx/markhoeber-doc408 Mark Hoeber 2014-09-15 22:03:11 -04:00
  • 50cdd2b087 only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root) Chris Dodge 2014-09-15 12:43:54 -04:00
  • 77311e03c9 Updated Files & Uploads template help Mark Hoeber 2014-09-08 11:44:20 -04:00
  • fa8dbbe5c9 Use new bok_choy file paths in paver examples. Ben Patterson 2014-09-15 17:03:17 -04:00
  • 032ff1cd61 Merge pull request #5200 from edx/split/lms-11396 Don Mitchell 2014-09-15 16:44:10 -04:00
  • bc952d4868 Merge pull request #5225 from edx/ahodges/doc/glossary_adds Alison Hodges 2014-09-15 16:40:29 -04:00
  • c41fab6208 Quick add for Wendy & Anant post webinar Alison Hodges 2014-09-15 14:10:01 -04:00
  • eab1d739be Merge pull request #5203 from Stanford-Online/kluo/fix-unicode-email Jason Bau 2014-09-15 13:32:55 -07:00
  • 8d368eda13 Merge pull request #5201 from edx/split/lms-11395 Don Mitchell 2014-09-15 16:31:03 -04:00
  • 043c08bf5b Updating active_versions should not send old and new but just use old to get query info. LMS-11396 Don Mitchell 2014-09-12 14:07:06 -04:00
  • 7090ef6588 Ensure deleting a direct only removes it from published as well as draft LMS-11395 Don Mitchell 2014-09-12 14:41:55 -04:00
  • 040b1c3da5 Merge pull request #5197 from edx/reruns/count_queries Don Mitchell 2014-09-15 15:57:11 -04:00
  • 4b5b72a39d add promise to get around race condition in discussion bok-choy test Christine Lytwynec 2014-09-15 15:28:54 -04:00
  • 6568463513 Merge pull request #5223 from edx/bug/lms-11361 Don Mitchell 2014-09-15 15:25:26 -04:00
  • 1e1fc127e2 Merge pull request #5214 from edx/sarina/update-i18n-tooling Sarina Canelake 2014-09-15 14:39:15 -04:00
  • 95a9ca131a Merge pull request #5148 from lduarte1991/lduarte-harvardx-pr24 Sarina Canelake 2014-09-15 14:25:19 -04:00
  • 7627d34339 Remove unicode conversion of email since it should always be unicode Kevin Luo 2014-09-15 10:58:09 -07:00
  • bf0c4f5185 Don't let destructive loc change leak out to callers. Also, use the return from update_item rather than assume it was just side effecting. LMS-11361 Don Mitchell 2014-09-15 13:27:29 -04:00
  • 363ef77e5d LTR i18n tooling Sarina Canelake 2014-07-08 09:52:23 -04:00
  • 49d069dd9e RTL i18n tooling Sarina Canelake 2014-07-08 10:09:19 -04:00
  • fcae6b5763 Merge pull request #5219 from edx/zoldak/disable-annotation-test Jesse Zoldak 2014-09-15 13:23:34 -04:00
  • b7ad5c5382 Merge pull request #5218 from edx/zoldak/disable-test-video-controls Jesse Zoldak 2014-09-15 13:07:31 -04:00
  • 76517de87d Disable intermittently failing annotation acceptance test TNL-353 Jesse Zoldak 2014-09-15 12:23:47 -04:00
  • 1be81109e5 enable auto-capturing of hars in bok-choy tests Christine Lytwynec 2014-09-09 15:43:12 -04:00
  • a1eb44d9c6 skip intermittently failing test TNL-392 Jesse Zoldak 2014-09-15 12:13:06 -04:00
  • 78ed5c2c54 Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup Piotr Mitros 2014-09-15 12:08:20 -04:00
  • 4c3b4a59b4 Merge pull request #5208 from edx/split/misc_fixups Don Mitchell 2014-09-15 11:18:25 -04:00
  • a08ca41579 Merge pull request #5210 from edx/sarina/09152014-translation-update Sarina Canelake 2014-09-15 10:15:31 -04:00
  • 1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection Renzo Lucioni 2014-09-15 10:09:26 -04:00
  • ba500b5e70 Update translations (autogenerated message) Sarina Canelake 2014-09-15 10:02:39 -04:00
  • 81e297a677 Merge pull request #5032 from mlkwaqas/waqas/tnl148-reset-newpost-form-on-cancel Waqas Khalid 2014-09-15 18:53:56 +05:00
  • f896d64ac0 Merge pull request #5195 from edx/renzo/remove-waffle Renzo Lucioni 2014-09-15 09:43:22 -04:00
  • 0bb4ddef32 Merge pull request #5209 from edx/cdodge/allow-to-pass-override-cancel-URL chrisndodge 2014-09-15 09:34:29 -04:00
  • ad57cbe932 Get rid of obsolete field checking Don Mitchell 2014-09-15 09:00:08 -04:00
  • f04e75db90 Get rid of unused fragment Don Mitchell 2014-09-15 08:59:56 -04:00
  • b137f8d7ad Explain query counts Fix trivial excesses (2 splits configured & don't fetch courses if there are none) LMS-11220, LMS-11391, LMS-11390 Don Mitchell 2014-09-12 11:52:35 -04:00
  • 6dec04ba0f Cancel the new post resets the state of form Waqas Khalid 2014-09-01 17:37:14 +05:00
  • e18e18a855 Merge pull request #5055 from edx/waheed/bld1221-fix-video-not-play-in-firefox-on-speed-change Waheed Ahmed 2014-09-15 15:06:56 +05:00
  • d147c7e51f Merge pull request #4749 from edx/waheed/lms11194-xblock-allow-html-and-script-in-dusplay-name Waheed Ahmed 2014-09-15 14:52:41 +05:00
  • 0448c9942d Fixed video not playing after changing speed to anything other than 1. BLD-1221 Waheed Ahmed 2014-09-03 19:23:41 +05:00
  • f336d0490c Html escaped from display name in xblock. LMS-11194 Waheed Ahmed 2014-08-08 12:38:12 +05:00
  • 7225420fa0 Merge pull request #5170 from edx/muhhshoaib/Ex-79-BUG-if-no-coupon-code-defined-registration-codes-modal-dialog-box-does-not-appear chrisndodge 2014-09-14 21:29:27 -04:00
  • a1541b61f2 [TNL-288] Annotation Tools: Give staff/instructors full permissions lduarte1991 2014-09-09 15:44:30 -04:00
  • f832e4f294 Convert unicode emails to byte strings for CSV grade reports Kevin Luo 2014-09-12 17:50:30 -07:00
  • 825dbddd95 Merge pull request #5165 from lduarte1991/lduarte-harvardx-pr25 Sarina Canelake 2014-09-12 16:40:02 -04:00
  • 9239253614 Remove Django Waffle Renzo Lucioni 2014-09-12 12:07:54 -04:00
  • 9fc4fbc12a Merge pull request #5172 from edx/jsa/tnl24 Jim Abramson 2014-09-12 15:58:50 -04:00
  • abb2c6bc56 Merge pull request #5146 from lduarte1991/lduarte-harvardx-pr23 Sarina Canelake 2014-09-12 15:48:06 -04:00
  • 698c9b5914 Merge pull request #5184 from edx/renzo/upsell-tracking Renzo Lucioni 2014-09-12 14:21:32 -04:00
  • 8b92bd159b Merge pull request #5198 from edx/feanil/sandbox_matplotlib Feanil Patel 2014-09-12 14:16:50 -04:00
  • cc6e63dd22 Prepare track selection page for new audit track Renzo Lucioni 2014-09-11 15:36:34 -04:00
  • d3d4d33064 Ensure group info is present in LMS responses. jsa 2014-09-10 15:40:25 -04:00
  • 45b2e5033e Add matplotlib to the sandbox requirements. Feanil Patel 2014-05-29 09:05:16 -04:00
  • cf95dc0b75 [TNL-293] Annotation Tool: Fixed TinMCE issue when changing units lduarte1991 2014-09-10 15:50:50 -04:00
  • 218611c878 Merge pull request #5196 from edx/release Don Mitchell 2014-09-12 12:32:40 -04:00
  • 22f58be4aa Add tracking on expand of upsell message Renzo Lucioni 2014-09-11 17:12:35 -04:00
  • af12acc904 Clean up conventions for underscores vs. dashes in config setting. Piotr Mitros 2014-09-12 11:31:16 -04:00
  • 068a01a48c Merge pull request #5192 from edx/andy/ora-hotfix Andy Armstrong 2014-09-12 11:06:15 -04:00
  • 04595a7b3d Update platform to use the latest ORA release Andy Armstrong 2014-09-12 10:32:29 -04:00
  • 535e6e4f57 Merge pull request #4983 from lduarte1991/lduarte-harvardx-pr20 Anton Stupak 2014-09-12 16:24:44 +03:00
  • 51b680af59 Merge pull request #5022 from edx/waheed/lms11141-fix-invalid-key-error-in-course-handler Waheed Ahmed 2014-09-12 17:42:05 +05:00
  • a1e911ae39 Fixed InvalidKeyError in course handler in studio. LMS-11141 Waheed Ahmed 2014-08-29 16:01:03 +05:00
  • 4ecb846052 Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes' modal dialog does not appear Muhammad Shoaib 2014-09-11 12:09:55 +05:00
  • 9ca4c566c7 Merge pull request #5044 from edx/sylvia/docs/DOC-875 srpearce 2014-09-11 17:10:12 -04:00
  • 96c0babe44 Add note about angle brackets to Dropdown topic Sylvia Pearce 2014-09-02 17:49:32 -04:00
  • a0964f7141 Merge pull request #5182 from edx/sylvia/docs/minorfixes srpearce 2014-09-11 16:50:42 -04:00
  • a41e6c4e46 remove note from Annotations Sylvia Pearce 2014-09-11 16:48:25 -04:00
  • 13c8dd27b9 Update i18n_translators_guide.rst Sarina Canelake 2014-09-11 16:19:03 -04:00
  • 3575755d4d Minor updates to three problem types Sylvia Pearce 2014-09-11 15:39:15 -04:00
  • 68cdf3a59d pass along an extra parameter to CyberSource to sepcify a callback URL if the user clicks cancel Chris Dodge 2014-09-11 15:29:57 -04:00
  • d9567c3537 Merge pull request #5178 from edx/release Adam 2014-09-11 15:15:13 -04:00
  • 82675b2baa Merge pull request #5176 from edx/andya/lms-ux-reference-templates Andy Armstrong 2014-09-11 14:32:25 -04:00
  • 610710cff8 Merge pull request #5133 from edx/christina/cohorts-api Christina Roberts 2014-09-11 14:30:45 -04:00
  • 7683cba2c3 Add support for UX reference templates in LMS Andy Armstrong 2014-09-11 11:50:03 -04:00
  • 020094b8fb Create auto cohorts when list_cohorts is called and return number of users per cohort. cahrens 2014-09-08 16:33:03 -04:00
  • abf5f176bb Merge pull request #5177 from edx/usman/fix-xml-imports Adam 2014-09-11 13:29:10 -04:00
  • ef383891f2 TE-468 JS test: Use the correct array for validating onSeek logs Ben Patterson 2014-09-11 08:26:47 -04:00
  • 3204016487 Annotation Tools: Clean-up lduarte1991 2014-09-11 12:38:48 -04:00
  • dedd88ccf4 Merge pull request #4977 from edx/split/paver Nimisha Asthagiri 2014-09-11 12:28:41 -04:00
  • 3ec3bbbe99 Merge pull request #5162 from cpennington/split/import-export-performance Calen Pennington 2014-09-11 11:54:22 -04:00
  • b9908ec2f1 Only format test assertion messages when they are needed (they are a performance hit when testing large courses) Calen Pennington 2014-09-10 13:53:10 -04:00
  • c0616aeb2c Remove unneccesary uses of SON (which is slower than dict) Calen Pennington 2014-09-10 13:52:30 -04:00
  • a72cbfe68a Add an index on _id.revision to allow separating draft and published during export Calen Pennington 2014-09-10 13:33:40 -04:00
  • ce88f61670 Create indexes before running cross-modulestore import/export tests Calen Pennington 2014-09-10 11:37:15 -04:00
  • 35d92f42c8 Merge pull request #4963 from edx/talbs/platform-footer Brian Talbot 2014-09-11 11:23:48 -04:00
  • fc895fe8bf Moved imports to startup.py. Usman Khalid 2014-09-10 15:52:53 +05:00
  • 3a0dea20e1 Merge pull request #5168 from edx/flowerhack/third-party-stats Julia Hansbrough 2014-09-11 11:04:38 -04:00