Chris Dodge
|
e0bc823365
|
remove auto-provisioning because of a dependency problem between cms and lms
|
2013-04-11 10:42:03 -04:00 |
|
Don Mitchell
|
f6434ed4fb
|
Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules
Fix/cdodge/export draft modules
|
2013-04-10 13:12:09 -07:00 |
|
cahrens
|
40adfa950d
|
Get the "Edit High Level Source" link back in. Broken with xblock work.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
|
2013-04-10 14:53:26 -04:00 |
|
Chris Dodge
|
d9fa723eb2
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
Conflicts:
common/lib/xmodule/xmodule/modulestore/xml_importer.py
|
2013-04-10 12:02:16 -04:00 |
|
Brian Talbot
|
97e893b2ed
|
Merge branch 'master' into feature/btalbot/studio-courselink
|
2013-04-10 10:48:33 -04:00 |
|
Brian Talbot
|
01b2fefdd0
|
studio - revised course URL link label to match wording used elsewhere in the view/app
|
2013-04-10 10:48:12 -04:00 |
|
Chris Dodge
|
07b9d6353e
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
|
2013-04-10 09:26:51 -04:00 |
|
Christina Roberts
|
81f94fc4e2
|
Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin
studio - fixing a visual margin issue with the sign up/in views
|
2013-04-09 12:51:09 -07:00 |
|
cahrens
|
f36494e5dd
|
Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way.
|
2013-04-09 09:41:52 -04:00 |
|
Brian Talbot
|
12784e3fb8
|
studio - course link final styling
|
2013-04-08 17:35:16 -04:00 |
|
Brian Talbot
|
b51e57eddf
|
studio - refining style and presentation of course link and invitation button on details settings
|
2013-04-08 17:31:14 -04:00 |
|
Brian Talbot
|
606469cd46
|
studio - fixing a visual margin issue with the sign up/in views header/content areas
|
2013-04-08 17:14:41 -04:00 |
|
Brian Talbot
|
7882845786
|
studio - alerts: correcting page title
|
2013-04-08 17:09:43 -04:00 |
|
Brian Talbot
|
27871ac9c9
|
studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake
|
2013-04-08 16:55:06 -04:00 |
|
Brian Talbot
|
3f2e21f9dc
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 16:29:18 -04:00 |
|
Brian Talbot
|
3f22826e26
|
studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification
|
2013-04-08 16:28:31 -04:00 |
|
Brian Talbot
|
4e331a2c6a
|
studio - restyling course basic details and adding in a course's URL more prominently WIP
|
2013-04-08 15:39:01 -04:00 |
|
Chris Dodge
|
d7b148d0d9
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
Conflicts:
common/lib/xmodule/xmodule/modulestore/draft.py
|
2013-04-08 15:02:47 -04:00 |
|
Mark L. Chang
|
1500586f70
|
Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo
studio - corrected a typo and adjusted copy on the help sock
|
2013-04-08 11:23:16 -07:00 |
|
Brian Talbot
|
e3a1279c8f
|
studio - corrected a typo and adjusted copy on the help sock
|
2013-04-08 14:10:38 -04:00 |
|
Mark L. Chang
|
caa2539893
|
Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None
mark stumble on case where he had a None course
|
2013-04-08 11:10:15 -07:00 |
|
Brian Talbot
|
aaf95ddbba
|
studio - course link: roughed in new markup/location of course link to share
|
2013-04-08 14:09:18 -04:00 |
|
Chris Dodge
|
472e657692
|
mark stumble on case where he had a None course
|
2013-04-08 14:07:37 -04:00 |
|
Chris Dodge
|
5137119f2b
|
add a simple Studio walkthough to check page loads
|
2013-04-08 13:55:38 -04:00 |
|
Brian Talbot
|
bcf4775610
|
studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling
|
2013-04-08 13:47:01 -04:00 |
|
Brian Talbot
|
4d0d3d3ad4
|
studio - alerts: refactored some alert and notification show/hide js added back to base.js
|
2013-04-08 11:35:27 -04:00 |
|
Brian Talbot
|
28334064ab
|
studio - alerts: reducing the animation time for notification slide downs
|
2013-04-08 11:30:49 -04:00 |
|
Brian Talbot
|
4f71f53826
|
studio - alerts: adding back in manual close behavior to base.js (needed across app)
|
2013-04-08 11:18:10 -04:00 |
|
cahrens
|
cea0f9252c
|
Make sure we don't mark the message bar as hiding if it is not shown.
|
2013-04-08 11:02:06 -04:00 |
|
cahrens
|
7f1c89b492
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 10:28:52 -04:00 |
|
Don Mitchell
|
c6bec6bcad
|
Merge pull request #1812 from MITx/feature/christina/gmt
Display UTC on the end of dates (that are in UTC).
|
2013-04-08 07:00:08 -07:00 |
|
Brian Talbot
|
c0bb3c962d
|
studio - adding in ux-alerts view comment
|
2013-04-08 09:41:50 -04:00 |
|
Brian Talbot
|
a6c35fb2ce
|
studio - addressing pull request to merge to master feedback
|
2013-04-08 09:30:09 -04:00 |
|
Chris Dodge
|
288620592a
|
get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish
|
2013-04-07 19:33:04 -04:00 |
|
Chris Dodge
|
5b7d882e3e
|
Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements
|
2013-04-06 11:02:21 -04:00 |
|
Chris Dodge
|
b78eed3c22
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision
|
2013-04-06 10:58:26 -04:00 |
|
Chris Dodge
|
7c48f9a5ed
|
add unit test to verify that the store updated signal actually fired. Also fix bug where cloning item doesn't update the inherited metadata caches
|
2013-04-06 10:43:40 -04:00 |
|
Brian Talbot
|
f31588c81b
|
studio - resolving section release date form issues (labels, saving, updating)
|
2013-04-05 16:44:09 -04:00 |
|
Brian Talbot
|
d41f5042a5
|
studio - resolving margin-top issue with views that don't have a masthead
|
2013-04-05 16:30:51 -04:00 |
|
Chris Dodge
|
a3de4ff625
|
add unit test to confirm 'id' generation
|
2013-04-05 15:59:01 -04:00 |
|
Chris Dodge
|
e717244611
|
remove discussion cache, which isn't used
|
2013-04-05 15:27:50 -04:00 |
|
Brian Talbot
|
1a68d516fb
|
resolving local merge with master
|
2013-04-05 15:27:08 -04:00 |
|
Brian Talbot
|
512e4fe3bd
|
resolving local merge with master and sprucing style and templates for merge with master
|
2013-04-05 15:13:21 -04:00 |
|
Christina Roberts
|
33d39a85a9
|
Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock
Studio Help Sock
|
2013-04-05 11:37:57 -07:00 |
|
Chris Dodge
|
f84eaf01b8
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
|
2013-04-05 13:20:02 -04:00 |
|
Chris Dodge
|
3d7f893259
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision
|
2013-04-05 13:19:10 -04:00 |
|
Chris Dodge
|
5bbfe87005
|
fix various pop8/pylint violations. switch hasattr() to getattr()
|
2013-04-05 13:18:48 -04:00 |
|
Chris Dodge
|
dbf58c0d54
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-05 12:53:24 -04:00 |
|
chrisndodge
|
4c95294ba7
|
Merge pull request #1810 from MITx/feature/cdodge/integrity-check-mongo-course
pylint/pep8 fixes
|
2013-04-05 08:45:12 -07:00 |
|
Brian Talbot
|
275826d4ff
|
studio - resolving help sock PR comments
|
2013-04-05 11:29:46 -04:00 |
|