Commit Graph

15466 Commits

Author SHA1 Message Date
Brian Talbot
dd2f34a929 Studio: cleans up new course form and course listings display 2013-07-11 12:48:43 -04:00
Brian Talbot
59850cb4a3 Studio: cleans up new course form and course listings display 2013-07-11 12:44:26 -04:00
cahrens
52b5da3e61 Merge branch 'talbs/studio-authorship' of github.com:edx/edx-platform into talbs/studio-authorship
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/templates/index.html
2013-07-11 12:41:22 -04:00
cahrens
3715d6c429 Only send a single variable to index.html about authorship rights. 2013-07-11 12:39:51 -04:00
cahrens
51c9523f97 Only send a single variable to index.html about authorship rights. 2013-07-11 12:36:30 -04:00
Brian Talbot
aaa67b28a9 Studio: revises template logic, html, and styling for Dashboard UI states 2013-07-11 11:11:25 -04:00
cahrens
135d10d4c5 Fix unicode return value. 2013-07-10 17:26:55 -04:00
cahrens
f911c96dcb Pass course_creator_status to index.html. 2013-07-10 16:19:49 -04:00
Brian Talbot
41651308f3 Studio - revises dashboard logic to handle authorship cases specifically (WIP) 2013-07-10 15:27:30 -04:00
Brian Talbot
5e9760d656 Studio: cleans up outdated Bourbon border-radius mixin from dashboard Sass 2013-07-10 15:26:41 -04:00
Brian Talbot
73fb0be142 Studio: syncs up denied status naming to styling 2013-07-10 15:16:00 -04:00
Brian Talbot
52feb5fe6d Studio - revises dashboard logic to handle authorship cases specifically 2013-07-10 15:16:00 -04:00
Brian Talbot
80f827df2c Studio: reverting dashboard HTML/UI back to previous state 2013-07-10 15:15:59 -04:00
Brian Talbot
f6991a9a6c Studio: revises dashboard copy when no courses exist for user 2013-07-10 15:15:59 -04:00
Brian Talbot
bcf27426b9 Studio: overrides authorship ui toggling animation paramters 2013-07-10 15:15:59 -04:00
Brian Talbot
f8a665e523 Studio: revises notice copy to reference UI above, not below 2013-07-10 15:15:59 -04:00
Mark L. Chang
a03810e369 copy changes 2013-07-10 15:15:59 -04:00
Brian Talbot
394292ec1b Studio: revises static dashboard states for all authorship rights scenarios 2013-07-10 15:15:59 -04:00
Brian Talbot
4d9d6a4522 Studio: resolves blue primary button default + hover color states 2013-07-10 14:57:11 -04:00
Brian Talbot
8f5c972e79 Studio: revises static states for all authorship cases on dashboard (WIP) 2013-07-10 14:57:10 -04:00
Brian Talbot
8da6543d90 Studio: adds static states for all authorship cases on dashboard (WIP) 2013-07-10 14:57:10 -04:00
David Baumgold
cb62797306 Merge pull request #347 from edx/update-sass
Update SASS and Bourbon, add Neat
2013-07-10 11:09:11 -07:00
chrisndodge
9824ba43cf Merge pull request #364 from edx/fix/cdodge/change-log-level-on-course-delete
change log levels on the delete course utility. Otherwise they get filte...
2013-07-10 10:52:06 -07:00
David Ormsbee
7993d5c1fc Merge pull request #348 from edx/bugfix/ichuang/idasbhoard-track-json
tracking in idashboard should only log json-serializable objects
2013-07-10 10:17:30 -07:00
David Baumgold
18474986f3 Removed deprecated mixins from _textbooks.scss 2013-07-10 13:00:07 -04:00
Adam
2af1132894 Merge pull request #350 from edx/fix/adam/less-noise
move setting changes in tests to override_settings
2013-07-10 09:48:55 -07:00
dcadams
a5f8607c7e Merge pull request #357 from edx/bugfix/dcadams/enroll_emails
Fix course url link in enrollment emails.
2013-07-10 09:47:53 -07:00
Chris Dodge
1b377260cc change log levels on the delete course utility. Otherwise they get filtered out in production environments (min set to WARN level) 2013-07-10 12:34:39 -04:00
Ned Batchelder
3bd590c1f6 Merge pull request #363 from edx/ned/fix-noisy-docs
Ned/fix noisy docs
2013-07-10 09:20:43 -07:00
Ned Batchelder
8997ed0322 Suggestions from James: mitx is old-school, as is autogeneration. 2013-07-10 12:19:53 -04:00
Ned Batchelder
55d4d98031 static_template_view.models is gone, remove it from docs. 2013-07-10 11:39:54 -04:00
Ned Batchelder
7f193bcaad We don't need to run sphinx on our tests. 2013-07-10 11:39:22 -04:00
jkarni
d0e5786250 Update CHANGELOG.rst 2013-07-10 11:38:18 -04:00
Ned Batchelder
a3d496a882 Set sys.path properly for docs to build.
We used to do it this way, I'm not sure why it was changed.
Our settings files add directories to the path, so we need to
do it here so that names will be importable.
2013-07-10 11:38:00 -04:00
ihoover
bec731207a Merge pull request #362 from edx/ihoover/login_enrollment_refactor
refactor login and enrollment test cases to use the mongo modulestore
2013-07-10 08:06:32 -07:00
ihoover
5a03d93000 refactor login and enrollment test cases to use the mongo modulestore
added namee to authors file
2013-07-10 10:34:14 -04:00
Adam Palay
d056c8a8f2 replace test setting changes with test-specific mock.patch.dicts 2013-07-10 10:18:58 -04:00
Adam
3b662ee063 Merge pull request #358 from edx/fix/adam/file-upload
fix to problems with uploading files
2013-07-10 07:07:28 -07:00
David Baumgold
3a11ab2663 Changelog: Sass, Bourbon, Neat 2013-07-10 09:18:19 -04:00
Frances Botsford
a0962cc3b9 updated sass transitions to use newer bourbon syntax 2013-07-10 09:18:00 -04:00
Frances Botsford
3748cae7b8 updated broken transition sass rule 2013-07-10 09:18:00 -04:00
Brian Talbot
a09866a48f Studio: refining timing variable comment in Sass 2013-07-10 09:18:00 -04:00
Brian Talbot
c10fc54509 Studio: abstracts and formalizes set animation/transition Sass variables 2013-07-10 09:17:59 -04:00
Brian Talbot
d046fdf743 resolves local Sass warnings/errors around missing mixins referenced in xmodule styling 2013-07-10 09:17:59 -04:00
Brian Talbot
b97c1bf5e3 Studio: corrects Sass @extend references 2013-07-10 09:17:59 -04:00
Frances Botsford
4187090dac removed non-existent sass extends from LMS: .table-wrapper, .dullify, .trans, .problem-set 2013-07-10 09:17:59 -04:00
Brian Talbot
41d9fa3785 Studio: syncs up syntax, ordering, and timing for all Sass transition mixins 2013-07-10 09:17:59 -04:00
Brian Talbot
ed93fcb89a Studio: adds back in transform-origin prop to dropdown nav icons 2013-07-10 09:17:59 -04:00
Brian Talbot
ee481dfdb5 Studio: resolves notification animation placement error 2013-07-10 09:17:59 -04:00
Brian Talbot
f708c42ec6 Studio: revises anim syntax, adds utility anims, and revises rotate transitions for nav 2013-07-10 09:17:59 -04:00