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

1163 Commits

Author SHA1 Message Date
Tom Giannattasio
33378bbafd added google analytics to all pages without a course object 2012-10-03 19:33:12 -04:00
David Ormsbee
13bfbc820d Prevent caching of block showing top status bar (used for system alert notifications). 2012-10-02 16:38:28 -04:00
Tom Giannattasio
18a66a0b9c styled site status banner 2012-10-02 13:36:36 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner. 
- still needs style
- will cache for 10 seconds
 2012-10-02 11:48:16 -04:00
kimth
7750bb471c Merge pull request #788 from MITx/bug/tomg/new-collapsibles 
Added HTML and Problem collapsibles
 2012-09-28 10:03:50 -07:00
Tom Giannattasio
04119cce3f remove collapsible from problem template 2012-09-28 12:37:25 -04:00
Carlos Andrés Rocha
70b91813a9 Remove Fellow and Course Manager positions from the jobs page 2012-09-27 19:29:42 -04:00
kimth
8210bfdff5 Remove vestigial js include 2012-09-26 19:51:04 -07:00
Carlos Andrés Rocha
ed3d944371 Fix display of email address on 404 pages 2012-09-26 13:35:48 -04:00
Carlos Andrés Rocha
52bde562ce Correct Terms of Use and Privacy static pages 2012-09-26 13:19:33 -04:00
Carlos Andrés Rocha
e05c7be1ab Update Terms of Use and Privacy static pages 2012-09-26 10:42:08 -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
17820fef3b Made small correction to Elseview announcement on front page 2012-09-25 09:41:50 -04:00
Carlos Andrés Rocha
7fd6e0e23f Change subtitle of Elsevier announcement on the frontpage 2012-09-25 09:41:50 -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
Victor Shnayder
eae2ef1d74 Merge pull request #765 from MITx/feature/victor/fix-index-js-caching 
optimize!
 2012-09-24 06:24:33 -07:00
Victor Shnayder
ea762eabf1 optimize! 2012-09-24 09:22:35 -04:00
Calen Pennington
2edda935f7 Merge pull request #764 from MITx/feature/victor/fix-index-js-caching 
Also make the actual ?next redirection work with caching
 2012-09-24 06:20:52 -07:00
Victor Shnayder
a8aced9bba Also make the actual ?next redirection work with caching 
- use js instead of django to do the redirection
 2012-09-24 09:15:06 -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
60ed7046bd make progress label wider 2012-09-24 00:33:26 -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
kimth
6f62408ed6 Add comments 2012-09-23 18:47:35 -07:00
kimth
b376bc09a3 Arbitrary progress bar coloring 2012-09-23 18:46:10 -07:00
kimth
48b93fc985 Arbitrary grading markers 2012-09-22 23:01:04 -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
Victor Shnayder
ae06f13b96 Fix broken submission in firefox 
- apparently have to define functions before using them...
 2012-09-21 18:35:00 -04:00
David Ormsbee
a4d4a3b022 Merge pull request #650 from MITx/feature/bridger/course_grading 
Feature/bridger/course grading
 2012-09-21 08:10:03 -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
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
Tom Giannattasio
4af134b28a fixed large collapsible text and triple toggle 2012-09-20 17:49:36 -04:00
Bridger Maxwell
68ab19730f Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading 
Conflicts:
	lms/djangoapps/courseware/views.py
 2012-09-20 17:42:31 -04:00
Victor Shnayder
26a63850b3 Merge pull request #733 from MITx/feature/victor/static-tabs 
Feature/victor/static tabs
 2012-09-20 14:37:35 -07:00
Ibrahim Awwal
d1e8f4c016 Properly puluralize comments tooltip and change "unread" to "new". 2012-09-20 04:53:02 -07:00
Ibrahim Awwal
afdd11342e Show total comments instead of unread only, and use a tooltip to show the unread count. 2012-09-20 04:26:58 -07:00
Arjun Singh
6132b9b207 Alter some css; don't send the user if there is no user when retrieivng a thread 2012-09-20 02:11:27 -07:00
Arjun Singh
6824ab6305 Merge branch 'master' into feature/arjun/unread_count 2012-09-20 00:34:30 -07:00
Victor Shnayder
7a88223ef7 custom tabs 
* still needs better error checking and testing
 2012-09-20 00:51:23 -04:00
David Ormsbee
3cde783bdf Display the last top level element in the Table of Contents as expandable. 
This isn't a great fix, but I'm confused what's going on. It's something
in JQuery.TreeView. We write out the HTML correctly, but the lastExpandable
style causes the list item to not be expandable. This didn't bite us in
6.002x because the last item was an appendix that isn't expandable anyway.
It does affect 6.00x, where the last item is Chapter 5 at the moment.
 2012-09-19 17:37:15 -04:00
David Ormsbee
f9a49ece6f Dynamically find the start and end pages of a textbook instead of hardcoding to 6.002 values 2012-09-19 17:12:08 -04:00
David Ormsbee
10a838cb01 remove hardcoding of 6.002x in textbook page 2012-09-19 11:13:47 -04:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
David Ormsbee
62bb10156d Merge pull request #704 from MITx/feature/victor/custom-tabs 
Custom tabs
 2012-09-18 07:10:42 -07:00
Calen Pennington
c914a46a3f Merge pull request #691 from MITx/feature/victor/anon-deep-links 
Feature/victor/anon deep links
 2012-09-18 07:08:45 -07:00
Victor Shnayder
d9219c6086 Custom tabs 
* specify in tabs list in course policy
  - active page tracking now done in tabs.py
  - properly handle the fact that there may be multiple textbooks

* Still need:
  - wiki pages
  - (if that's delayed, special-case syllabus support)
 2012-09-18 08:45:09 -04:00
Ibrahim Awwal
a444166d98 Add a followed threads entry to the topic dropdown in the discussion sidebar. 
Also fixed up some random bugs with content_info, and changed pagination code a little. Needs comments service update for the subscribed threads API call.
 2012-09-18 04:09:38 -07:00
Ibrahim Awwal
151dbda242 Fix followed state not showing up on initial forum load in sidebar. 2012-09-18 04:09:38 -07:00