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

1127 Commits

Author SHA1 Message Date
Calen Pennington
cac8e3453c Remove more remnants of askbot 2012-10-23 13:40:50 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Carlos Andrés Rocha
2f7733ede0 Add Cengage book press release 2012-10-18 14:45:42 -04:00
Carlos Andrés Rocha
b121e620f8 Make small corrections to UT pages and announcement 2012-10-15 11:54:23 -04:00
Carlos Andrés Rocha
b13412d3b2 Make corrections of UT announcement 2012-10-15 11:12:35 -04:00
Carlos Andrés Rocha
c5a148639d Add announcement of UT joining edx and related changes 2012-10-15 06:57:50 -04:00
Arjun Singh
d7b237ce0a more removal of data("id") in favor of attr("data-id") 2012-10-12 14:47:44 -07:00
David Ormsbee
f5f1e858d5 Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids 
Hotfix/arjun/fix integer disc ids
 2012-10-12 11:38:28 -07:00
Tom Giannattasio
a9ba3543d3 styled edge registration form 2012-10-12 11:18:55 -04:00
Calen Pennington
4814f8c38e Cleaning up logos for edge landing page 2012-10-12 10:31:46 -04:00
Calen Pennington
c41c084b39 Wire up login and register forms for edx landing page 2012-10-12 09:55:32 -04:00
Arjun Singh
71201a73b2 styles and tiny bit of logic for community tas 2012-10-12 04:54:56 -07:00
Arjun Singh
6fbf2f9720 revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved 2012-10-12 04:22:27 -07:00
Tom Giannattasio
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -04:00
Victor Shnayder
36917b0036 Merge pull request #829 from MITx/feature/tomg/ie-banner 
added ie warning banner to courseware; displayed by ie conditional style...
 2012-10-05 13:53:15 -07:00
Tom Giannattasio
1804d5410c fixed ie banner showing outside of courseware bug 2012-10-04 15:50:02 -04:00
Tom Giannattasio
49bd3ac905 added ie warning banner to courseware; displayed by ie conditional stylesheet 2012-10-04 15:34:50 -04:00
Tom Giannattasio
69f8734893 changed vote button icon display mode to fight zoom bugs 2012-10-04 14:09:01 -04:00
Tom Giannattasio
a15ef161a9 ff bug fix 2012-10-03 10:59:24 -04:00
Victor Shnayder
2f30a717a5 only display site status inside the courseware 2012-10-02 16:54:03 -04:00
Tom Giannattasio
671f2af387 added image 2012-10-02 13:39:42 -04:00
Tom Giannattasio
18a66a0b9c styled site status banner 2012-10-02 13:36:36 -04:00
Calen Pennington
ce3638538c Make inline editing save to mongo and then update the preview 2012-10-01 15:17:41 -04:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00
Calen Pennington
4381674ec5 Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms 2012-10-01 15:17:40 -04:00
Calen Pennington
d240b5b1eb Consolidate bourbon and link to it from both cms and lms 2012-10-01 15:17:40 -04:00
Calen Pennington
44805ca383 Make discussion js work for cms as well as lms so that inline discussion xmodules load 2012-10-01 15:16:54 -04:00
Tom Giannattasio
1870db5fb1 fixed custom tab box-sizing glitch in firefox 2012-10-01 10:09:56 -04:00
Tom Giannattasio
10227e8cdf added moderator label styles 2012-09-28 07:27:57 -04:00
Carlos Andrés Rocha
52a9bd2d1e Fix news and announcements icons on the frontpage 2012-09-25 10:33:38 -04:00
Carlos Andrés Rocha
a948c13496 Resize images for the news feed on the frontpage 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
1a95abd095 Update Elsevier press release and frontpage feed 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
3492243ffa Add Elsevier press release 2012-09-25 09:41:50 -04:00
Calen Pennington
a45fe4a651 Merge pull request #759 from MITx/feature/victor/fix-index-js-caching 
Fix login-if-?next behavior
 2012-09-24 05:24:13 -07:00
Arjun Singh
95997a5e67 fix up syllabus 2012-09-24 04:32:36 -07:00
arjun810
df2b06f235 Merge pull request #760 from MITx/kimth/fix-gradebook 
Kimth/fix gradebook
 2012-09-23 22:17:43 -07:00
Arjun Singh
f86933de4f Increase height of progress graph; allows for more cutoffs to look reasonable 2012-09-23 20:53:38 -07:00
Victor Shnayder
0b40e75166 Fix login-if-?next behavior 
* for more context, see https://basecamp.com/1892446/projects/631155-devops/messages/4719963-strange-caching
 2012-09-23 22:33:20 -04:00
Arjun Singh
5e49871e93 cs188 styling 2012-09-22 22:54:41 -07:00
Arjun Singh
38c0a034fb Add slides nowrap 2012-09-22 18:06:19 -07:00
Arjun Singh
eca21e7c18 Fix syllabus in static_tab_wrapper; don't wrap slides 2012-09-22 17:46:35 -07:00
Arjun Singh
015328ed5c more 188 styling 2012-09-22 17:19:27 -07:00
Arjun Singh
987d8ea43b Some 188-specific styling + default styling for static tabs 2012-09-22 14:17:34 -07:00
Ibrahim Awwal
0ff14d7e00 Merge pull request #749 from MITx/hotfix/arjun/discussion_trailing_slash 
Better fix for trailing slash
 2012-09-21 05:43:48 -07:00
Arjun Singh
8fb6204073 Better fix for trailing slash 2012-09-21 05:42:51 -07:00
Ibrahim Awwal
e7e0c2c141 Merge pull request #748 from MITx/hotfix/arjun/discussion_trailing_slash 
New URLs require a trailing slash
 2012-09-21 05:22:32 -07:00
Arjun Singh
663e38aa1f New URLs require a trailing slash 2012-09-21 05:19:23 -07:00
Calen Pennington
b799d9b73f Merge pull request #744 from MITx/bug/tomg/collapsible-hint 
Bug/tomg/collapsible hint
 2012-09-21 05:13:01 -07:00
Ibrahim Awwal
57d5ba07c0 Remove commented out block and pull some stuff into a function to load the first page of results for a thread query. 2012-09-21 04:33:16 -07:00
Ibrahim Awwal
939b927fbd Merge branch 'master' into feature/ibrahim/followed-threads 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
 2012-09-20 23:55:13 -07:00