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

4005 Commits

Author SHA1 Message Date
cahrens
fd52980a2d Option view, changes getting persisted. 2013-05-10 16:02:22 -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
marco
04bb7335e7 removed extra section heading in settings DOM, placed settings after editor 2013-05-10 13:18:43 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Chris Dodge
51809965fe Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-10 10:01:53 -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
marco
004018c1eb Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui 2013-05-09 14:59:01 -04:00
marco
6dbfa7499b removed metadata-edit styling 2013-05-09 14:58:54 -04:00
cahrens
b314b5ce59 Renaming of some files. 2013-05-09 14:51:16 -04:00
cahrens
4a7f7d6537 Update the other templates that include metadata-edit.html. 2013-05-09 14:34:52 -04:00
Arthur Barrett
dd583ce4f9 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-09 14:32:05 -04:00
marco
cad8ae1b9b merged in new data requirements for html 2013-05-09 14:19:31 -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
cahrens
60f41eb108 Cleanup. 2013-05-09 11:49:09 -04:00
cahrens
cf491b1184 Remove component.html changes. 2013-05-09 11:46:47 -04:00
cahrens
7e42512bfa Merge branch 'ux/marco/studio-componentsettings' into feature/christina/metadata-ui 2013-05-09 11:20:04 -04:00
cahrens
bfdbcc2f32 Beginnings of Backbone views/models. 2013-05-09 11:16:12 -04:00
marco
3ebd5de744 added rest of settings list 2013-05-09 10:54:10 -04:00
marco
3284247905 restyling of the input fields, partway through adding in examples of all settings 2013-05-09 09:35:31 -04:00
Arthur Barrett
c7197cd567 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-08 18:04:24 -04: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
Chris Dodge
d8d4111a99 Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-08 12:15:26 -04:00
David Baumgold
7f69e45b9e whitespace changes 2013-05-08 09:29:20 -04:00
Arthur Barrett
eca155f99a Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-07 17:27:40 -04:00
Arthur Barrett
0ed07779c8 kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules." 2013-05-07 17:27:06 -04:00
marco
977d0d76c2 cleaning up styles to use list-input, field, group, label, input, tip, etc standards. also opted to try out initial pass at hierarchy splitting of css classes on items that repeat (li, for example) 2013-05-07 16:40:21 -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
Chris Dodge
81ecf0c5df add unit test to verify forum seeding occurs when creating new courses 2013-05-07 11:18:15 -04:00
marco
d28c0b5f91 cleaned up styling, synced up partially to existing standards for forms, fonts, colors, etc; currently open select box issue on chrome 2013-05-07 08:59:28 -04:00
cahrens
594d28a653 Pass default value through. 2013-05-06 16:03:41 -04:00
Chris Dodge
3858f1b706 update cms envs 2013-05-06 16:02:13 -04:00
Chris Dodge
30d266b430 seed forum permissions when creating new courses 2013-05-06 16:01:14 -04:00
cahrens
84ff2a0941 Merge branch 'master' into feature/christina/fields 2013-05-06 12:42:18 -04:00
marco
38abc0167d label on top of input field move 2013-05-06 07:37:14 -07:00
marco
6b4ab20d02 styled modes header, added inactive and active mode visibility as well as is-set mode styling. no js behavior in yet. adds overscoll fix for webkit 2013-05-05 14:09:59 -07:00
marco
ad0909dfbd style input boxes 2013-05-04 23:19:49 -07:00
marco
d1595892fd starting settings 2013-05-04 12:23:40 -07:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
Steve Strassmann
dea1198d75 Merge pull request #1925 from edx/bug/straz/date 
Bug/straz/date - fix date interpolation
 2013-05-03 09:32:00 -07:00
marco
018a3d8a38 branch now runs, but none of the styles are there yet. pushing this mostly to view component.html 2013-05-03 09:20:43 -07:00
marco
370df65d89 Merge branch 'master' into ux/marco/studio-componentsettings 2013-05-03 09:04:03 -07:00
marco
b9da0ffb0a reverting all variables in attempt to properly load unit pages 2013-05-03 09:02:32 -07:00
marco
110a51b74e removing variable names to get it to run again 2013-05-03 08:40:35 -07:00
marco
036991dce8 moved bad variable name 2013-05-03 08:10:37 -07:00