Commit Graph

  • 573d3c89fc Updating settings and requirements for lms and cms to support file upload Stephen Sanchez 2014-06-27 11:28:11 -04:00
  • 115d8c64f1 Merge pull request #4320 from edx/merge-rc-to-master Adam 2014-07-08 13:14:18 -04:00
  • c460a4e6fb Fix the link to the Ubuntu installation instructions Ned Batchelder 2014-07-08 12:02:56 -04:00
  • 173be7d279 Allow to_deprecated_string to do its magic Don Mitchell 2014-07-07 17:48:46 -04:00
  • cc6dfbbc75 Asset support in split LMS-2876 Don Mitchell 2014-06-26 17:00:09 -04:00
  • 5f11aa9aee Revert "First attempt to fix split test" Andy Armstrong 2014-07-07 16:49:11 -04:00
  • a16f5487bc First attempt to fix split test Andy Armstrong 2014-07-07 16:40:17 -04:00
  • dc3dab115a Add myself to AUTHORS. Daniel Friedman 2014-07-07 16:01:36 -04:00
  • 356da9ca75 Merge pull request #4315 from edx/bug/delete_draft Don Mitchell 2014-07-07 14:50:00 -04:00
  • 3f6287a267 Clean up forum nav Sass Greg Price 2014-07-07 11:29:07 -04:00
  • a4de82e1c3 Remove sidebar class from forum nav Greg Price 2014-07-03 14:16:21 -04:00
  • cda3d2968d Merge pull request #4314 from edx/sarina/070714-language-update Sarina Canelake 2014-07-07 14:19:08 -04:00
  • d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster Adam Palay 2014-07-07 13:54:03 -04:00
  • 34ac6abe1c Merge pull request #4316 from edx/anton/group-experiments Tim Babych 2014-07-07 20:03:43 +03:00
  • a9b35ab22b Clean up i18n paver commands Sarina Canelake 2014-07-07 10:27:04 -04:00
  • 1b37c0b4a2 Update translations (autogenerated message) Sarina Canelake 2014-07-07 10:26:09 -04:00
  • c216699953 Increase the test SQLite DB timeout. TE-397 Jay Zoldak 2014-07-07 12:32:43 -04:00
  • 1f71a67a85 Deleting a child of a unit should convert the unit to draft if the unit is draftable but isn't yet draft. Don Mitchell 2014-07-07 09:25:28 -04:00
  • 453c583714 Hide GroupConfiguration behind feature flag in cms/templates/settings.html. Tim Babych 2014-07-04 08:23:35 +03:00
  • 1bc48af784 Merge pull request #4306 from edx/db/openedx-analytics David Baumgold 2014-07-03 15:50:20 -04:00
  • 62d0e534af Merge pull request #4302 from edx/benmcmorran/fix-has-changes Christina Roberts 2014-07-03 15:37:48 -04:00
  • f3a8436e68 Tweak forum topic browse menu Greg Price 2014-07-03 14:09:44 -04:00
  • 71ae04b965 Merge pull request #4299 from edx/clytwynec/skip_update_assets_for_unittests clytwynec 2014-07-03 13:12:49 -04:00
  • 890eba26e2 Update AUTHORS swdanielli 2014-07-03 12:58:14 -04:00
  • 05d6c63049 Add openedx-analytics discussion group to CONTRIBUTING file David Baumgold 2014-07-03 12:42:43 -04:00
  • d11bb29c67 Merge pull request #4304 from rocha/display-na-on-instructor-dashboard Carlos Andrés Rocha 2014-07-03 12:35:19 -04:00
  • 1939678958 Use deprecated course_key when calling the analytics API. Carlos Andrés Rocha 2014-07-03 12:25:16 -04:00
  • 52bc17545b skipping update assets, not just collectstatic, in unit tests Christine Lytwynec 2014-07-03 11:15:13 -04:00
  • 2518d8e9a9 Merge pull request #4301 from rocha/display-na-on-instructor-dashboard Carlos Andrés Rocha 2014-07-03 11:47:39 -04:00
  • 5be08cc231 Don't show 500 errors if connection to data API fails Carlos Andrés Rocha 2014-07-03 11:15:05 -04:00
  • db5dd34a60 Fixes has_changes to search all the way to leaf nodes Ben McMorran 2014-07-03 11:22:57 -04:00
  • 30c573c72a Merge pull request #4287 from louyihua/localization-cms Andy Armstrong 2014-07-03 10:22:57 -04:00
  • cfbf317b39 Merge pull request #4267 from edx/tim/feature-group-configurations Tim Babych 2014-07-03 16:38:28 +03:00
  • c7f6671545 Merge pull request #4289 from edx/will/revert-ora2-release Will Daly 2014-07-03 08:32:12 -04:00
  • a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. Tim Babych 2014-06-27 17:25:21 +03:00
  • b48bf54f13 Merge pull request #4286 from louyihua/studio-advanced-settings-localization Andy Armstrong 2014-07-03 07:53:53 -04:00
  • ac8d6fc1a6 Make the strings in "Advanced Settings" page localizable louyihua 2014-07-03 01:44:44 +08:00
  • ba30f0387e Missing "_()" in course_module.py louyihua 2014-07-03 02:07:49 +08:00
  • 1952743985 Merge pull request #4273 from edx/benmcmorran/subtree-edited-info Ben McMorran 2014-07-02 18:42:04 -04:00
  • be04740edb Merge pull request #4291 from edx/forum-sidebar-improvements Greg Price 2014-07-02 18:17:53 -04:00
  • a59f8494a6 Adds subtree_edited_on, subtree_edited_by, and fixes has_changes Ben McMorran 2014-06-26 17:44:41 -04:00
  • 6d87443a39 Update discussion tab sidebar header Greg Price 2014-06-25 17:13:05 -04:00
  • 05d8eeecd7 Improve forum sorting and cohort filtering UX Greg Price 2014-06-17 11:43:26 -04:00
  • e049cfaf3b Make "load more" in forums not appear incorrectly Greg Price 2014-06-17 11:36:47 -04:00
  • 551cea9379 Add labels to forum thread list Greg Price 2014-06-10 11:09:10 -04:00
  • 89ba90a695 Re-design forum thread list Greg Price 2014-06-10 10:54:56 -04:00
  • 1a0d8827f5 Refactor global var setup for forum Jasmine tests Greg Price 2014-06-11 11:55:06 -04:00
  • 220a028b82 Merge pull request #4282 from louyihua/fix-name-in-studio Andy Armstrong 2014-07-02 14:43:32 -04:00
  • 3893a9aee6 Merge pull request #4258 from cpennington/studio-deprecated-urls Calen Pennington 2014-07-02 14:26:46 -04:00
  • 0765fbb434 Merge pull request #4269 from Stanford-Online/giulio/fix-css-typo David Baumgold 2014-07-02 14:25:39 -04:00
  • 28cb25a1e4 Revert "ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4" Will Daly 2014-07-02 14:21:29 -04:00
  • 1935187cf5 stupid simple css typo fix Giulio Gratta 2014-07-01 09:51:23 -07:00
  • ad43c25c78 Merge pull request #4188 from edx/adam/fix-skiptests Adam 2014-07-02 12:43:16 -04:00
  • c4a5299e55 Merge pull request #4283 from edx/clytwynec/lms_cms_joint_bokchoy_test clytwynec 2014-07-02 12:42:49 -04:00
  • cf3d777468 Merge pull request #4272 from edx/markhoeber/documentation/doc-298 Mark Hoeber 2014-07-02 11:49:37 -04:00
  • 8c2a922ce8 Updated Course End Date info Mark Hoeber 2014-07-01 13:55:00 -04:00
  • d38b51cb4a BLD-1117: Add read-only list of Group Configurations. polesye 2014-06-20 12:46:24 +03:00
  • 94faa6b836 Misuse of 'gettext' into mako templates louyihua 2014-07-02 20:59:18 +08:00
  • 9322714d9e Merge pull request #4281 from edx/usman/lms6634-support-page-url-matching Will Daly 2014-07-02 08:45:01 -04:00
  • c201d78c43 Fixed urlpatterns regex for support views in dashboard app. Usman Khalid 2014-07-02 16:01:25 +05:00
  • 3515212196 Merge pull request #4266 from edx/revert-4050-linkedin-email Jay Zoldak 2014-07-01 14:36:50 -04:00
  • 96c77a7ffc Merge pull request #4271 from edx/jsa/fix-new-post-view-spec Jim Abramson 2014-07-01 13:58:04 -04:00
  • 59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView jsa 2014-07-01 13:19:47 -04:00
  • a278697506 Merge pull request #4268 from edx/usman/lms6631-certificate-mode Usman Khalid 2014-07-01 22:32:03 +05:00
  • 3f2a6d1edf Merge pull request #4241 from louyihua/fix-name-in-studio Christina Roberts 2014-07-01 11:53:20 -04:00
  • 446270c0ff Moved GeneratedCertificates.MODES back inside model. Usman Khalid 2014-07-01 19:46:51 +05:00
  • 653d6f21dd Merge pull request #4171 from edx/adam/fix-lms-2773 Adam 2014-07-01 10:38:50 -04:00
  • ca7d895350 Revert "Make LinkedIn auth provider request email by default." David Baumgold 2014-07-01 10:05:01 -04:00
  • 8201c9906a Merge pull request #4038 from edx/anton/redirect-on-error Anton Stupak 2014-07-01 17:03:09 +03:00
  • 1fad1d73d9 Merge pull request #4262 from edx/usman/lms2920-no-refund-if-given-certificate Usman Khalid 2014-07-01 17:38:04 +05:00
  • b989ec149a Merge pull request #4222 from edx/ahodges/documentation/DOC158 Mark Hoeber 2014-07-01 08:26:31 -04:00
  • 6a3d5eb079 Do not refund student if a certificate entry already exists for them. Usman Khalid 2014-06-26 20:54:01 +05:00
  • d118fb8cb2 Get active student count from new analytics data API Clinton Blackburn 2014-06-12 14:20:17 -04:00
  • 57f364d90e Merge pull request #4259 from edx/benmcmorran/fix-xblock-visibility Christina Roberts 2014-06-30 20:03:51 -04:00
  • 536b9dbe31 in some cases we do want that redirect url Adam Palay 2014-06-30 17:05:29 -04:00
  • 9261a3e6b9 Merge pull request #4234 from rocha/rocha/analytics-active-count Carlos Andrés Rocha 2014-06-30 16:53:56 -04:00
  • 92f53236cf fix 400s from change_enrollment causing 404s (LMS-6625) Adam Palay 2014-06-30 16:19:13 -04:00
  • d00e2b7477 Uses ModuleStoreEnum in is_xblock_visible_to_students Ben McMorran 2014-06-30 15:33:10 -04:00
  • f670ff74e4 Uses ModuleStoreEnum in is_xblock_visible_to_students Ben McMorran 2014-06-30 15:33:10 -04:00
  • 36cfe7ab9e Get active student count from new analytics data API Clinton Blackburn 2014-06-12 14:20:17 -04:00
  • 5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign Jim Abramson 2014-06-30 14:39:46 -04:00
  • ded1a752a8 Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone David Baumgold 2014-06-30 14:33:01 -04:00
  • b817e02602 Merge pull request #4050 from mtyaka/linkedin-email David Baumgold 2014-06-30 14:31:53 -04:00
  • 1c882da397 Make Studio able to handle deprecated key formats in urls Calen Pennington 2014-06-30 10:19:19 -04:00
  • 09908bde4c Merge pull request #4229 from edx/studio/uses-mixed-modulestore-xblock-visibility Ben McMorran 2014-06-30 12:00:52 -04:00
  • 46469209b4 Merge pull request #4252 from edx/will/ora2-release-2014-06-30T13.39 Will Daly 2014-06-30 10:42:08 -04:00
  • cb3355b9e7 Merge pull request #4215 from edx/waheed/lms2892-ie-security-warning-fixed Waheed Ahmed 2014-06-30 18:49:54 +05:00
  • f40834fa2f ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4 Will Daly 2014-06-30 09:41:55 -04:00
  • 91f102c778 Merge pull request #4232 from edx/nimisha/modulestore-enum-constants Nimisha Asthagiri 2014-06-30 08:58:03 -04:00
  • 68a0f4e45c Fixed IE security warning on course page. LMS-2892 Waheed Ahmed 2014-06-26 16:40:51 +05:00
  • 994ccd1110 consolidate new post form variants into single client-side template/view jsa 2014-06-25 14:13:57 -04:00
  • d6049239e7 Merge pull request #4217 from louyihua/master Nimisha Asthagiri 2014-06-28 00:42:17 -04:00
  • 8fd3ab07ba If microsites are enabled and it is a microsite request, then take the microsite path for theming Felipe Montoya 2014-04-28 12:03:48 -05:00
  • 4c717ee35d Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat Nimisha Asthagiri 2014-06-27 22:26:30 -04:00
  • 8dca8053f6 Fix branch settings. Nimisha Asthagiri 2014-06-27 21:47:53 -04:00
  • 13f41aea07 Merge pull request #4239 from edx/release Adam 2014-06-27 17:04:30 -04:00
  • 082bcf765a Numbering issue Alison Hodges 2014-06-27 16:58:35 -04:00
  • fae12ac0b2 Merge pull request #4243 from edx/ahodges/documentation/DOC657 Alison Hodges 2014-06-27 16:45:56 -04:00
  • b4d2927409 Updated for PR 4106, BLD-1134 Alison Hodges 2014-06-27 16:16:10 -04:00
  • 5d27d77ef1 Merge pull request #4242 from edx/ahodges/documentation/DOC367 Alison Hodges 2014-06-27 16:34:47 -04:00