Jay Zoldak
|
2e85ba1a27
|
Omit migrations from code coverage reports.
Also omit portal and terrain, which are used for the lettuce testing framework.
|
2013-02-19 10:54:02 -05:00 |
|
Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
cahrens
|
5acf9cb3d2
|
Reformat to 4 spaces.
|
2013-02-15 14:46:41 -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
|
6c95460761
|
studio - resolving merge from master
|
2013-02-15 09:15:06 -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 |
|
Mark L. Chang
|
859cfff870
|
updated modal copy and alt text
|
2013-02-14 12:42:17 -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 |
|
Mark L. Chang
|
b7e8335a19
|
switched taxonomy back to section/subsection/unit
|
2013-02-13 22:53:46 -05:00 |
|
Brian Talbot
|
0af6b991f0
|
studio - nav: generalizing is-selected styling
|
2013-02-13 13:40:46 -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 |
|
Brian Talbot
|
714f69a57e
|
studio - resolving merge conflicts in settings from a recent rebase
|
2013-02-13 09:07:53 -05:00 |
|
Carlos Andrés Rocha
|
dff0c10b7a
|
Merge pull request #1493 from MITx/bug/dhm/misc
Fix broken test and don't pass time units as strings but as ints.
|
2013-02-12 15:14:37 -08:00 |
|
Brian Talbot
|
fccb3d7a73
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:36:36 -05:00 |
|
Don Mitchell
|
c904174bb7
|
Fix broken test and don't pass time units as strings but as ints.
|
2013-02-12 17:30:57 -05:00 |
|
Brian Talbot
|
0a2b74110e
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:03:48 -05:00 |
|
Don Mitchell
|
d569c559ca
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
|
2013-02-12 16:57:00 -05:00 |
|
chrisndodge
|
af364166fe
|
Merge pull request #1491 from MITx/bug/dhm/misc
lms required grace period fields to be in specific order
|
2013-02-12 12:42:53 -08:00 |
|
Don Mitchell
|
76d675ba16
|
fix npe for time (bug 185)
|
2013-02-12 15:20:02 -05:00 |
|
Don Mitchell
|
40668133f7
|
Fix bug which I know I fixed before (perhaps on another branch?) to
ensure old time had a value before comparing it to new time.
|
2013-02-12 15:11:35 -05:00 |
|
Brian Talbot
|
540710f553
|
studio - nav revamp: added in dynamic course org and number to header
|
2013-02-12 14:22:42 -05:00 |
|
Don Mitchell
|
8e213fb0d7
|
lms required grace period fields to be in specific order
|
2013-02-12 13:48:54 -05:00 |
|
Don Mitchell
|
c9c026be62
|
Fixed urls
|
2013-02-12 12:15:07 -05:00 |
|
Brian Talbot
|
7ca267fd78
|
studio - debugging grading settings JS errors WIP
|
2013-02-12 11:56:54 -05:00 |
|
Brian Talbot
|
22b959d657
|
studio - link wiring and spot styling changes for new nav/soft landing/settings work
|
2013-02-12 11:16:37 -05:00 |
|
Calen Pennington
|
23bb87e0bb
|
Merge pull request #1486 from MITx/feature/ned/clean_up_tests
We no longer need override_settings, Django has a better one.
|
2013-02-12 07:22:27 -08:00 |
|
Ned Batchelder
|
aa2d0ecaf2
|
We no longer need override_settings, Django has a better one.
|
2013-02-11 17:06:35 -05:00 |
|
Christina Roberts
|
f18618e35b
|
Merge pull request #1482 from MITx/bug/dhm/misc
bug 155
|
2013-02-11 13:46:20 -08:00 |
|
Don Mitchell
|
8bc9564d92
|
clean up note to self
|
2013-02-11 16:45:36 -05:00 |
|
Don Mitchell
|
777e0ef9c5
|
The other one was too inclusive
|
2013-02-11 16:36:34 -05:00 |
|
Don Mitchell
|
565f5f0adc
|
Stop simple clicks from paging to top w/o disrupting dnd
|
2013-02-11 16:28:22 -05:00 |
|
Christina Roberts
|
14234c8106
|
Merge pull request #1481 from MITx/bug/dhm/misc
Bug 180
|
2013-02-11 13:23:08 -08:00 |
|
Brian Talbot
|
8f5d8a98c7
|
studio - resolved sidebar content organization and styling
|
2013-02-11 16:20:25 -05:00 |
|
Brian Talbot
|
2150386a21
|
studio - resolved scss that hid works in progress
|
2013-02-11 16:16:10 -05:00 |
|
Brian Talbot
|
715cea51a4
|
studio - resolved scss that relied on old body classes
|
2013-02-11 16:09:33 -05:00 |
|