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

Commit Graph

  • 78d8b00ab7 Merge pull request #7286 from edx/avoid-needless-mako David Baumgold 2015-03-12 09:22:56 -04:00
  • 48446b7612 Merge pull request #7285 from edx/aamir/ECOM-1177-price-display-bug Aamir 2015-03-12 17:57:58 +05:00
  • 2e84c49660 Merge pull request #7248 from edx/awais786/ECOM-1155-datetime-issue Awais Qureshi 2015-03-12 17:53:20 +05:00
  • 64515f1d62 Add metatag <path_prefix> for pdf_viewer.html Syed Hassan Raza 2015-02-25 18:57:45 +05:00
  • 1512c0609e ECOM-1177: Removed the session variable on pay_and_verify view aamir-khan 2015-03-10 21:47:37 +05:00
  • 281c8dce2b ECOM-1155 fix the date diff issue. Awais 2015-03-06 18:43:08 +05:00
  • 8e5563d467 Do not show video_upload_pipeline advanced setting if the feature is disabled. Nimisha Asthagiri 2015-03-11 16:41:36 -04:00
  • cfb1ec115a Define TENDER_SUBDOMAIN to that we can still use vanity URLs David Baumgold 2015-03-11 16:36:55 -04:00
  • d9d26796e8 Downgrade CORS middleware warning to info Will Daly 2015-03-11 15:43:01 -04:00
  • 9c59ebd688 For video module, don't use Mako unnecessarily David Baumgold 2015-03-10 13:24:01 -04:00
  • f473c474bd Merge pull request #7287 from edx/benp/more-scripts-hints Ben Patterson 2015-03-11 15:29:06 -04:00
  • cdc81c8894 Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs. alawibaba 2015-03-11 11:23:55 -04:00
  • 882eab4bc9 cache site status message for 5 minutes (TNL-1614) Adam Palay 2015-03-09 15:59:57 -04:00
  • a5a303ae57 Cross-domain CSRF cookies Will Daly 2015-03-04 11:06:40 -05:00
  • 4ba4f414f9 Add Mocks to Enrollment API Doc Config Mark Hoeber 2015-03-11 13:17:27 -04:00
  • f0322b9662 Merge branch 'release' Greg Price 2015-03-11 11:14:48 -04:00
  • 9d9dccdb97 Merge pull request #7299 from edx/sarina/indagation/TNL-1461 Sarina Canelake 2015-03-11 11:04:26 -04:00
  • b4c6211e4a Merge pull request #7235 from open-craft/enable-content-libraries Kelketek 2015-03-11 09:42:47 -05:00
  • 91642dce33 Merge pull request #7245 from open-craft/studio-home-test Kelketek 2015-03-11 09:33:21 -05:00
  • 1bd3652af3 Merge pull request #6846 from open-craft/content_libraries/import-export Kelketek 2015-03-11 09:27:45 -05:00
  • 932bb1951d Add Kyle Boots to AUTHORS Sarina Canelake 2015-03-11 10:20:20 -04:00
  • d1543b6156 Add pointer-events: none for fa-lock and fa-eye [TNL-1461] Sarina Canelake 2015-03-11 10:20:14 -04:00
  • 86930b9d27 Merge pull request #7135 from edx/markhoeber-studio-template-updates Mark Hoeber 2015-03-11 09:16:40 -04:00
  • bc92c504b4 Add myself to AUTHORS. Matjaz Gregoric 2015-03-11 18:53:42 +08:00
  • 12e3cc9d62 Update IFrame, Zooming Image, and Full Screen Image Templates Mark Hoeber 2015-02-26 13:14:40 -05:00
  • b4ba5cbae9 Merge pull request #7242 from edx/mjames/SOL-290 Martyn James 2015-03-10 17:45:38 -04:00
  • 8ad4d081fb Added library import and export via .tar.gz'd XML files. Jonathan Piacenti 2014-11-12 22:24:38 +00:00
  • 177035b1d2 Adding hints for otherwise quiet quality shard steps. Ben Patterson 2015-03-10 16:33:10 -04:00
  • 3359d6e333 Merge pull request #7243 from edx/will/csrf-enrollment-api Will Daly 2015-03-10 15:39:59 -04:00
  • 15965c1351 Addresses SOL-290. When display name is not present, we shall display '(Unnamed)' in its stead Martyn James 2015-03-05 14:59:26 -05:00
  • 00313e0e51 Merge pull request #7226 from edx/christina/update-accounts-api Christina Roberts 2015-03-10 12:47:15 -04:00
  • c65c19d21a Merge pull request #7281 from edx/clintonb/task-fix Greg Price 2015-03-10 12:07:33 -04:00
  • af14d222fc Merge pull request #7085 from edx/dcikatic/SOL-258 Martyn James 2015-03-10 11:55:33 -04:00
  • 6a2b9f4521 Reorganized course_structures app Clinton Blackburn 2015-03-09 17:19:45 -04:00
  • af12b1b8f0 Decrease the number of inserts and updates needed by DjangoKeyValueStore Calen Pennington 2015-03-06 14:58:13 -05:00
  • 918b184ea2 Merge pull request #6997 from edx/asadiqbal08/merge_SOL-199_and_SOL-221 Matt Drayer 2015-03-10 10:11:49 -04:00
  • 0b28c3fdfb trying to fix a flaky test Zia Fazal 2015-03-04 17:47:44 +05:00
  • 5a7ac441e5 Entrance Exam authoring and messaging updates asadiqbal 2015-01-29 18:18:38 +05:00
  • 57c38649ba Merge pull request #7270 from edx/zub/bugfix/plat-456-content-server-error zubair-arbi 2015-03-10 18:10:48 +05:00
  • 61890e7a5e return proper 404 for assets of some invalid course from split modulestore PLAT-456 zubair-arbi 2015-03-09 19:17:20 +05:00
  • 72a1d754bc Merge pull request #6921 from Stanford-Online/giulio/upgrade-pdfjs Sarina Canelake 2015-03-09 21:53:36 -04:00
  • 0840467201 Making edX changes to pdf viewer/analytics html Giulio Gratta 2015-02-09 16:17:47 -08:00
  • 4726da6cf9 Upgrade PDF.js library from v0.8.1243 -> v1.0.907 Giulio Gratta 2015-02-06 14:44:55 -08:00
  • e7f9b929a5 Merge pull request #7266 from edx/dan-f/forums-filter-discussion-modules-3 Greg Price 2015-03-09 15:53:23 -04:00
  • 7e7b13b488 Merge pull request #7275 from edx/clee/MA-272_video_analytics Greg Price 2015-03-09 15:43:19 -04:00
  • d5b870e7b2 Merge pull request #7276 from edx/gprice/oauth-exchange Greg Price 2015-03-09 15:30:19 -04:00
  • 934abf3c19 Check access for discussion modules in forums Daniel Friedman 2015-01-26 21:55:25 -05:00
  • bb5fbda873 MA-272 Updated analytics shim for mobile video events christopher lee 2015-02-25 10:06:26 -05:00
  • e85eb91e06 Add an endpoint to exchange OAuth access tokens Greg Price 2015-03-04 15:59:15 -05:00
  • 1bbc07dbd0 Merge pull request #7257 from edx/christina/accounts-cleanup-tasks Christina Roberts 2015-03-09 12:52:32 -04:00
  • e30ea5c08b Switch to api directory and improve error handling. cahrens 2015-03-06 14:36:19 -05:00
  • cbdc269b47 Cross-domain CSRF cookies Will Daly 2015-03-04 11:06:40 -05:00
  • 5aba2f0e6c Exfoliate flaky studio home test. Jonathan Piacenti 2015-03-05 22:53:28 +00:00
  • 30c3005c40 Merge pull request #7273 from edx/ecom-1178 Greg Price 2015-03-09 12:21:35 -04:00
  • feed7eaada ECOM-1178: Embargo rules for continent codes. Will Daly 2015-03-09 11:29:24 -04:00
  • b649b27329 Merge pull request #7261 from edx/cgoldberg/video-cdn-experiment Greg Price 2015-03-09 11:39:06 -04:00
  • bfa625ea78 SOL-258 Removing preview and content type from search list for sequence type Dino Cikatic 2015-02-24 14:00:08 +01:00
  • 18648fdf90 Merge pull request #7264 from edx/ahodges/chg_status_label Greg Price 2015-03-09 11:22:42 -04:00
  • c7ebda8ff8 Merge pull request #7223 from edx/cgoldberg/video-cdn-experiment Ali Mohammad 2015-03-06 18:36:43 -05:00
  • 3d7ee895d7 Fixes DOC-1731: label change and time frame info Alison Hodges 2015-03-06 15:19:00 -05:00
  • 1fc9c83726 Added listener and beacon for video cdn eval. Corey Goldberg 2015-02-20 11:57:51 -05:00
  • 31689659ce Add query count tests to DjangoKeyValueStore/FieldDataCache Calen Pennington 2015-03-06 14:57:55 -05:00
  • 3604e2dd97 Merge pull request #7195 from edx/will/certs-instructor-dash Will Daly 2015-03-06 14:30:08 -05:00
  • 9e8a0b86af Merge pull request #7255 from edx/sarina/studio-default-logo Sarina Canelake 2015-03-06 14:13:29 -05:00
  • 3aaf52d2ee Merge pull request #7249 from edx/chrisitna/flaky-test Christina Roberts 2015-03-06 13:57:17 -05:00
  • 940f892290 ECOM-1140: Instructor dashboard example certificates Will Daly 2015-02-28 08:01:04 -05:00
  • 1e52687fc3 Merge pull request #7253 from edx/ned/md-to-rst Ned Batchelder 2015-03-06 13:18:33 -05:00
  • 697b487e81 Leave a redirection testing.md file behind Ned Batchelder 2015-03-06 13:15:50 -05:00
  • 4f6881c871 Change .md file to .rst. Ned Batchelder 2015-03-05 07:01:38 -05:00
  • 1dc75ffdc3 Abstract out platform name in default Wiki string Sarina Canelake 2015-03-06 13:02:06 -05:00
  • e1dc0f5cdc Remove unused common image Sarina Canelake 2015-03-06 13:00:46 -05:00
  • 4133740a2f Add default logo to Studio Sarina Canelake 2015-03-06 12:44:39 -05:00
  • 3e7488f52c Add flaky decorator. cahrens 2015-03-06 11:23:02 -05:00
  • 758d2f4e3b Add flaky decorator. cahrens 2015-03-06 09:48:05 -05:00
  • 1cc7178ba3 Merge pull request #7252 from edx/dan-f/fix-failing-forums-test-after-revert Daniel Friedman 2015-03-06 12:56:27 -05:00
  • 4f5b319f17 Merge pull request #7254 from edx/ned/finish-pr-7232 Ned Batchelder 2015-03-06 12:04:57 -05:00
  • 749269a311 Merge pull request #7218 from edx/will/student-cert-xqueue-error Will Daly 2015-03-06 11:36:48 -05:00
  • b3dbc7babd Fix another contributor agreement link. Ned Batchelder 2015-03-06 11:32:11 -05:00
  • a79bf683b0 Fix failing forums unit test. Daniel Friedman 2015-03-06 11:09:12 -05:00
  • 0e171be261 Merge pull request #7246 from cguardia/patch-1 Ned Batchelder 2015-03-06 10:21:10 -05:00
  • f8c9fdf6c8 Merge pull request #7196 from edx/ned/tweaked-pylintrc Ned Batchelder 2015-03-06 09:50:59 -05:00
  • dca05a6095 Merge branch 'release' David Baumgold 2015-03-06 08:54:22 -05:00
  • 849388398c Merge pull request #7244 from edx/jsa/hotfix-forums David Baumgold 2015-03-06 08:51:03 -05:00
  • d1af8f354d Merge pull request #7247 from edx/awais786/ECOM-1158-upgrade-page Awais Qureshi 2015-03-06 18:50:28 +05:00
  • c8ae32e628 ECOM-1158 fixing astrophysique in html. Awais 2015-03-05 18:41:01 +05:00
  • 7338cc1286 Merge pull request #7148 from open-craft/library-selector Xavier Antoviaque 2015-03-06 09:16:02 +01:00
  • 41f08055a4 Merge pull request #7018 from edx/zub/bugfix/tnl-1331-unique_users_in_cohort_group zubair-arbi 2015-03-06 12:23:25 +05:00
  • c04e76e62a Update AUTHORS Carlos de la Guardia 2015-03-06 00:45:00 -06:00
  • baa1b05eb7 Add empty introspection rule fro BlockTypeKeyField. Carlos de la Guardia 2015-03-05 22:34:29 -06:00
  • 13ba2c4a57 Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules" jsa 2015-03-05 16:33:51 -05:00
  • c8a20df210 Combine account and profile into same API. cahrens 2015-03-05 10:36:02 -05:00
  • 5802e17cf3 Disable new user APIs in production. cahrens 2015-03-05 10:50:46 -05:00
  • 4cb4557176 Merge pull request #7151 from open-craft/ekolpakov/settings-service John Eskew 2015-03-05 15:56:11 -05:00
  • c430eaed55 Merge pull request #7086 from edx/ahsan/tnl-1520-studio-nav-label-accessibility-issue ahsan-ul-haq 2015-03-06 00:27:06 +05:00
  • ebb2d031f9 Certificate status when XQueue is unavailable. Will Daly 2015-03-03 15:53:21 -05:00
  • 1a6b474dd3 Merge pull request #7239 from edx/hotfix/ecom-1169 Will Daly 2015-03-05 14:03:39 -05:00
  • d1b9bbf211 Fix callback URL for certificate generation tasks Will Daly 2015-03-05 13:32:46 -05:00
  • 450d9e37db Limit PATCH to own user information. cahrens 2015-03-04 15:58:32 -05:00
  • 6fd4d2fdc3 Merge pull request #7229 from edx/hotfix/2015-03-05 David Baumgold 2015-03-05 13:08:15 -05:00
  • a37a50cf3b Merge branch 'release' David Baumgold 2015-03-05 12:10:27 -05:00