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

10249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Brian Talbot
f1ad05059c studio - correcting an image-replacement Sass mixin 2013-02-13 09:18:23 -05:00
Brian Talbot
714f69a57e studio - resolving merge conflicts in settings from a recent rebase 2013-02-13 09:07:53 -05:00
Brian Talbot
fccb3d7a73 studio - nav and soft landing various QA fixes 2013-02-12 17:36:36 -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
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
70e11e823c studio - made all page heading chrome have consistent markup 2013-02-12 15:07:32 -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
Ned Batchelder
27e8d699be On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't. 2013-02-12 13:43:03 -05:00
David Ormsbee
537d6dd18e Merge pull request #1490 from MITx/bugfix/brian/pearson-timer 
change timer to calculate relative duration in javascript
 2013-02-12 09:26:53 -08:00
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -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
Ned Batchelder
baee9f96dc Merge branch 'master' of github.com:MITx/mitx 2013-02-12 11:28:51 -05:00
Ned Batchelder
78d3d20069 When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons. 
Conflicts:
	common/djangoapps/util/converters.py
 2013-02-12 11:25:14 -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
David Ormsbee
e07b667c02 Merge pull request #1488 from MITx/bug/btalbot/pearson-ie 
Resolving an LMS sidebar accordion issue in IE7
 2013-02-12 08:01:59 -08:00
Victor Shnayder
7d65c64148 Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt 
fix showing less than and greater than in code
 2013-02-12 07:38:16 -08:00
Brian Talbot
f33f7134fb lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters 2013-02-12 10:34:21 -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
Calen Pennington
de5b3a2a39 Merge pull request #1483 from MITx/feature/victor/raw-static-files 
Feature/victor/raw static files
 2013-02-12 07:21:01 -08:00
Brian Talbot
83e4dfaacb lms - pearson: trying to resolve JQUI accordion width bug in IE7 2013-02-12 09:58:16 -05:00
Kevin Chugh
21f4616080 spread less than and greater than fix to responses and comments, and profile view 2013-02-12 09:18:46 -05:00
Brian Talbot
8976818c78 studio - header UI: in progress markup changes WIP 2013-02-12 09:16:24 -05:00
Kevin Chugh
d57c78f9d9 fix showing less than and greater than in code 2013-02-11 20:01:09 -05:00
Victor Shnayder
3ccb33c8b3 Simplify, make it actually work. 
- regexp was too complicated, didn't work
 2013-02-11 17:50:13 -05:00
Victor Shnayder
2dcdeff4b6 Make replace_static_urls leave alone urls that have '?raw' at the end 
- needed for GWT'ed modules that rely on the filename to find dependencies
 2013-02-11 17:07:15 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00