Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,169 Commits 1 Branch 0 Tags
d63813b4aa2009a048974da6596a404eeef7bb18
Commit Graph

16169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
d63813b4aa Fix missing source_code in LaTeX HTML. 
STUD-565
 2013-08-01 17:27:34 -04:00
David Baumgold
2ad78d949a Merge pull request #538 from edx/db/course-team-admin-grants 
Add error messaging to course team page
 2013-08-01 11:58:52 -07:00
Adam
76cf2027e9 Merge pull request #424 from edx/fix/adam/dash-reset 
convert user objects to unicode, improve error logging
 2013-08-01 11:57:07 -07:00
Adam Palay
0076d6a64d fix error handling 
distinguish logged error and instructor-facing error
 2013-08-01 14:56:28 -04:00
Adam Palay
bbd52e05a2 converts user objects to unicode, improve error logging 2013-08-01 14:56:27 -04:00
David Baumgold
1b83cfc409 Merge pull request #546 from edx/db/dev-views 
Create urls/views/templates for dev-only views
 2013-08-01 11:47:39 -07:00
David Baumgold
d8a7901688 Add a lettuce test for removing own admin permission on course team 2013-08-01 14:44:38 -04:00
David Baumgold
741bbb3f92 pylint cleanup 2013-08-01 14:16:55 -04:00
Adam
244e731f5d Merge pull request #553 from edx/adam/i18n-bug-fixes 
Adam/i18n bug fixes
 2013-08-01 11:16:21 -07:00
Adam Palay
3be155bd88 fix tests, remove zh_CN from config until we have support 2013-08-01 14:13:41 -04:00
Adam Palay
ac1ac2d93d i18n template fixes 
syntax fix
 2013-08-01 14:13:41 -04:00
David Baumgold
53ae177178 Curly quotes around course name 2013-08-01 13:46:40 -04:00
David Baumgold
16e2ee8011 Abstract out the unknown error message and i18n 2013-08-01 13:43:40 -04:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model 
Initialize on every page that has a context_course set
 2013-08-01 13:39:47 -04:00
David Baumgold
76948b52d9 Lettuce: confirm deletion prompts on course team page 2013-08-01 12:47:19 -04:00
Peter Fogg
cc6ca29bcc Merge pull request #550 from edx/peter-fogg/unit-reorder-notification 
Show notification on component reorder.
 2013-08-01 09:46:22 -07:00
David Baumgold
ec308e9771 Add lettuce test for transferring ownership of a course using the course team page 2013-08-01 12:11:49 -04:00
Peter Fogg
8bd686d63c Show notification on component reorder. 2013-08-01 11:56:16 -04:00
David Baumgold
607c06cba8 Stop using authz functions to change user groups 
They contain too much incorrect permission checking
 2013-08-01 11:24:42 -04:00
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2 
Ensure auto-auth feature flag actually disables CSRF
 2013-08-01 08:20:32 -07:00
Peter Fogg
e501a176b1 Merge pull request #540 from edx/peter-fogg/overview-reorder-notification 
Show notification on course outline reorder.
 2013-08-01 07:17:59 -07:00
e0d
97013d610a Merge pull request #541 from edx/e0d/escalated-priv-migrations 
adding migrate env for cms
 2013-08-01 07:15:08 -07:00
Adam
933935a887 Merge pull request #433 from edx/tsinghuax/lms-i18n 
Tsinghuax/lms i18n
 2013-08-01 07:00:00 -07:00
Brian Talbot
a1f43fa6fd Studio: revises prompt messages for team roles UI 2013-08-01 09:58:32 -04:00
David Baumgold
21318d142d Add confirmation prompt when deleting a user from a course team 2013-08-01 09:58:32 -04:00
David Baumgold
2617b478c0 Add error messaging to course team page 
Hitting "Add User" with no email address, or trying to add a user to the course
team multiple times
 2013-08-01 09:58:32 -04:00
Will Daly
b78f6f7a3d Added pylint exceptions to load test settings. 2013-08-01 09:42:31 -04:00
Peter Fogg
4a77693f4a Show notification on course outline reorder. 2013-08-01 09:41:27 -04:00
Will Daly
9e5d64b8df Removed check for AUTOMATIC_AUTH_FOR_LOAD_TESTING because 
it's already implied that you're using load testing settings.
 2013-08-01 09:29:58 -04:00
Will Daly
ab1461542d Moved CSRF override into its own settings file 2013-08-01 09:27:46 -04:00
e0d
60aaa8a876 Merge pull request #544 from edx/e0d/fix-loadtest-feature-flag 
these values are set implicitly at :147, setting them here clobbers them
 2013-08-01 06:01:43 -07:00
e0d
ef75f9bb2c adding migrate env for cms 
cleanup
 2013-08-01 08:43:20 -04:00
Will Daly
39030c6683 Remove CSRF middleware/processor in aws and dev settings, 
not common.  This ensures that we load the MITX_FEATURES
token BEFORE deciding to disable CSRF.
 2013-07-31 23:59:25 -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
chrisndodge
8573ac3909 Merge pull request #510 from edx/feature/cdodge/allow-course-run-in-course-create 
Feature/cdodge/allow course run in course create
 2013-07-31 14:44:50 -07:00
David Baumgold
64ad5567f3 Create urls/views/templates for dev-only views 
Our designers find it helpful to be able to stub out simple views that aren't ready
to be seen for production yet, and check them into version control so that other
people can see them and provide feedback. This commit introduces a few new files
and directories for this purpose, as well as a sample view that will only be seen
in dev mode, and never in production.
 2013-07-31 17:20:26 -04:00
Calen Pennington
8f97608200 Merge pull request #527 from edx/cale/restrict-us-to-less-than-distribute-0.7,-which-breaks-setuptools 
Restrict us to less than distribute 0.7, which breaks setuptools
 2013-07-31 14:00:31 -07:00
e0d
8abd7bb6fe these values are set implicitly at :147, setting them here clobbers them 2013-07-31 16:40:54 -04:00
Don Mitchell
b80aad2308 Merge pull request #528 from edx/dhm/rename_revision 
Rename CourseLocator.revision to branch
 2013-07-31 13:18:17 -07:00
David Baumgold
59c367b883 Merge pull request #542 from edx/db/fix-pylint 
Fix some pylint issues
 2013-07-31 13:12:54 -07:00
David Baumgold
248793c127 Fix some pylint issues 2013-07-31 15:42:11 -04:00
David Ormsbee
e68ddcd057 Merge branch 'release' 2013-07-31 15:33:30 -04:00
Frances Botsford
b6777118c6 removing animate class from course creation for now 2013-07-31 15:25:38 -04:00
Calen Pennington
094bf7e55d Merge pull request #536 from edx/cale/make-render_template-mocking-clearer 
Make render_template mocking clearer
 2013-07-31 11:37:55 -07:00
frances botsford
2ac27550a5 Merge pull request #537 from edx/fix/frances/studio-ie-menu-bug 
fix for ie bug where drop down menus were still clickable when collapsed
 2013-07-31 10:19:56 -07:00
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04:00
Frances Botsford
9ab21be98c fix for ie bug where drop down menus were still clickable when collapsed 2013-07-31 12:17:21 -04:00
Calen Pennington
e43dbd29c4 Merge pull request #487 from edx/cale/lms-xblock-student-view 
Cale/lms xblock student view
 2013-07-31 09:04:38 -07:00