Commit Graph

338 Commits

Author SHA1 Message Date
Felix Sun
199b632513 Crowdsourced hinter now supports formula responses. Tests still broken. 2013-08-26 09:40:03 -04:00
David Ormsbee
478fc376f7 Connect new button to mode selection 2013-08-22 17:50:50 -04:00
Jason Bau
5ae2289df0 about page changes, refactor processor reply handling 2013-08-22 15:39:55 -04:00
David Ormsbee
91fab4579b Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py
2013-08-22 14:57:34 -04:00
David Ormsbee
1676fc31a5 Halfway state for course enrollment by mode 2013-08-21 16:21:53 -04:00
David Ormsbee
086f55643e Bare bones outline of ID verification templates 2013-08-21 16:21:52 -04:00
Jason Bau
a4f5f4e42f about page changes, refactor processor reply handling 2013-08-21 13:14:21 -04:00
Frances Botsford
445cf39f8b updated styling for marketing side register button to accommodate second line of text 2013-08-16 10:39:45 -04:00
Diana Huang
4946fbcd5b Change registration button based on number of modes. 2013-08-15 16:34:48 -04:00
Jay Zoldak
c09da60fe3 The enrollment_action value enroll should not be translated. 2013-08-13 08:43:09 -04:00
Adam Palay
b2b574ffb6 instructor dash fixes 2013-08-12 11:36:26 -04:00
Miles Steele
8f8d70aeae fix enroll multiple button, fix module_error report 2013-08-09 13:45:27 -04:00
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -04:00
Adam Palay
d894600207 template fixes on instructor dash 2013-08-06 10:16:57 -04:00
chrisndodge
85267e6a73 Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum
add display_coursenumber and display_organization fields on the CourseModule
2013-08-04 18:00:29 -07:00
Chris Dodge
18458bd94b wrong accessor 2013-08-02 21:45:51 -04:00
Chris Dodge
eaeaf3a520 fix formatting error 2013-08-02 21:44:48 -04:00
Chris Dodge
192d51bf7a touch-ups per review feedback 2013-08-02 21:37:27 -04:00
Chris Dodge
f041ab1ccc fix rebase conflicts 2013-08-02 11:22:25 -04:00
Chris Dodge
0937cdcbe6 one more escaping 2013-08-02 09:56:19 -04:00
Miles Steele
f7989cb2ab move to instructor template directory 2013-08-02 09:53:21 -04:00
Miles Steele
f88b266c2b add member list widget, add segment.io call for section view 2013-08-02 09:53:21 -04:00
Miles Steele
8e923deca0 fix unicode comparisons, fix 404 access exception, fix initial link handling, fix forum access modification permissions 2013-08-02 09:53:20 -04:00
Miles Steele
7392a888ce cleanup, fix permissions, rename functions, add more api tests 2013-08-02 09:53:20 -04:00
Miles Steele
1e8cb7df25 clean & comment coffeescript, add util.coffee 2013-08-02 09:53:20 -04:00
Miles Steele
e05d0f97d8 fix permissions, fix ENABLE_INSTRUCTOR_BACKGROUND_TASKS usage, fix csv download 2013-08-02 09:53:19 -04:00
Miles Steele
63d07b7e47 rename enrolled_students_profiles -> enrolled_students_features 2013-08-02 09:52:17 -04:00
Miles Steele
96fb19d28e add hover hint for auto-enroll 2013-08-02 09:52:16 -04:00
Miles Steele
5704b42407 add danger buttons 2013-08-02 09:52:16 -04:00
Miles Steele
fd1cfab020 add course info toggle arrow 2013-08-02 09:52:16 -04:00
Miles Steele
a727959d18 add feature switch for beta dashboard 2013-08-02 09:52:15 -04:00
Miles Steele
23c961d9e4 visual cleanup, page error presentation cleanup, factor out common exceptions 2013-08-02 09:52:14 -04:00
Miles Steele
dd43d6635f add instructor tasks 2013-08-02 09:52:14 -04:00
Miles Steele
9bdff7485a cleanup
- rename list copy
- add beta list
- fix forum and admin API's to be more similar
- add auto-enroll checkbox
- fix list reload
- remove extra js logging
- add course errors visibility toggle
- add underscore.js check
2013-08-02 09:52:13 -04:00
Miles Steele
0a657befdb add forum list management 2013-08-02 09:52:13 -04:00
Miles Steele
bc9cce5733 add instructor dash version switch 2013-08-02 09:52:13 -04:00
Miles Steele
5cdf3fb86a add staff management subsection, add student_admin subsection, refactor sections 2013-08-02 09:52:12 -04:00
Miles Steele
cc737cb1b2 rename enrollment section to membership 2013-08-02 09:52:12 -04:00
Miles Steele
02432e05cc integrate slickgrid, add instructor.enrollment, add instructor.access, refactor & clean 2013-08-02 09:52:12 -04:00
Miles Steele
6ff568ce9d remove pid and version 2013-08-02 09:52:12 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 2013-08-02 09:52:12 -04:00
Chris Dodge
3a2bb7ba01 add escaping 2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
Adam Palay
69ffb6a87b replace edx with variable substitution
fixes template errors

keep tos untranslated

formatting fixes
2013-07-31 19:39:15 -04:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Carlos Andrés Rocha
b8d1a138ae Show dates when the data was collected in the instructor dashboard panel 2013-07-30 11:16:27 -04:00
Brian Talbot
76b0a03bc2 edx.org: revises iframe-based register/status buttons to match revised styles 2013-07-29 10:21:54 -04:00
Diana Huang
86ee2bca7a Merge branch 'release'
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:57:07 -04:00
Diana Huang
2926c94330 Prevent XSS attack via submission_history page.
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:23:59 -04:00