Robert Raposa
8954d00a77
Merge pull request #10054 from edx/robrap/im-an-author
...
Add self to AUTHORS
2015-10-06 11:08:46 -04:00
Matt Drayer
ada5fda935
Merge pull request #10056 from edx/asadiqbal08/SOL-1255
...
asadiqbal08/SOL-1255: Remove all character limits in signatory fields
2015-10-06 10:59:50 -04:00
wajeeha-khalid
c17078b85d
Merge pull request #10009 from edx/jia/MA-1341
...
MA-1341 User Account: returned updated value from Patch
2015-10-06 19:26:42 +05:00
wajeeha-khalid
9472f70d64
MA-1341 User Account: returned updated value from Patch
...
updated docstring
2015-10-06 17:45:49 +05:00
asadiqbal
0b28fd23f8
SOL-1225
2015-10-06 14:52:38 +05:00
Robert Raposa
10e0206610
Add self to AUTHORS
2015-10-06 04:30:57 -04:00
Peter Fogg
87e3988c6a
Merge pull request #10042 from edx/peter-fogg/flaky-tests
...
Mark flaky tests (TNL-3514 and TNL-3515).
2015-10-05 16:13:30 -04:00
Clinton Blackburn
17f0193362
Merge pull request #10044 from edx/merge-release-into-master
...
Merging changes for hotfix/2015-10-05
2015-10-05 16:11:31 -04:00
Brian Beggs
143ca802ae
Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app
...
Revert "Upgrade django-pipeline and staticfiles"
2015-10-05 15:29:17 -04:00
Bill DeRusha
fe23052511
Merge pull request #9979 from edx/bderusha/boardman-traffic
...
Add IP to all python Segment tracking calls
2015-10-05 14:55:55 -04:00
Peter Fogg
dbeb9beb2d
Mark flaky tests (TNL-3514 and TNL-3515).
2015-10-05 14:47:25 -04:00
Clinton Blackburn
f967cfce8b
Merged release to master
...
Resolved conflicts from hotfix-2015-10-05
2015-10-05 14:46:32 -04:00
Brian Beggs
0ca679e244
Revert "Upgrade django-pipeline and staticfiles"
2015-10-05 14:40:28 -04:00
Ned Batchelder
b7cf392009
Merge pull request #10027 from edx/ned/better-immutable-field-exception
...
Include a message in the teams.ImmutableMembershipFieldException
2015-10-05 14:36:03 -04:00
Clinton Blackburn
882c2fa326
Merge pull request #10030 from edx/hotfix/2015-10-05
...
Hotfix for 2015-10-05
2015-10-05 14:34:17 -04:00
Clinton Blackburn
775ca26c3a
Limited grades to seven characters
...
ECOM-2433
2015-10-05 11:58:08 -04:00
Matt Drayer
0a347e1234
Merge pull request #10013 from edx/asadiqbal08/SOL-1262
...
SOL-1262 Update Studio Button Copy
2015-10-05 09:46:57 -04:00
Clinton Blackburn
0dba843608
Multiple credit fixes
...
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default
Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text
ECOM-2172
2015-10-05 09:35:10 -04:00
Matt Drayer
1d121b81c6
Merge pull request #10012 from edx/ziafazal/MAYN-129
...
MAYN-129: additional payment details were not shown
2015-10-05 07:56:57 -04:00
Matt Drayer
86e523e667
Merge pull request #10018 from edx/saleem-latif/MAYN-141
...
MAYN-141: WL Favicon not displaying correctly
2015-10-05 07:52:58 -04:00
Matt Drayer
890a675054
Merge pull request #10005 from edx/saleem-latif/MAYN-131-complete-fix
...
MAYN-131: Update Unsupported Browser message
2015-10-05 07:50:38 -04:00
Chris Dodge
466064575b
bump to edx-proctoring v. 0.9.16
2015-10-05 07:32:37 -04:00
asadiqbal
aec1b95945
SOL-1262
2015-10-05 16:28:28 +05:00
Ned Batchelder
84a94c2358
Include a message in the teams.ImmutableMembershipFieldException
...
Also add a __repr__ to CourseTeam so that it could be useful too.
2015-10-02 15:00:01 -04:00
Mark Hoeber
d3f39b2ffb
Merge pull request #10025 from edx/markhoeber-intersphinx-fix
...
Doc Label fix for Intersphinx
2015-10-02 14:30:22 -04:00
Ben Patterson
c8782f1401
Merge pull request #10024 from edx/benp/tnl-3492-flaky-test
...
Flag test as flaky. See TNL-3492.
2015-10-02 14:10:26 -04:00
Ben Patterson
6570552c8e
Merge pull request #10020 from edx/benp/TNL3489-flag-flaky-test
...
TNL-3489. Flag test as flaky.
2015-10-02 14:04:53 -04:00
Brian Beggs
5550ca30b1
Merge pull request #9999 from edx/bbeggs/TNL-3452-master
...
Fixed select_related fields for course embargos and the mobile user api. TNL-3452
2015-10-02 13:55:30 -04:00
Mark Hoeber
35034841fb
Doc Label fix for Intersphinx
2015-10-02 13:48:35 -04:00
Usman Khalid
0ce679fc06
Merge pull request #9934 from edx/usman/use-included-staticfiles-app
...
Upgrade django-pipeline and staticfiles.
2015-10-02 22:37:24 +05:00
Ben Patterson
ecdba7301a
Flag test as flaky. See TNL-3492.
2015-10-02 13:21:26 -04:00
Alison Hodges
eab5c60752
Merge pull request #9984 from edx/ahodges/enroll_api
...
Updates the description provided for a new enrollment report
2015-10-02 13:10:35 -04:00
David Baumgold
0219e18fa8
Merge pull request #10023 from edx/release
...
Release into master
2015-10-02 12:58:50 -04:00
David Baumgold
a3f8ed3f47
Merge pull request #10022 from edx/rc/2015-10-01
...
Rc/2015 10 01
2015-10-02 12:57:43 -04:00
Sarina Canelake
241ce4a6b1
Merge pull request #10004 from Gadal/master
...
Update AUTHORS
2015-10-02 11:08:37 -04:00
Ben Patterson
ed13815b4f
TNL-3489. Flag test as flaky.
...
See ticket for details.
2015-10-02 10:57:57 -04:00
Fred Smith
9d13ccdb50
Merge pull request #10016 from edx/bderusha/segment-fix
...
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
2015-10-02 09:56:23 -04:00
Diana Huang
7bfb1127f5
Merge pull request #9771 from edx/diana/add-team-to-reports
...
Add team column to grade reports.
2015-10-02 09:35:25 -04:00
Usman Khalid
2b59d46a31
Use django.contrib.staticfiles instead of django-staticfiles.
...
TNL-3137
2015-10-02 18:26:25 +05:00
Usman Khalid
98df2336f3
Upgrade to django-pipeline v.1.5.3.
...
TNL-3137
2015-10-02 18:26:25 +05:00
Saleem Latif
4725f7f579
favicon display bug corrected
2015-10-02 18:15:49 +05:00
Peter Pinch
94d5f736bf
Merge pull request #9986 from mitocw/fix/jf/enroll-ccx-coaches
...
Enroll CCX coaches in the courses to which they're added
2015-10-02 08:13:32 -04:00
Zia Fazal
460b19fa1b
fixed form submit selector
...
reduced left margin
2015-10-02 16:57:23 +05:00
Dustin Gadal
5106c7c6fa
Update AUTHORS
2015-10-02 00:22:29 -04:00
Sarina Canelake
4f34377bce
Merge pull request #10003 from Gadal/master
...
Fix import error
2015-10-01 23:54:21 -04:00
Dustin Gadal
dfc0a35799
Fix import error
...
See also:
https://github.com/edx/edx-platform/pull/9969
I'm not at a linux box to do a rebase from the command line, so I'm creating a new PR.
2015-10-01 22:33:39 -04:00
chrisndodge
4b37d788eb
Merge pull request #9977 from edx/cdodge/flaky-test
...
Mark test_can_add_remove_allowance Bokchoy test as flaky for now
2015-10-01 22:07:20 -04:00
Bill DeRusha
ca6633bd98
Add IP to all python Segment tracking calls
2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
2015-10-01 19:40:27 -04:00
Cliff Dyer
b85ea12a15
Merge pull request #9958 from edx/cdyer/MA-1280-restful-conventions
...
Make the profile_image api more restful.
2015-10-01 17:13:33 -04:00
