David Baumgold
|
c0d69022cb
|
Set up Backbone model/view for alerts
|
2013-05-22 15:55:48 -04:00 |
|
David Baumgold
|
7e22278fcb
|
Simplify Youtube API script link
|
2013-05-22 15:55:48 -04:00 |
|
Frances Botsford
|
9effdc57b1
|
removed symbolset, replaced with fontawesome for settings
|
2013-05-22 15:55:48 -04:00 |
|
Frances Botsford
|
571ebb1fcd
|
removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons
|
2013-05-22 15:55:48 -04:00 |
|
Frances Botsford
|
88dd9244f3
|
removed symbolset, replaced with fontawesome for sock and static pages
|
2013-05-22 15:55:48 -04:00 |
|
Frances Botsford
|
81cb921e32
|
removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style
|
2013-05-22 15:55:48 -04:00 |
|
Frances Botsford
|
9a62433797
|
removed symbolset, replaced with fontawesome for asset upload
|
2013-05-22 15:55:47 -04:00 |
|
Frances Botsford
|
118a8884b2
|
removed symbolset, replaced with fontawesome for checklists
|
2013-05-22 15:55:47 -04:00 |
|
Frances Botsford
|
67df257d40
|
cleaned up some test styles for fontawesome deployment
|
2013-05-22 15:55:47 -04:00 |
|
Brian Talbot
|
2be2e2f20d
|
studio - plumbs in Font Awesome icons into header dropdown menus and user nav
|
2013-05-22 15:55:47 -04:00 |
|
Brian Talbot
|
033826746b
|
studio - adding in perset type sizes for icons (future/general use)
|
2013-05-22 15:55:47 -04:00 |
|
Brian Talbot
|
45b9155e4b
|
studio - adds in Font Awesome typeface, styling, and Sass import reference
|
2013-05-22 15:55:46 -04:00 |
|
Chris Dodge
|
9b88528b04
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
|
2013-05-22 13:20:49 -04:00 |
|
Vik Paruchuri
|
2303500ce2
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-22 12:18:28 -04:00 |
|
Victor Shnayder
|
361faacc57
|
Merge pull request #2099 from edx/bugfix/abarrett/advanced_modules_list
Fix advanced components list in Studio.
|
2013-05-22 08:29:07 -07:00 |
|
Christina Roberts
|
945fbe010f
|
Merge pull request #2093 from edx/feature/christina/acceptance-config
Use draft module store so we can test editing components (problems, html...
|
2013-05-21 17:19:51 -07:00 |
|
Arthur Barrett
|
cf502e2349
|
Fix advanced modules list.
|
2013-05-21 17:49:20 -04:00 |
|
Vik Paruchuri
|
9a52a17aab
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-21 14:54:45 -04:00 |
|
cahrens
|
f3bd9ab234
|
Get rid of empty, store ID.
|
2013-05-21 14:29:33 -04:00 |
|
Calen Pennington
|
cfe220a746
|
Add exceptions for unused imports in settings files
|
2013-05-21 13:07:04 -04:00 |
|
cahrens
|
3b15207bc6
|
Use draft module store so we can test editing components (problems, html, etc.).
|
2013-05-21 09:58:34 -04:00 |
|
Chris Dodge
|
094e396556
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
|
2013-05-21 09:47:11 -04:00 |
|
cahrens
|
bb699f482d
|
Update xblock, start Selenium.
|
2013-05-21 09:37:55 -04:00 |
|
Calen Pennington
|
241ef68f4f
|
Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location
|
2013-05-21 09:34:12 -04:00 |
|
Vik Paruchuri
|
fd6da08a97
|
Fix text
|
2013-05-21 00:26:39 -04:00 |
|
Vik Paruchuri
|
1f34561cff
|
Update examples, fix parsing error, avoid collision with capa template
|
2013-05-21 00:22:33 -04:00 |
|
cahrens
|
c8eeea240b
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 16:27:11 -04:00 |
|
cahrens
|
4facd262bd
|
Jasmine test for metadata model.
|
2013-05-20 16:26:48 -04:00 |
|
marco
|
3cf915005b
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 15:22:31 -04:00 |
|
marco
|
79c78cbccd
|
made firefox input number increment objects positioned as % to respond to page size accordingly
|
2013-05-20 15:22:21 -04:00 |
|
Brian Talbot
|
8bbbe992fe
|
studio - references new line-height() Sass mixin when declaring typography archetypes
|
2013-05-20 15:20:17 -04:00 |
|
Brian Talbot
|
31b5c4ab61
|
studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet
|
2013-05-20 15:20:17 -04:00 |
|
cahrens
|
4d7c7f866a
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-20 15:06:40 -04:00 |
|
marco
|
7641e128de
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-20 14:39:50 -04:00 |
|
marco
|
c0cff81e5e
|
styled firefox number buttons
|
2013-05-20 14:39:37 -04:00 |
|
Vik Paruchuri
|
7699c1794c
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-20 14:16:04 -04:00 |
|
cahrens
|
25388dec96
|
Minor cleanup.
|
2013-05-20 13:31:55 -04:00 |
|
cahrens
|
2020923f2d
|
Prevent invalid numeric entries.
|
2013-05-20 13:26:27 -04:00 |
|
marco
|
c356904027
|
css styles for firefox input number fields
|
2013-05-20 12:06:30 -04:00 |
|
Vik Paruchuri
|
ed2c1cf0d1
|
Remove header from cheatsheet
|
2013-05-20 11:46:01 -04:00 |
|
Vik Paruchuri
|
55fda26fd8
|
Fix tests, fix xqueue error, minor polish
|
2013-05-20 11:29:19 -04:00 |
|
cahrens
|
3229aaf503
|
Call polyfill at right time.
|
2013-05-20 11:16:20 -04:00 |
|
Vik Paruchuri
|
d4b54ceca7
|
Update open ended editor to parse tasks properly
|
2013-05-20 10:49:04 -04:00 |
|
Chris Dodge
|
a44e816877
|
remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py
|
2013-05-20 10:33:52 -04:00 |
|
Chris Dodge
|
fbbae44988
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
cms/djangoapps/contentstore/views/course.py
lms/djangoapps/django_comment_client/base/views.py
lms/djangoapps/django_comment_client/management/commands/show_permissions.py
lms/djangoapps/django_comment_client/models.py
lms/djangoapps/django_comment_client/tests/test_utils.py
lms/envs/common.py
|
2013-05-20 10:22:36 -04:00 |
|
Vik Paruchuri
|
986999c62e
|
Fix cheatsheet, start working on xml replacement
|
2013-05-20 09:50:15 -04:00 |
|
marco
|
aa41aed9d1
|
prototype for polyfill on number input fields, minimal styling to up down buttons
|
2013-05-20 09:45:33 -04:00 |
|
Vik Paruchuri
|
9a7006473e
|
Do basic work on a simple editor for combinedopenended
|
2013-05-20 09:07:03 -04:00 |
|
Brian Talbot
|
bf8df49728
|
studio - revising line height between course nav titles and prefixes
|
2013-05-20 08:40:28 -04:00 |
|
Brian Talbot
|
098a5dda48
|
studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing
|
2013-05-20 08:39:18 -04:00 |
|