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

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
arjun810
f627c9e9c1 Merge pull request #791 from MITx/kimth/js-refactor 
Kimth/js refactor
 2012-10-02 19:47:20 -07:00
David Ormsbee
0ed735b7b6 Merge pull request #808 from MITx/bugfix/victor/fix-anon-user-access-check 
fix a bug: can_load() should check for the 'load' permission.
 2012-10-02 16:27:00 -07:00
Victor Shnayder
227cc58d30 fix a bug: can_load() should check for the 'load' permission. 
- triggered by anon users when all courses have started (or start dates are off).
 2012-10-02 18:59:04 -04:00
David Ormsbee
13c8cbf5af Merge pull request #807 from MITx/feature/victor/status-banner 
Feature/victor/status banner
 2012-10-02 14:19:36 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
Tom Giannattasio
44d4a4b0d9 started asset library template -wip 2012-10-02 17:02:47 -04:00
Victor Shnayder
2f30a717a5 only display site status inside the courseware 2012-10-02 16:54:03 -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
Chris Dodge
a570702ae3 add a new subsection edit url map and reference it in the course summary page 2012-10-02 16:22:26 -04:00
Victor Shnayder
8b0f1a0305 get rid of caching--unneeded complexity. 2012-10-02 15:03:06 -04:00
Carlos Andrés Rocha
f357e90dc0 Add support for video download link 
Add a download link to the video player. The link is defined in the
content xml using the following structure:

<video youtube="youtubestring">
  <source src="video_link"/>
</video>
 2012-10-02 14:23:31 -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
70d9721d5b Merge pull request #805 from MITx/fix/cdodge/add-user-admin-permissions 
allow 'is_staff' flagged user accounts to run as super-admin, which mean...
 2012-10-02 09:56:52 -07:00
Chris Dodge
e3d065a66a allow 'is_staff' flagged user accounts to run as super-admin, which means belonging to all groups 2012-10-02 12:33:05 -04:00
Victor Shnayder
21d5abd824 Merge pull request #801 from MITx/feature/cale/allow-static-python-files 
Don't ignore .py files in static files dirs
 2012-10-02 09:20:26 -07:00
Calen Pennington
f637cc5723 Merge pull request #800 from MITx/feature/tomg/cms-release-flow 
private/public unit
 2012-10-02 09:15:28 -07:00
Calen Pennington
91eb2cf983 Merge pull request #804 from MITx/fix/cdodge/cms-multiple-edit-save-bug 
fix bug with editing HTML. The save() method should now return a diction...
 2012-10-02 09:14:41 -07:00
Calen Pennington
aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-10-02 12:12:55 -04:00
Chris Dodge
a60ec13d3a fix bug with editing HTML. The save() method should now return a dictionary, not a string 2012-10-02 11:58:24 -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
845b921ca1 Missing comma 2012-10-02 15:42:22 +00:00
Calen Pennington
a1b998691b Merge pull request #802 from MITx/fix/cdodge/cms-multiple-edit-save-bug 
always load in a new instance of the edit module. It appeared as though ...
 2012-10-02 08:42:02 -07:00
kimth
ed55e4ae2f Move collapsible back into xmodule 2012-10-02 15:41:38 +00:00
Chris Dodge
425e840e7d in order to avoid using stale modules when editing, clear out the @module variable after a save(). Then on a subsequent edit, it'll get recreated 2012-10-02 11:37:27 -04:00
Chris Dodge
ad7771fe5a always load in a new instance of the edit module. It appeared as though on multiple edits (w/o refreshing page) without creating a new data model, we were always referencing stale content from the previous edit 2012-10-02 11:06:28 -04:00
Calen Pennington
258a210556 Don't ignore .py files in static files dirs 2012-10-02 11:04:43 -04:00
Tom Giannattasio
76559af8f1 added wip tag to unit settings 2012-10-02 10:50:23 -04:00
Tom Giannattasio
423dbd17b5 new unit publish settings 2012-10-02 10:40:05 -04:00
chrisndodge
d108af8848 Merge pull request #799 from MITx/feature/cale/cms-codemirror-background 
Feature/cale/cms codemirror background
 2012-10-02 07:10:29 -07:00
chrisndodge
0cb9673b79 Merge pull request #798 from MITx/feature/cale/cms-new-component-ids 
Feature/cale/cms new component ids
 2012-10-02 07:00:54 -07:00
Calen Pennington
fbba883c26 Merge pull request #794 from MITx/feature/cdodge/cms-permissions-management 
Feature/cdodge/cms permissions management
 2012-10-02 06:56:13 -07:00
Calen Pennington
55542c1d47 Make editor display immediately, and with a white background 2012-10-02 09:42:19 -04:00
Calen Pennington
2accc77944 Adding more WIP 2012-10-02 09:22:00 -04:00
Calen Pennington
f03fbd22f4 Merge pull request #797 from MITx/feature/cale/cms-tom-wireframe 
Feature/cale/cms tom wireframe
 2012-10-01 13:58:28 -07:00
Tom Giannattasio
8478f7af64 styled course list page 2012-10-01 16:37:24 -04:00
Tom Giannattasio
8f0b068459 styled log in form 2012-10-01 16:30:28 -04:00
Tom Giannattasio
265ab4366f removed visibility toggle from subsections in overview 2012-10-01 16:15:19 -04:00
Tom Giannattasio
d2549b6346 fixed header styles 2012-10-01 16:11:04 -04:00
Calen Pennington
1d8d82b7fc Set id's on newly created components so that they are immediately editable 2012-10-01 16:06:18 -04:00
Tom Giannattasio
4d985dc0c7 added release button; cleaned up toggle button 2012-10-01 15:51:29 -04:00
Calen Pennington
d3a734d211 Insert new modules in front of the new component box 2012-10-01 15:46:44 -04:00
Calen Pennington
f4b8bfe428 Turn off dumping the course back into git 2012-10-01 15:32:29 -04:00
Calen Pennington
60e7914580 Add WIP markers 2012-10-01 15:28:12 -04:00
Calen Pennington
91fd6170b8 Make cloned items used uuid4 hexes for names, to ensure uniqueness. TODO: Make prettier names 2012-10-01 15:28:12 -04:00
Calen Pennington
aa0aa65301 Clean up unit.html with layout/css from tom 2012-10-01 15:28:12 -04:00
Calen Pennington
96a914216c Fix up overview page with new design mockup 2012-10-01 15:28:12 -04:00
Calen Pennington
2ad7b11f6a Make padding correct on unit page 2012-10-01 15:28:12 -04:00
Calen Pennington
bfeccd88f8 Enable creation of new components 2012-10-01 15:28:07 -04:00
Calen Pennington
805798600b Clean up display of templates 2012-10-01 15:19:35 -04:00