David Baumgold
71a50c58d7
Show error page templates
2014-05-02 13:41:34 -04:00
cahrens
1e92a6c884
Do not show "View in Studio" links for child verticals of verticals.
...
STUD-1558
2014-05-02 13:36:44 -04:00
Greg Price
4dbb104136
Remove email field from CS client user object
...
This requires cs_comments_service commit 1d50176.
2014-05-02 13:17:24 -04:00
Mark Hoeber
9d2b85d340
Merge pull request #3575 from edx/markhoeber/documentation/fix-link-in-readme
...
Fixed link to docs.edx.org in readme
2014-05-02 13:13:28 -04:00
Usman Khalid
5903ec5b17
Merge pull request #3417 from edx/usman/lms2518-refund-emails
...
Parameter from_email to send_mail() should be string
2014-05-02 22:03:04 +05:00
srpearce
c51f737895
Merge pull request #3559 from edx/sylvia/docs/DOC-99
...
Update drag and drop documentation
2014-05-02 12:15:40 -04:00
Sylvia Pearce
8b7f4f1cd2
Update drag and drop documentation
2014-05-02 12:14:08 -04:00
Giulio Gratta
78616f37c0
Merge pull request #3562 from caesar2164/giulio/zoom-image-firefox-bugfix
...
Fixes firefox image hidden overflow bug.
2014-05-02 09:10:21 -07:00
Adam
a5235a9cb4
Merge pull request #3574 from edx/release
...
Release
2014-05-02 11:56:26 -04:00
David Baumgold
c694aaf511
removed unused import
2014-05-02 11:50:03 -04:00
David Baumgold
76d1ea0b8e
Removed unused function
2014-05-02 11:49:37 -04:00
Mark Hoeber
6db6dbc05c
Fixed link to docs.edx.org in readme
2014-05-02 11:47:46 -04:00
David Baumgold
333ec9d38a
Major refactoring based on Cale's branch approach
2014-05-02 11:45:49 -04:00
Usman Khalid
e33e9ff2d9
Parameter from_email to send_mail() should be string and not string in list.
...
LMS-2518
2014-05-02 20:35:20 +05:00
srpearce
d2f49c6946
Merge pull request #3527 from edx/sylvia/docs/DOC-295
...
Add IFrame template documentation
2014-05-02 11:33:52 -04:00
Sylvia Pearce
013ff49c47
Update IFrame documentation
2014-05-02 11:33:20 -04:00
Usman Khalid
c955fd0bce
When sending bulk email check if course is authorized.
...
Also the idash_mode property is stored seperately for each course.
LMS-2565
2014-05-02 20:09:25 +05:00
Victor Shnayder
6e4b129f48
Merge pull request #3551 from edx/victor/remove-iframe-ga
...
Remove google analytics tracking from iframes used in Drupal course abou...
2014-05-02 10:55:36 -04:00
David Baumgold
460ee964fd
Make release table by PR, instead of by commit
2014-05-02 10:46:37 -04:00
Adam
3d5a8eb802
Merge pull request #3564 from edx/adam-fix-GA-quotes
...
puts GA id in quotes
2014-05-02 10:40:53 -04:00
Adam
4a45719a2f
Merge pull request #3560 from edx/adam/disable-links-ajax-2
...
Disable draft and edit links during ajax calls
2014-05-02 10:08:19 -04:00
David Ormsbee
1b3995810d
Merge pull request #3274 from edx/ormsbee/instructor_task_admin_for_daves_vacation_enjoyment
...
Add admin.py for instructor_task.
2014-05-02 09:30:45 -04:00
Adam Palay
7c13ba0c3b
Disable draft and edit links during ajax calls
...
STUD-1485
STUD-1499
2014-05-02 09:11:46 -04:00
Joe Blaylock
48e472a05f
Merge pull request #3532 from edx/jrbl/certs_pass_course_name_in_dict
...
Certs: pass course name on queue
2014-05-01 14:07:55 -07:00
Jason Bau
2e97d472d9
Bump django 1.4 minor version to 1.4.12 to pick up patches
2014-05-01 12:14:59 -07:00
Gabe Mulley
a0db425f91
Merge pull request #3558 from mulby/gabe/event-tracking-doc
...
Create a skeleton of event-tracking developer docs
2014-05-01 14:58:52 -04:00
Gabe Mulley
e6d2184021
Merge pull request #3523 from mulby/gabe/tracking-shim
...
Integrate event-tracking in to the LMS
2014-05-01 14:53:59 -04:00
Adam Palay
80f5784657
puts GA id in quotes
2014-05-01 14:41:13 -04:00
Giulio Gratta
579bfe5224
fixes firefox image hidden overflow bug.
2014-05-01 11:30:28 -07:00
Gabe Mulley
bde8482eeb
Create a skeleton of event-tracking developer docs
...
A first pass at providing details about how to emit events, what to emit etc.
2014-05-01 14:11:20 -04:00
Gabe Mulley
36269bd5a8
Integrate event-tracking in to the LMS
...
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
2014-05-01 14:04:35 -04:00
srpearce
6ea681f405
Merge pull request #3554 from itsbenweeks/itsbenweeks/checkbox_doc_example_update
...
Modifying the checkbox examples syntax so that it works in studio.edge now.
2014-05-01 10:42:01 -04:00
David Ormsbee
09bc765c6e
Add admin.py for instructor_task.
...
This is primarily so that we can manually fail zombie instructor
tasks that are clogging up the queue for a course.
2014-05-01 09:50:07 -04:00
Sarina Canelake
fbde1cf318
Merge pull request #3485 from edx/sarina/public-sandboxes-doc
...
Add documentation on public sandboxes
2014-05-01 09:16:28 -04:00
Ned Batchelder
f3952f2a96
Merge pull request #3533 from johncox-google/johncox/bug/pipeline
...
Fix bug that prevented account association during registration
2014-04-30 16:59:59 -04:00
clytwynec
74621f91f3
Merge pull request #3522 from edx/clytwynec/update-testing-docs
...
Adding more about the --failed functionality
2014-04-30 16:09:08 -04:00
clytwynec
8356c86725
Adding more about the --failed functionality
2014-04-30 16:05:53 -04:00
Victor Shnayder
a2bb5f29ff
Merge pull request #3556 from edx/victor/give-audit-certs
...
Issue certificates to all students who earn them, even if they are in an audit track
2014-04-30 16:00:12 -04:00
David Baumgold
280bb96cdc
wordsmithing
2014-04-30 15:13:02 -04:00
Ben Weeks
b8bc909a01
Adding my name to the AUTHORS file.
2014-04-30 14:55:49 -04:00
Mark Hoeber
b580f60f8e
Merge pull request #3502 from edx/markhoeber/documentation/doc-330
...
Release Notes 4/29/14
2014-04-30 14:52:43 -04:00
Victor Shnayder
821d5874a8
Issue certificates to all students who earn them, even if they are in an audit track
...
LMS-2573
2014-04-30 14:44:08 -04:00
e0d
2bfb1b4a56
Merge branch 'release'
2014-04-30 14:42:27 -04:00
Victor Shnayder
9dd9422a74
Remove google analytics tracking from iframes used in Drupal course about pages
...
This fixes two issues:
- if the course pointed to doesn't exist, GA was added to the iframe twice
- more importantly, we don't want to count these as separate views anyway--
we just care about the about page itself.
- I also added a note about where we would put our segment.io widget if we want it
later
LMS-2581
2014-04-30 14:34:45 -04:00
clytwynec
1c1a36a491
Merge pull request #3525 from edx/clytwynec/update-bok-choy-setup-tasks-prereqs
...
Update to bok-choy setup task prereqs
2014-04-30 14:29:12 -04:00
Mark Hoeber
f428540ed0
Release Notes 4/29/14
...
Doc-330
2014-04-30 13:19:12 -04:00
Jay Zoldak
71b3266356
Merge pull request #3555 from edx/zoldak/disable-test
...
Disable unreliable test
2014-04-30 13:13:37 -04:00
Jay Zoldak
a4edd44fca
Merge pull request #3498 from edx/zoldak/jenkins-reset-venv
...
Reset the jenkins python virtualenv before test runs.
2014-04-30 13:12:03 -04:00
Christine Lytwynec
b69ae300d1
Updated test:bok-choy:setup task to not require that memchache or mongo be running
2014-04-30 13:02:43 -04:00
Jay Zoldak
5d371581f6
Disable unreliable test
2014-04-30 13:02:22 -04:00
