Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
Chris Dodge
|
66c91b704a
|
init work. Export the 'draft' store under a distinct folder in the export. TBD: do the import from that directory as well.
|
2013-02-15 17:16:05 -05:00 |
|
Brian Talbot
|
9eb02a8a26
|
studio - resolving base.js spacing/conflicts
|
2013-02-15 16:57:42 -05:00 |
|
Calen Pennington
|
2bc3000156
|
Fix tests
|
2013-02-15 15:44:11 -05:00 |
|
cahrens
|
5acf9cb3d2
|
Reformat to 4 spaces.
|
2013-02-15 14:46:41 -05:00 |
|
Brian Talbot
|
3c6caa611c
|
resolving local merge
|
2013-02-15 14:24:42 -05:00 |
|
Brian Talbot
|
93949ab342
|
resolving local merge problem
|
2013-02-15 14:12:46 -05:00 |
|
Brian Talbot
|
a5e2b5c53a
|
resolving merge conflict and missing Sass mixin
|
2013-02-15 14:10:52 -05:00 |
|
Jay Zoldak
|
34a4b35e66
|
Fix lettuce acceptance tests to reflect the new soft landing page changes.
|
2013-02-15 14:07:46 -05:00 |
|
Brian Talbot
|
cb127d473d
|
studio - page headers: revised where new course form fields are placed in dashboard
|
2013-02-15 11:40:06 -05:00 |
|
Brian Talbot
|
20553b00d3
|
resolving merge conflict with master
|
2013-02-15 09:32:38 -05:00 |
|
Brian Talbot
|
6c95460761
|
studio - resolving merge from master
|
2013-02-15 09:15:06 -05:00 |
|
cahrens
|
38632c52c3
|
Beginnings of Selenium test.
|
2013-02-14 17:36:37 -05:00 |
|
Don Mitchell
|
bfcc0559a7
|
Merge pull request #1503 from MITx/fix/cdodge/export-policy-json
add exporting of policy.json
|
2013-02-14 12:47:37 -08:00 |
|
Chris Dodge
|
ea068d4aa8
|
add exporting of policy.json
|
2013-02-14 14:19:38 -05:00 |
|
Brian Talbot
|
9feb810006
|
studio - final prep of introduction areas (with fix for current page content margins)
|
2013-02-14 13:16:10 -05:00 |
|
Brian Talbot
|
bd98b2726a
|
resolving local merge conflict
|
2013-02-14 13:00:51 -05:00 |
|
Brian Talbot
|
c81f958788
|
studio - final prep of introduction areas (with fix for current page content margins)
|
2013-02-14 13:00:14 -05:00 |
|
Brian Talbot
|
9b09d043bd
|
studio - adding introduction areas to all templates and infrastructure for its contnet
|
2013-02-14 12:49:58 -05:00 |
|
Mark L. Chang
|
859cfff870
|
updated modal copy and alt text
|
2013-02-14 12:42:17 -05:00 |
|
Brian Talbot
|
47c117bf03
|
studio - page headers: resolved new course update creation JS issue caused by new markup
|
2013-02-14 10:52:25 -05:00 |
|
Brian Talbot
|
1a1be106ae
|
studio - page headers: added in view live links to course dashboard
|
2013-02-14 10:14:10 -05:00 |
|
Brian Talbot
|
2024f9eeca
|
studio - page headers: added view course button to course outline
|
2013-02-14 09:48:19 -05:00 |
|
Brian Talbot
|
6ade6983ae
|
studio - page headers: added in logic to style page actions' height based on title having a subtitle or not
|
2013-02-14 09:38:32 -05:00 |
|
Brian Talbot
|
ff0b85ed0d
|
studio - manual policy editor: revised CodeMirror string color for JSON fields specifically
|
2013-02-14 09:24:16 -05:00 |
|
Brian Talbot
|
41dc655cce
|
resolving local merge conflict
|
2013-02-14 09:03:46 -05:00 |
|
Brian Talbot
|
54cc51bccf
|
studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature
|
2013-02-14 09:02:51 -05:00 |
|
Brian Talbot
|
557beea31f
|
studio - hiding mast area for subsections
|
2013-02-14 09:00:57 -05:00 |
|
Mark L. Chang
|
b7e8335a19
|
switched taxonomy back to section/subsection/unit
|
2013-02-13 22:53:46 -05:00 |
|
cahrens
|
4ae691e88a
|
Convert JSON that doesn't parse to String (unless object, array, or single quote).
|
2013-02-13 17:41:52 -05:00 |
|
Brian Talbot
|
d571c7791a
|
studio - resetting Unit UI HTML back to prev version for now
|
2013-02-13 17:01:45 -05:00 |
|
Brian Talbot
|
c250bc8b59
|
studio - page headers: setting up needed future CSS
|
2013-02-13 16:59:56 -05:00 |
|
Brian Talbot
|
e23c99961d
|
studio - page headers: completed basic styling and simple page set-ups
|
2013-02-13 15:03:26 -05:00 |
|
Calen Pennington
|
793bbfd351
|
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
|
2013-02-13 14:04:21 -05:00 |
|
Brian Talbot
|
8ec4c09615
|
local merge conflict resolution
|
2013-02-13 13:41:35 -05:00 |
|
Brian Talbot
|
0af6b991f0
|
studio - nav: generalizing is-selected styling
|
2013-02-13 13:40:46 -05:00 |
|
Brian Talbot
|
e13db29efc
|
resolving merge from feature/btalbot/studio-softlanding
|
2013-02-13 12:42:15 -05:00 |
|
Brian Talbot
|
03e7d2e77b
|
studio - soft landing: changing 'sign into' to 'sign in to' copy
|
2013-02-13 12:18:27 -05:00 |
|
Brian Talbot
|
b09c3b6aff
|
studio - resolving local merge due to editor alias
|
2013-02-13 12:06:54 -05:00 |
|
Brian Talbot
|
d3e67be766
|
studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling
|
2013-02-13 12:03:30 -05:00 |
|
Don Mitchell
|
7f7fb60b7d
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-13 11:53:42 -05:00 |
|
Don Mitchell
|
6e5968e2cd
|
html changed; so, removed mostly meaningless comparison and fixed one.
|
2013-02-13 11:53:26 -05:00 |
|
Brian Talbot
|
3088e60d79
|
resolving local merge issues
|
2013-02-13 11:38:12 -05:00 |
|
Brian Talbot
|
fdd809409f
|
studio - nav: resolved Firefox browser chrome page-shifting bug
|
2013-02-13 11:37:47 -05:00 |
|
Don Mitchell
|
f7e635a7cd
|
fix npe w/ prev commit
|
2013-02-13 11:22:35 -05:00 |
|
Don Mitchell
|
4e3e2ec707
|
If user was trying to get to a specific page but had to log in, let them
get to that page once they've logged in.
|
2013-02-13 11:20:08 -05:00 |
|
Don Mitchell
|
3450c72833
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-13 09:31:09 -05:00 |
|
Don Mitchell
|
6f3a954d7b
|
howitworks is default home page if not logged in. Otherwise course
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
|
2013-02-13 09:30:54 -05:00 |
|
Christina Roberts
|
0b91c1c346
|
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
clean up templates that were removed from disk - we need to remove from ...
|
2013-02-13 06:29:35 -08:00 |
|
Chris Dodge
|
fbe3d29f19
|
added tests
|
2013-02-13 09:25:09 -05:00 |
|