Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed auto enroll checkbox from CCX coash dashboard #68

Closed
wants to merge 364 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
364 commits
Select commit Hold shift + click to select a range
6b50ffd
Revert hotfix for PLAT-452
Shrhawk Apr 13, 2015
1884a0b
Merge pull request #7688 from edx/revert-plat452
Apr 14, 2015
5917ed0
hard start/stop times to video player
ataki Feb 5, 2015
27d3d03
Update variable names for video module
ataki Mar 6, 2015
5f5a77a
Add comment, refactor, handle edge cases
ataki Mar 16, 2015
860cc8f
Merge pull request #7669 from edx/will/fix-release-script-escaping
Apr 14, 2015
93e7d79
Remove nested form elements
singingwolfboy Apr 14, 2015
ce8a6e5
Merge pull request #7666 from edx/gprice/fix-oauth-exchange
Apr 14, 2015
07b7c5c
Merge pull request #7663 from applecool/edxsprint
sarina Apr 14, 2015
e18d69a
Fixed Embargo Bug in Enrollment API
Apr 14, 2015
ea52f4d
Merge pull request #7692 from edx/ECOM-1418
clintonb Apr 15, 2015
1828291
ECOM-1420 adding new field and migration file.
awais786 Apr 14, 2015
0b2b9fe
Added management command to manually reindex libraries
e-kolpakov Apr 15, 2015
26b1e8d
Made methods with no implementation abstract
e-kolpakov Apr 15, 2015
4d3750a
Pylint fixes
e-kolpakov Apr 15, 2015
cec4bb3
Add Simplified and Traditional Chinese as Transcript language options
muhammad-ammar Apr 15, 2015
04ca163
Merge pull request #7690 from edx/awais786/ECOM-1420-new-field
awais786 Apr 15, 2015
cd50393
Returning complete URL for Enrollment API user messaging
Apr 15, 2015
65c5ec8
Fixed Long discussion post not rendering Latex expressions
awaisdar001 Apr 10, 2015
708203b
Increase timeout for library page to load after refresh in acceptance…
Apr 15, 2015
afb2dae
Revert "Revert "use different queue for smaller emails (TNL-1591)""
adampalay Apr 15, 2015
a33dfe5
Merge pull request #7665 from edx/rc/2015-04-15
Apr 15, 2015
c07ce2a
Simplify test_only_expected_fields_are_displayed
singingwolfboy Apr 15, 2015
2c62263
Warning that hard start/stop times don't work for mobile
ataki Apr 14, 2015
3920694
Fix contract on context argument
cpennington Apr 15, 2015
e789c55
Updating blue color variables for accessibility in the LMS
Mar 24, 2015
6e34687
Merge pull request #7704 from edx/zoldak/TE-745
Apr 15, 2015
9018088
Merge pull request #7693 from edx/remove-nested-form-elements
singingwolfboy Apr 15, 2015
a91d90c
Merge branch 'release'
Apr 15, 2015
da8103d
Expose course start/end date in the enrollment API
Apr 15, 2015
b6970d9
Put CCX URLs behind their feature flag
carsongee Apr 15, 2015
1c91002
Merge pull request #7111 from ataki/ataki/upstream-pr-video-start-stop
singingwolfboy Apr 15, 2015
b0dbe2f
Be more specific about where we compile sass from.
feanil Apr 15, 2015
deefce0
Merge pull request #7700 from mitocw/feature/cg/ccx_urls
carsongee Apr 15, 2015
9196817
Revert "Decrease the number of inserts and updates needed by DjangoKe…
adampalay Apr 15, 2015
031edf6
Merge pull request #7221 from edx/marco/discussions-related-to
marcotuts Apr 15, 2015
efc1d5d
Merge pull request #7649 from edx/aj/tnl1902-fix-long-latex-post-disc…
awaisdar001 Apr 16, 2015
5fec96a
Added new release tag for ORA2.
waheedahmed Apr 15, 2015
eba02da
Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-requ…
Apr 16, 2015
a5bacc3
Merge pull request #7682 from edx/aamir-khan/ECOM-1287-reverification…
Apr 16, 2015
c641155
Merge pull request #7467 from edx/clrux/UX-1810-a11y-color-fix--blue
Apr 16, 2015
b6b7acb
Chaning table th td color to meet AA guidelines
Apr 15, 2015
ec16bc3
Merge pull request #7701 from edx/waheed/tnl2000-ora-release-tag
waheedahmed Apr 16, 2015
fd99d55
Merge pull request #7715 from edx/feanil/sassy_certs
feanil Apr 16, 2015
9e525d6
added images to the bulk email directory to include Youtube as a soci…
marcotuts Apr 2, 2015
294e24d
Strict comparison between expected_fields and displayed_fields
singingwolfboy Apr 16, 2015
987ea85
fix quality violation
adampalay Apr 16, 2015
38811f2
Merge pull request #7716 from edx/hotfix/2015-04-16
adampalay Apr 16, 2015
2cd2652
ECOM-1421 implementing the functionality
awais786 Apr 15, 2015
b7c6b4a
Better i18n (cont.)
Apr 16, 2015
9a35c51
Merge pull request #7724 from edx/release
adampalay Apr 16, 2015
cb333c4
Merge pull request #7670 from louyihua/lms_i18n_1
sarina Apr 16, 2015
513591f
Bump problem builder version to latest edx-release build
bradenmacdonald Apr 9, 2015
c5ce007
Merge pull request #7712 from edx/clrux/UX-2001-summary-table-contrast
Apr 16, 2015
f37c793
reset queue reference in aws.py, use low priority queue (TNL-1591) (T…
adampalay Apr 16, 2015
c67e8b9
moved the dropdown actions outside of the if show_courseware_link in …
marcotuts Apr 16, 2015
6af95ae
Enable --pdb debugging
singingwolfboy Apr 15, 2015
a43f411
Merge pull request #7608 from indagation/close-modal
marcotuts Apr 16, 2015
00db27b
Merge pull request #7638 from open-craft/problem-builder-version-bump
bradenmacdonald Apr 16, 2015
0b5d0b2
Merge pull request #7698 from edx/awais786/ECOM-1421-modify-course-ac…
awais786 Apr 17, 2015
3b348b7
Tests for reindex library management command
e-kolpakov Apr 17, 2015
d4f85d8
Removed unnecessary comments
e-kolpakov Apr 17, 2015
cb1bfa5
Adding outline styles (none) to the sr focus div
Apr 15, 2015
2637ac8
Changing id to class
Apr 17, 2015
3b160ee
Credit message on track selection page.
Apr 14, 2015
c8b56b6
Add Cris Ewing and Carlos de La Guardia to the authors list
cewing Apr 17, 2015
4027ca1
Merge pull request #7738 from jazkarta/cewing-add-contributor
sarina Apr 17, 2015
25b0264
Merge pull request #7730 from edx/marco/fix/course-refund-via-unenroll
marcotuts Apr 17, 2015
b1765d0
Merge pull request #7641 from open-craft/eugeny/problem-type-search
e-kolpakov Apr 17, 2015
e777260
Merge pull request #7687 from edx/will/ecom-1408-take-two
Apr 17, 2015
ff8b6be
ECOM-1439 adding new model and migration.
awais786 Apr 17, 2015
4a27e8b
Merge pull request #7711 from edx/clrux/UX-1946-div-focus-fix
Apr 17, 2015
766f700
Fixed caret position for LTR and RTL (SOL-693)
Apr 16, 2015
e3dba5f
Fixed z-index for social action dropdown (TNL-1806)
Apr 16, 2015
f67cb76
Merge pull request #7686 from cpennington/xmodule-metrics-sample-rate
cpennington Apr 17, 2015
3cf73d5
Merge pull request #7721 from edx/clrux/UX-1953-dropdown-fix
Apr 17, 2015
53f4a13
Merge pull request #7708 from edx/will/ecom-1411
Apr 17, 2015
b530514
Revert "Expose course start/end date in the enrollment API"
Apr 17, 2015
8a3e302
Added salt to "load" beacon.
alawibaba Apr 17, 2015
200aaf4
Merge pull request #7743 from edx/revert-7708-will/ecom-1411
Apr 17, 2015
2745398
Merge pull request #7729 from edx/adam/different-queue-small-emails
adampalay Apr 17, 2015
e81a883
Merge pull request #7744 from edx/multibeacon
alawibaba Apr 17, 2015
5b64429
Merge pull request #7737 from edx/enrollment-api-full-urls
clintonb Apr 17, 2015
0a962bf
Add field that was missing from re-ordered migration
Mar 12, 2015
fad6393
New bio field in UserProfile.
Mar 12, 2015
6f6fdbf
Integrate profile images into Accounts API
dan-f Mar 12, 2015
8e08ff5
Rebase cleanup
dan-f Mar 17, 2015
650a9a9
Implement parental controls for user profiles
andy-armstrong Mar 18, 2015
e710a5b
Implement parental controls for the User API
andy-armstrong Mar 20, 2015
4125bf9
Add documentation for is_active and profile_image
dan-f Mar 17, 2015
97e44ed
Implement language proficiencies.
dan-f Mar 19, 2015
46b6316
Implement profile_image upload and remove endpoints
Mar 9, 2015
20410a9
Implement profile image moderation
andy-armstrong Mar 25, 2015
c898e41
Add default profile images
andy-armstrong Mar 27, 2015
44c78c6
Add logging to image uploads/deletes.
dan-f Mar 20, 2015
23f02d9
Configurations for filesystem and s3 backends.
dan-f Mar 24, 2015
7330b2b
Pull additional profile image settings from configuration
dan-f Mar 27, 2015
1d11345
make auto_auth users satisfy PARENTAL_CONSENT_AGE_LIMIT
Mar 30, 2015
bb2599c
Include profile image version in URLs.
Mar 30, 2015
a37166c
remove catchall exception handling in profile image api
Mar 31, 2015
6c3b94d
Bump User API and Profile Images API to v1
andy-armstrong Mar 27, 2015
39688e3
Set default profile visibility to all_users.
Apr 16, 2015
970c77f
Pep8/pylint error.
Apr 16, 2015
3a2c527
Added javascript library backbone-super.
symbolist Mar 13, 2015
74bf7f2
Account settings page.
symbolist Mar 13, 2015
9c2d187
Jasmine tests for account settings page.
muhammad-ammar Mar 14, 2015
229a37b
Bokchoy tests for account settings page.
symbolist Mar 13, 2015
4f97cd7
Learner profile page.
Mar 26, 2015
67848ff
Link to learner profile page from username in discussions.
Mar 26, 2015
a378995
If user is not above age limit, show restricted learner profile.
Mar 30, 2015
2667f70
Enable third party auth from account settings page.
symbolist Mar 25, 2015
429984e
Third party auth tests should check account_settings_context().
symbolist Mar 30, 2015
3110cf6
Remove account settings display and editing from dashboard sidebar.
Mar 27, 2015
e6c3644
Quality fixes.
symbolist Apr 11, 2015
c3a3993
Limit the size of the user profile's "bio" field
andy-armstrong Apr 13, 2015
f03841a
Add client-side events for viewing pages
andy-armstrong Apr 9, 2015
bc05cd0
Resolving JS lint errors for account settings & learner profile page.
symbolist Apr 11, 2015
9ac08ac
Moving the country field to the required section of account setting p…
Apr 14, 2015
938dcce
Event change_initiated for password and email change requests.
Apr 14, 2015
adf111e
Adding functionlity to upload/remove profile image.
symbolist Apr 3, 2015
ca1f2f7
Jasmine tests for upload/remove profile image on learner profile page.
muhammad-ammar Apr 13, 2015
c2d83bd
Bok_choy tests for upload/remove profile image.
Apr 10, 2015
f1657d1
Fixing the SaSS for RTL.
Apr 16, 2015
e50a641
Accessibility changes for Account Settings and Learner Profile pages
muhammad-ammar Mar 30, 2015
6502eaf
DropDownFieldView should show empty option if model value is unset.
Apr 16, 2015
da57b13
Removed all references to AUTH_ENTRY_DASHBOARD.
symbolist Apr 17, 2015
6b91ab4
Fixed gettext references.
muhammad-ammar Apr 16, 2015
8ff9fd8
Obey learner profile default visibility
andy-armstrong Apr 17, 2015
3f20a6f
Add model change event tracking to UserProfile.
dianakhuang Apr 7, 2015
97c43ad
Track user settings changed events on User save
dan-f Apr 13, 2015
4797a74
Emit events for language proficiencies from the update_account_settin…
Apr 16, 2015
9907cb5
Tests for profile image eventing.
Apr 16, 2015
1f3d2c2
Isolate Bok Choy tests to unique test users
andy-armstrong Apr 16, 2015
7742735
Event on user preference updates
andy-armstrong Apr 14, 2015
17392ef
Code review feedback and test cleanup.
andy-armstrong Apr 16, 2015
cfcb38c
Update user message strings
muhammad-ammar Apr 17, 2015
2fed57a
Merge pull request #7350 from edx/learner-profiles
andy-armstrong Apr 17, 2015
a87c881
MA-612 Mobile Push Notification Studio Django admin setting
nasthagiri Apr 9, 2015
c2a1870
Clean ID of course_module for push notification channel name.
nasthagiri Apr 14, 2015
b124485
MA-611, MA-613 Mobile Push Notification Studio Backend; Integration w…
nasthagiri Apr 9, 2015
11044eb
MA-614 Mobile Push Notification Studio UI
nasthagiri Apr 10, 2015
9dfb68c
Merge pull request #7676 from edx/mobile/notifications-backend
nasthagiri Apr 18, 2015
1d9499e
Fixed change email address error from student dashboard
awaisdar001 Apr 20, 2015
fc918fb
Expose course start/end date in the enrollment API
Apr 15, 2015
7babb3e
Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-tr…
muhammad-ammar Apr 21, 2015
e065a9c
Mark test_split_test_LMS_staff_view as flaky
Apr 21, 2015
97d9a19
Merge pull request #7710 from cpennington/relax-context-contract
cpennington Apr 21, 2015
9bdb820
Update translations (autogenerated message)
sarina Apr 21, 2015
72dc547
Merge pull request #7758 from edx/sarina/20150421-translations-update
sarina Apr 21, 2015
a14e6f0
Accessibility tweaks for account settings and profile pages.
symbolist Apr 20, 2015
4df2bd3
Merge pull request #7756 from edx/will/ecom-1408-take-two
Apr 21, 2015
d50ed75
Merge pull request #7754 from edx/usman/tnl1660-fixes
Apr 21, 2015
764d5e6
_parse_time_str can be a standalone function
singingwolfboy Apr 21, 2015
f1d2231
RTL-ifying the sidebar title in Handouts
Apr 21, 2015
4af79d6
Don't event first_name and last_name.
Apr 21, 2015
0f84749
Added Payment Cancellation Page
Apr 21, 2015
ded6c4d
fix: resolving edx.org and Open edX breakpoint clash
talbs Apr 21, 2015
8a211b4
Merge pull request #7769 from edx/christina/eventing_fix
Apr 21, 2015
b57bf4b
Upgrade Django 1.4 to latest point release
sarina Apr 17, 2015
dc07943
Merge pull request #7762 from edx/commerce-checkout-cancel
clintonb Apr 22, 2015
75d3759
Merge pull request #7740 from edx/awais786/ECOM-1439-skip-icrv-model
awais786 Apr 22, 2015
4de7b8a
Merge pull request #7766 from edx/clrux/UX-1634-sidebar-header-rtl
Apr 22, 2015
a0feb21
Merge pull request #7770 from edx/talbs/rc/2015-04-22/fix-breakpoints
talbs Apr 22, 2015
220a86e
Merge pull request #7705 from edx/adjust-test_only_expected_fields_ar…
singingwolfboy Apr 22, 2015
6050d07
Merge pull request #7741 from edx/sarina/upgrade-django1.4.18-20
sarina Apr 22, 2015
8bd09d4
Forgot password model not visible when user clicks 'Forgot Password' …
awaisdar001 Apr 16, 2015
b9a30b2
RTL-ifies the sequence nav buttons
Apr 21, 2015
982d305
Update schoolyourself-xblock to the latest version, which adds the ab…
johnjlee Apr 17, 2015
8524677
Update paver tests to ignore trailing whitespace
singingwolfboy Apr 22, 2015
6079556
Merge pull request #7764 from edx/parse-time-as-standalone-function
singingwolfboy Apr 22, 2015
d8ff61f
Move github dependencies into github.txt
singingwolfboy Apr 7, 2015
d606ae9
ECOM-1396: added the function to check is the xblock published
Apr 13, 2015
daf8320
Remove extra spaces from paver commands
singingwolfboy Apr 22, 2015
6e47664
Merge branch 'release'
Apr 22, 2015
b81c6d9
Merge pull request #7768 from edx/clrux/UX-1724-RTL-sequence-nav-buttons
Apr 22, 2015
5e9d469
tweak firefox upgrade instructions
Apr 22, 2015
4377253
Merge pull request #7714 from edx/enable-pdb-debugging
singingwolfboy Apr 22, 2015
e82735f
Change image upload input name and not make duplicate of file in data.
symbolist Apr 22, 2015
4f5a2e1
Fix default profile images for edx.org
andy-armstrong Apr 22, 2015
09d6bb3
Merge pull request #7784 from edx/andya/hotfix-default-profile-image
dianakhuang Apr 22, 2015
00b75f0
Merge pull request #7783 from edx/hotfix/2015-04-22
dianakhuang Apr 22, 2015
2f3ff43
Merge pull request #7786 from edx/release
dianakhuang Apr 22, 2015
3f11df3
Fix to LOC-66
applecool Apr 23, 2015
a900e1f
Merge pull request #7660 from edx/aamir-khan/ECOM-1396/checkoint-name…
Apr 23, 2015
0b66dc4
Merge pull request #7718 from edx/aj/tnl1921-forgot-password-model-no…
awaisdar001 Apr 23, 2015
05068f1
fix reverification link in lms
zubair-arbi Apr 23, 2015
d794192
Merge pull request #7774 from edx/zub/story/ecom-1437-reverification-…
zubair-arbi Apr 23, 2015
8006227
Merge pull request #7667 from applecool/L10N_bugfix
sarina Apr 23, 2015
017916f
Visually hidden content accessible through keyboard
Apr 23, 2015
6c1d997
[LTI Provider] Create LTI Provider app, initial views and OAuth signa…
mcgachey Apr 14, 2015
d419eb0
Merge pull request #7623 from edx/move-github-reqs-to-github.txt
singingwolfboy Apr 23, 2015
283521e
PEP8 needs to ignore .git
Apr 23, 2015
568ed78
Updated enrollment api doc for new response fields
mhoeber Apr 23, 2015
ced607d
Merge pull request #7793 from edx/ned/pep8-needs-to-ignore-dotgit
nedbat Apr 23, 2015
8080d31
Update i18n tools to the latest version
sarina Apr 23, 2015
1f8f8bb
Merge pull request #7795 from edx/sarina/update-i18ntools
sarina Apr 23, 2015
b34255f
MIT CCX: Fix display of CCXs on dashboard
cewing Apr 17, 2015
9250577
MIT CCX: Code Quality
cewing Apr 23, 2015
870c30f
MIT CCX: Respond to PR feedback
cewing Apr 23, 2015
b2ac33d
Merge pull request #7689 from mcgachey/mcgachey-lti
Apr 24, 2015
99fbc89
Merge pull request #7771 from jazkarta/mit-ccx-fix-dashboard
nedbat Apr 24, 2015
dda656a
RTL-ifying the due icon
Apr 21, 2015
97e6091
Tab number in url doesn't take to correct tab
Apr 3, 2015
39cd5ce
Merge pull request #7791 from edx/markhoeber-doc1904
mhoeber Apr 24, 2015
71feb06
Dashboard search feature
dsego Apr 3, 2015
53c12d5
Merge pull request #7587 from edx/waqas/tnl1844-wrong-tab-problem
Apr 24, 2015
8dc4ecb
Bump problem_builder version to fix DB table conflict
bradenmacdonald Apr 23, 2015
e0122c0
Merge pull request #7624 from mcgachey/mcgachey-courseware-flags
Apr 24, 2015
81a5822
Merge pull request #7796 from open-craft/fix-mentoring-answers-conflict
bradenmacdonald Apr 24, 2015
2465cea
Merge pull request #7765 from edx/clrux/UX-1632-due-icon-rtl-placement
Apr 24, 2015
a2c65ba
Bump version of problem builder
Kelketek Apr 24, 2015
c7805f3
Merge pull request #7801 from edx/problem-builder-bump
Kelketek Apr 24, 2015
da03630
Update translations (autogenerated message)
sarina Apr 24, 2015
1504abe
Only pull languages we want from Transifex
sarina Apr 24, 2015
f389773
Merge pull request #7745 from schoolyourself/schoolyourself-xblock-up…
nedbat Apr 24, 2015
abff47e
Merge pull request #7800 from edx/sarina/20150424-update-translations
sarina Apr 24, 2015
c8e0095
MA-668 Mobile Push Notification payload update
nasthagiri Apr 24, 2015
b5f58cc
Merge pull request #7781 from edx/jsa/bokchoy-firefox-instrux
Apr 26, 2015
9b7972b
Skip unreliable test. TNL-2035
Apr 26, 2015
643fc0e
Add logging for verification and reverification.
Apr 22, 2015
960ec06
Merge pull request #7775 from edx/will/verification-logging
Apr 27, 2015
1eeca4d
Merge pull request #7522 from edx/feature/dashboard-search
Apr 27, 2015
4a4c3c5
Merge pull request #7806 from edx/benp/skip-test-TNL-2035
Apr 27, 2015
356b10c
Update component templates for accessibility and content
mhoeber Apr 17, 2015
4b6a171
Merge pull request #7805 from edx/mobile/push-notification-ios
nasthagiri Apr 27, 2015
c2fd273
Flag test as flaky. TNL-2083.
Apr 27, 2015
efde11d
Use ecommerce api v2.
Apr 21, 2015
323e466
Merge pull request #7579 from edx/sylvia/docs/templateupdates
mhoeber Apr 28, 2015
70d837a
Merge pull request #7777 from edx/jsa/baskets
Apr 28, 2015
3bd4535
Merge pull request #7753 from edx/aj/tnl1745-change-email-on-dashboard
awaisdar001 Apr 28, 2015
1bed97e
Merge pull request #7821 from edx/benp/flaky-TNL-2083
Apr 28, 2015
5c0adf0
Move mailchimp to a newer version of the edxapp.
feanil Feb 19, 2015
934207b
Fixes to get it working with master.
feanil Feb 20, 2015
d71433e
Address comments.
feanil Feb 20, 2015
f930734
Quality fixups for Mailchimp scripts
sarina Apr 13, 2015
2d3dab9
Remove 'batches' function, since == to 'chunk'
sarina Apr 14, 2015
b2d9d33
Docstrings for mailchimp scripts
sarina Apr 14, 2015
74ce5cb
Changing sequence nav buttons from images to icon fonts
Apr 21, 2015
6eda3ef
Merge pull request #7672 from edx/feanil/new_mailchimp_sync
sarina Apr 28, 2015
c6ecf25
Fix for SOL-475 (double exam grader bug)
mattdrayer Apr 27, 2015
f6401c1
Fix indentation for course structure API example
aleffert Apr 28, 2015
d9e13d2
Merge pull request #7763 from edx/clrux/sequence-nav-button-icons
Apr 28, 2015
d7d60bc
Merge pull request #7837 from edx/aleffert/structure-indentation
aleffert Apr 28, 2015
7b3bcef
Merge pull request #7820 from edx/mattdrayer/SOL-475
mattdrayer Apr 28, 2015
860467e
ECOM-1441 additional methods for skip re-verification links.
awais786 Apr 22, 2015
dc308d4
Merge pull request #7772 from edx/awais786/ECOM-1441-additional-methods
Apr 29, 2015
5a1d180
Merge pull request #7790 from edx/ahsan/AC-34-visually-hidden-content…
Apr 29, 2015
3e5e606
fixed cross icon issue on set date dialog inside schedule tab
Apr 28, 2015
cd9ce14
Merge pull request #7831 from amir-qayyum-arbisoft/icon_in_set_date
sarina Apr 29, 2015
a5786c7
Removed auto enroll checkbox from CCX coash dashboard
Apr 28, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,7 @@ Matjaz Gregoric <[email protected]>
Kyle Boots <[email protected]>
John Espinosa <[email protected]>
Phil McGachey <[email protected]>
Sri Harsha Pamu <[email protected]>
Cris Ewing <[email protected]>
Carlos de La Guardia <[email protected]>
Amir Qayyum Khan <[email protected]>
15 changes: 5 additions & 10 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Step 0: Join the Conversation

Got an idea for how to improve the codebase? Fantastic, we'd love to hear about
it! Before you dive in and spend a lot of time and effort making a pull request,
it's a good idea to discuss your idea with other interested developers and/or the
it's a good idea to discuss your idea with other interested developers and/or the
edX product team. You may get some valuable feedback that changes how you think
about your idea, or you may find other developers who have the same idea and want
to work together.
Expand Down Expand Up @@ -66,14 +66,14 @@ For asynchronous conversation, we have several mailing lists on Google Groups:
Byte-sized Tasks & Bugs
-----------------------

If you are contributing for the first time and want a gentle introduction,
If you are contributing for the first time and want a gentle introduction,
or if you aren't sure what to work on, have a look at the list of
`byte-sized bugs and tasks`_ in the tracker. These tasks are selected for their
small size, and usually don't require a broad knowledge of the edX platform.
It makes them good candidates for a first task, allowing you to focus on getting
familiar with the development environment and the contribution process.

.. _byte-sized bugs and tasks: https://openedx.atlassian.net/issues/?filter=12810
.. _byte-sized bugs and tasks: http://bit.ly/edxbugs

Once you have identified a bug or task, `create an account on the tracker`_ and
then comment on the ticket to indicate that you are working on it. Don't hesitate
Expand Down Expand Up @@ -140,21 +140,16 @@ Step 5: Code Review by Core Committer(s)
If your pull request meets the requirements listed in the
`contributor documentation`_, and it hasn't been rejected by a product owner,
then it will be scheduled for code review by one or more core committers. This
process sometimes takes awhile: currently, all core committers on the project
process sometimes takes awhile: most of the core committers on the project
are employees of edX, and they have to balance their time between code review
and new development. Please also read our `code ownership page`_, which
lists areas and concepts in the codebase that are "owned" by certain developers.
If your change touches one of these areas or concepts, that developer should be
one of the reviewers.
and new development.

Once the code review process has started, please be responsive to comments on
the pull request, so we can keep the review process moving forward.
If you are unable to respond for a few days, that's fine, but
please add a comment informing us of that -- otherwise, it looks like you're
abandoning your work!

.. _code ownership page: https://github.com/edx/edx-platform/wiki/Code-Ownership

Step 6: Merge!
==============

Expand Down
2 changes: 2 additions & 0 deletions cms/djangoapps/contentstore/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
""" module init will register signal handlers """
import contentstore.signals
3 changes: 2 additions & 1 deletion cms/djangoapps/contentstore/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from django.contrib import admin

from config_models.admin import ConfigurationModelAdmin
from contentstore.models import VideoUploadConfig
from contentstore.models import VideoUploadConfig, PushNotificationConfig

admin.site.register(VideoUploadConfig, ConfigurationModelAdmin)
admin.site.register(PushNotificationConfig, ConfigurationModelAdmin)
12 changes: 9 additions & 3 deletions cms/djangoapps/contentstore/course_info_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from xmodule.html_module import CourseInfoModule

from xmodule_modifiers import get_course_update_items
from cms.djangoapps.contentstore.push_notification import enqueue_push_course_update

# # This should be in a class which inherits from XmlDescriptor
log = logging.getLogger(__name__)
Expand All @@ -44,9 +45,13 @@ def get_course_updates(location, provided_id, user_id):

def update_course_updates(location, update, passed_id=None, user=None):
"""
Either add or update the given course update. It will add it if the passed_id is absent or None. It will update it if
it has an passed_id which has a valid value. Until updates have distinct values, the passed_id is the location url + an index
into the html structure.
Either add or update the given course update.
Add:
If the passed_id is absent or None, the course update is added.
If push_notification_selected is set in the update, a celery task for the push notification is created.
Update:
It will update it if it has a passed_id which has a valid value.
Until updates have distinct values, the passed_id is the location url + an index into the html structure.
"""
try:
course_updates = modulestore().get_item(location)
Expand All @@ -73,6 +78,7 @@ def update_course_updates(location, update, passed_id=None, user=None):
"status": CourseInfoModule.STATUS_VISIBLE
}
course_update_items.append(course_update_dict)
enqueue_push_course_update(update, location.course_key)

# update db record
save_course_update_items(location, course_updates, course_update_items, user)
Expand Down
Loading