David Baumgold
7d7513b6fe
Merge pull request #470 from edx/db/course-team-admin-grants
...
Grant admin rights to members of the course team
2013-07-30 13:36:56 -07:00
Jim Abramson
77a796e2c7
Merge pull request #520 from edx/feature/kevin/email_notifications_panel
...
Feature/kevin/email notifications panel
2013-07-30 05:30:56 -07:00
Kevin Chugh
4f7edbf67d
fix notifications URL
2013-07-30 01:50:33 -04:00
Kevin Chugh
5c91edd4a5
update coffeescript to use new status url
2013-07-30 01:43:49 -04:00
Kevin Chugh
8f98a1c2be
remove failing jasmine tests and print statements
2013-07-30 00:46:47 -04:00
Kevin Chugh
99f235ec56
first pass at jasmine tests
2013-07-30 00:13:03 -04:00
Kevin Chugh
62f6e2d52b
home button working, default to home when no thread selected
2013-07-29 23:33:50 -04:00
Your Name
47dbf2e6cb
updates but getting status and setting status not working
2013-07-29 18:33:19 -04:00
Brian Talbot
611dab077f
Studio: places 'add team member' call to course team view
2013-07-29 17:29:15 -04:00
Your Name
4afa5481dd
set and get settings and fix discussion.css post-variable-apocalypse
2013-07-29 16:11:59 -04:00
Diana Huang
d1b503d53a
Only redirect when redirect url is an internal page.
2013-07-29 14:18:04 -04:00
Your Name
13ca61ba7f
fix merge conflict with _variables.scss
2013-07-29 13:32:54 -04:00
Your Name
6276997180
update checkbox with get settings
2013-07-29 13:26:31 -04:00
Kevin Chugh
d95693ebb7
hook up panel to new stats service
2013-07-25 03:23:04 -04:00
Kevin Chugh
5d106ee048
Merge branch 'master' into feature/kevin/email_notifications_panel
2013-07-25 00:31:42 -04:00
cahrens
6629d5d3a3
Merge branch 'master' into talbs/studio-authorship
...
Conflicts:
cms/djangoapps/contentstore/views/user.py
cms/static/sass/elements/_controls.scss
cms/templates/activation_active.html
cms/templates/activation_complete.html
cms/templates/activation_invalid.html
2013-07-22 12:15:42 -04:00
Kevin Chugh
63b2b47106
update to render home page
2013-07-19 07:33:50 -04:00
RobertMarks
46ae2f9c26
Added support for a new problem type: ChoicetextResponse
2013-07-18 10:12:56 -07:00
frances botsford
033a36efb9
Merge pull request #371 from edx/fix/frances/lms-pdfviewer-cleanup
...
Quick LMS pdfviewer layout cleanup
2013-07-17 06:53:10 -07:00
Brian Talbot
388724c485
Studio: updates Sass mixins/extend references based on textbook/Sass cleanup
2013-07-15 10:12:51 -04:00
Brian Talbot
34e9a21da8
Studio: renames and simplifies .cont-trucated Sass extend
2013-07-15 10:12:50 -04:00
Brian Talbot
91a6e34769
Studio: adds further comment/prefix revisions to Sass extends
2013-07-15 10:12:50 -04:00
Brian Talbot
88d06a16e5
Studio: renames and re-orgs app-wide Sass extends
2013-07-15 10:12:50 -04:00
Brian Talbot
c75041e168
Studio: adds in disabled/submitting state and logic for course creation button
2013-07-12 14:25:32 -04:00
Peter Fogg
5b4524d75e
Merge pull request #301 from edx/peter-fogg/explicit-course-settings
...
Peter fogg/explicit course settings
2013-07-11 14:09:07 -07:00
Peter Fogg
6e94960488
Fix many validation bugs and failing tests.
2013-07-11 16:09:59 -04:00
Frances Botsford
b1653f0561
layout cleanup on LMS PDF Textbook viewer
2013-07-11 11:19:39 -04:00
David Ormsbee
aaf3a47538
Remove use of keyword "delete" in forum coffee code to fix IE8 bug LMS-441.
...
Change client-side code references from "delete" to "_delete". Some of these
were method names (or would generate method names), which breaks in IE8
because "delete" is a JavaScript reserved keyword. foo["delete"] is ok, but
foo.delete is not. This also makes forums marginally functional in IE8,
though the left-nav still has some display issues.
2013-07-10 17:54:13 -04:00
Frances Botsford
a0962cc3b9
updated sass transitions to use newer bourbon syntax
2013-07-10 09:18:00 -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
41d9fa3785
Studio: syncs up syntax, ordering, and timing for all Sass transition mixins
2013-07-10 09:17:59 -04:00
David Baumgold
40585b2bbb
Added neat grid framework
...
http://neat.bourbon.io/
2013-07-10 09:17:58 -04:00
David Baumgold
5bd79a8669
Changed @include box-shadow() to box-shadow
...
Bourbon's box-shadow mixin has been deprecated, and they recommend to use the
official spec.
2013-07-10 09:17:58 -04:00
David Baumgold
41374838cb
Changed @include border-radius() to border-radius
...
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
2013-07-10 09:17:58 -04:00
David Baumgold
1388684194
Sass 3.2.9, Bourbon 3.1.8
2013-07-10 09:17:58 -04:00
Frances Botsford
6814163a45
cleanup and tweaks from feeback to PDF Textbooks FED and Sass
2013-07-09 19:16:44 -04:00
Frances Botsford
2321a2c563
more updates to PDF textbook UI
2013-07-09 19:16:09 -04:00
David Baumgold
33a78eaeb7
Fix missing } from bad rebase
2013-07-09 19:16:05 -04:00
David Baumgold
6c313339e1
Updated Backbone-Associations to v0.5.0
2013-07-09 19:16:05 -04:00
David Baumgold
5fa05a50b9
Make gettext perform sanely in test
2013-07-09 19:16:03 -04:00
David Baumgold
3f0efe70cf
Added jasmine-stealth library, v0.0.12
2013-07-09 19:16:03 -04:00
David Baumgold
00f76f3cda
Added Backbone Associations v0.4.2
2013-07-09 19:16:01 -04:00
Frances Botsford
e237cdca84
round 2 on html and sass for textbook upload
2013-07-09 19:15:59 -04:00
Frances Botsford
9d59a1313c
initial html and sass for textbook upload
2013-07-09 19:15:59 -04:00
jkarni
ab4dfc248f
Merge pull request #217 from edx/feature/jkarni/jsinput
...
Feature/jkarni/jsinput
2013-07-08 12:51:04 -07:00
Julian Arni
fd6abc88e2
Incorporate review comments
2013-07-08 14:32:02 -04:00
Julian Arni
7fbd1a7221
Merge branch 'master' into HEAD
2013-07-02 14:27:05 -04:00
Renzo Lucioni
51f694b18d
Remove Segment.io whitelist from Logger
2013-07-02 13:49:33 -04:00
Renzo Lucioni
42efd33cfa
Refactor Segment.io integration with sequentials and instructor dashboard pages
2013-07-02 13:49:33 -04:00
Adam Palay
af75e1f785
log student answers using POST instead of GET
2013-07-01 18:21:47 -04:00
