Chris Dodge
|
6cec66979a
|
fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test
|
2013-05-15 11:16:47 -04:00 |
|
David Baumgold
|
1afe556161
|
Merge pull request #2039 from edx/fix-course-updates
Fix "Course Updates" page
|
2013-05-14 16:14:20 -07:00 |
|
Frances Botsford
|
6c119fa3ab
|
refixed extend for text-sr and text-hide
|
2013-05-14 17:17:43 -04:00 |
|
frances botsford
|
24b7defb43
|
removed mixin for text-sr and text-hide, replaced with extend
|
2013-05-14 17:17:42 -04:00 |
|
Brian Talbot
|
8b77111d58
|
Studio: more styling changes
typography, SASS, imports
|
2013-05-14 17:16:53 -04:00 |
|
Jay Zoldak
|
5d783d33ad
|
Update lettuce test for new css changes.
|
2013-05-14 17:16:51 -04:00 |
|
Brian Talbot
|
f069c1a1a1
|
Studio: style reorg
typography, SASS import, mixins/extends
|
2013-05-14 17:15:07 -04:00 |
|
David Baumgold
|
e9a8f408bf
|
Add {reset: true} to all collection.fetch() calls
This is to fix a bug with the Backbone 1.0 upgrade; some views were listening to
reset events that were not longer getting fired
|
2013-05-14 16:43:41 -04:00 |
|
Calen Pennington
|
bd6bb8e9c1
|
Fix advanced modules list
|
2013-05-14 09:39:25 -04:00 |
|
Steve Strassmann
|
7b71271bc1
|
prefix unused vars with _
|
2013-05-13 15:21:29 -04:00 |
|
Steve Strassmann
|
9b7374ab73
|
pull from master
|
2013-05-13 15:07:14 -04:00 |
|
Steve Strassmann
|
10b7622018
|
declare exports from course, component
|
2013-05-13 15:06:52 -04:00 |
|
David Baumgold
|
f0bd73b2fb
|
Merge pull request #2022 from edx/kill-submodules
Install phantom-jasmine via npm, rather than git submodules
|
2013-05-13 12:02:41 -07:00 |
|
Steve Strassmann
|
b3cc9a1174
|
pep8 cleanups
|
2013-05-13 14:55:41 -04:00 |
|
Steve Strassmann
|
96c37089dc
|
whitespace for pep8
|
2013-05-13 13:47:51 -04:00 |
|
Steve Strassmann
|
cdc2de7e65
|
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
pull from master
|
2013-05-13 13:22:39 -04:00 |
|
Steve Strassmann
|
b0cc989b1e
|
pull from master
|
2013-05-13 11:45:23 -04:00 |
|
David Baumgold
|
7c98981498
|
Install phantom-jasmine via npm, rather than git submodules
Because removing a step from our install process is a Good Thing™
|
2013-05-13 11:33:09 -04:00 |
|
Steve Strassmann
|
8bb6ad3689
|
relative imports
|
2013-05-13 11:31:56 -04:00 |
|
Chris Dodge
|
0ef2944d43
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:13:43 -04:00 |
|
Mark L. Chang
|
85ae7b9744
|
Merge pull request #2012 from edx/feature/markchang/500-copy-change
copy change
|
2013-05-13 08:12:02 -07:00 |
|
Chris Dodge
|
4d197e10ec
|
fix some violations. Build up karma
|
2013-05-13 11:10:11 -04:00 |
|
Steve Strassmann
|
e03585d85c
|
pylint: refactor imports
|
2013-05-13 11:07:08 -04:00 |
|
Chris Dodge
|
d32e7a5b61
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:06:49 -04:00 |
|
Chris Dodge
|
3cf865a88f
|
added another unit test check point for export/import of classic textbooks
|
2013-05-13 10:16:18 -04:00 |
|
Steve Strassmann
|
b288a8e3bd
|
fix export from tabs.__all__
|
2013-05-13 10:03:20 -04:00 |
|
Steve Strassmann
|
979e3be174
|
fix pep8: imports and blank lines
|
2013-05-13 09:58:30 -04:00 |
|
Chris Dodge
|
d98e726a8e
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 09:51:05 -04:00 |
|
Steve Strassmann
|
5ab6d47264
|
pull from master
|
2013-05-13 09:39:33 -04:00 |
|
Alexander Kryklia
|
bdc62e7d2e
|
word cloud studio integration
|
2013-05-13 14:44:09 +03:00 |
|
Mark L. Chang
|
f864a6c00c
|
more copy tweaks
|
2013-05-11 16:16:30 -04:00 |
|
Mark L. Chang
|
317831a813
|
copy change
|
2013-05-11 16:16:30 -04:00 |
|
Steve Strassmann
|
c071ee448f
|
pep8 compliance
|
2013-05-10 16:51:26 -04:00 |
|
Jason Bau
|
408e26a0c1
|
parameterizes CMS email settings
|
2013-05-10 13:42:28 -07:00 |
|
Steve Strassmann
|
571a9af0c0
|
declared exports
|
2013-05-10 16:37:28 -04:00 |
|
Chris Dodge
|
1db66957af
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-10 15:44:55 -04:00 |
|
Steve Strassmann
|
70cca0540d
|
reorder imports for pep8
|
2013-05-10 15:23:28 -04:00 |
|
Steve Strassmann
|
01d4fbeb7c
|
reorder imports
|
2013-05-10 14:14:36 -04:00 |
|
Steve Strassmann
|
8c8377f1df
|
Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views
pull master
|
2013-05-10 13:59:07 -04:00 |
|
Steve Strassmann
|
9350a2c067
|
refactoring views
|
2013-05-10 13:56:30 -04:00 |
|
Chris Dodge
|
1b0eff52ed
|
create test cases to simulate error exporting/importing textbooks
|
2013-05-10 10:01:10 -04:00 |
|
Steve Strassmann
|
0bea50ede1
|
start refactoring views.py
|
2013-05-09 16:24:21 -04:00 |
|
Calen Pennington
|
ea859bd6c7
|
Filter out the template course from the mongo modulestore get_courses function
|
2013-05-09 16:22:23 -04:00 |
|
David Baumgold
|
d09e93142f
|
Merge pull request #1980 from edx/backbone-1.0.0
Upgrade to Backbone 1.0.0
|
2013-05-09 09:34:35 -07:00 |
|
Brian Talbot
|
25dd2c7d67
|
studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins
|
2013-05-08 15:30:17 -04:00 |
|
David Baumgold
|
7f69e45b9e
|
whitespace changes
|
2013-05-08 09:29:20 -04:00 |
|
Christina Roberts
|
729ca900e6
|
Merge pull request #1920 from edx/feature/christina/fields
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
|
2013-05-07 09:38:34 -07:00 |
|
cahrens
|
594d28a653
|
Pass default value through.
|
2013-05-06 16:03:41 -04:00 |
|
cahrens
|
84ff2a0941
|
Merge branch 'master' into feature/christina/fields
|
2013-05-06 12:42:18 -04:00 |
|
David Baumgold
|
b344976fe7
|
Making linters happier
|
2013-05-03 15:08:28 -04:00 |
|